diff --git a/configure.py b/configure.py
index 013a8d74d2..d8423df216 100755
--- a/configure.py
+++ b/configure.py
@@ -392,6 +392,9 @@ cflags_revolution_base = [
 cflags_revolution_retail = [
     *cflags_revolution_base,
     "-O4,p",
+    "-DNDEBUG=1",
+    "-DNDEBUG_DEFINED=1",
+    "-DDEBUG_DEFINED=0",
 ]
 
 cflags_revolution_debug = [
@@ -399,6 +402,8 @@ cflags_revolution_debug = [
     "-opt off",
     "-inline off",
     "-DDEBUG=1",
+    "-DDEBUG_DEFINED=1",
+    "-DNDEBUG_DEFINED=0",
 ]
 
 # Framework flags
diff --git a/include/JSystem/JAudio2/JASSeqReader.h b/include/JSystem/JAudio2/JASSeqReader.h
index 8080a4a8b6..24cc48a1d7 100644
--- a/include/JSystem/JAudio2/JASSeqReader.h
+++ b/include/JSystem/JAudio2/JASSeqReader.h
@@ -37,11 +37,23 @@ public:
     u8* getCur() { return field_0x04; }
     u32 readByte() { return *field_0x04++; }
     u32 read16() {
+#ifdef __MWERKS__
         return *((u16*)field_0x04)++;
+#else
+        u16* value = (u16*)field_0x04;
+        field_0x04 += 2;
+        return *value;
+#endif
     }
     u32 read24() {
         field_0x04--;
+#ifdef __MWERKS__
         return (*((u32*)field_0x04)++) & 0x00ffffff;
+#else
+        u32* value = (u32*)field_0x04;
+        field_0x04 += 4;
+        return (*value) & 0x00ffffff;
+#endif
     }
     u16 getLoopCount() const { 
         if (field_0x08 == 0) {
diff --git a/include/JSystem/JGadget/pointer.h b/include/JSystem/JGadget/pointer.h
index ac38df93f9..9ea7c3af7d 100644
--- a/include/JSystem/JGadget/pointer.h
+++ b/include/JSystem/JGadget/pointer.h
@@ -15,10 +15,17 @@ public:
 template<class T>
 class TPointer_delete : public TPointer<T> {
 public:
+#ifdef __MWERKS__
     TPointer_delete(T* ptr) : TPointer(ptr) {}
     ~TPointer_delete() {
         delete mPtr;
     }
+#else
+    TPointer_delete(T* ptr) : TPointer<T>(ptr) {}
+    ~TPointer_delete() {
+        delete this->mPtr;
+    }
+#endif
 };
 
 }
diff --git a/include/JSystem/JHostIO/JHIRMcc.h b/include/JSystem/JHostIO/JHIRMcc.h
index 6b79187c56..9e8c00ca39 100644
--- a/include/JSystem/JHostIO/JHIRMcc.h
+++ b/include/JSystem/JHostIO/JHIRMcc.h
@@ -1,7 +1,7 @@
 #ifndef JHIRMCC_H
 #define JHIRMCC_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 struct JHIMccContext;
 
diff --git a/include/JSystem/JHostIO/JORHostInfo.h b/include/JSystem/JHostIO/JORHostInfo.h
index 2eb43c5184..965b00ef93 100644
--- a/include/JSystem/JHostIO/JORHostInfo.h
+++ b/include/JSystem/JHostIO/JORHostInfo.h
@@ -1,7 +1,7 @@
 #ifndef JORHOSTINFO_H
 #define JORHOSTINFO_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 #define HOSTINFO_REQ_COMPUTER_NAME 0
 #define HOSTINFO_REQ_USERNAME      1
diff --git a/include/JSystem/JHostIO/JORMContext.h b/include/JSystem/JHostIO/JORMContext.h
index daf8bbc5f5..b0fe008186 100644
--- a/include/JSystem/JHostIO/JORMContext.h
+++ b/include/JSystem/JHostIO/JORMContext.h
@@ -1,7 +1,7 @@
 #ifndef JORMCONTEXT_H
 #define JORMCONTEXT_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <stdint.h>
 #include "JSystem/JHostIO/JORReflexible.h"
 #include "JSystem/JSupport/JSUMemoryStream.h"
diff --git a/include/JSystem/JMath/random.h b/include/JSystem/JMath/random.h
index cfb8ecc1aa..273ab97c12 100644
--- a/include/JSystem/JMath/random.h
+++ b/include/JSystem/JMath/random.h
@@ -42,7 +42,7 @@ public:
     TRandom_(u32 value) : RandomT(value) {}
 
     u8 get_uint8(u8 param_0) {
-        return get_ufloat_1() * param_0;
+        return this->get_ufloat_1() * param_0;
     }
 };
 
diff --git a/include/JSystem/JMessage/JMessage.h b/include/JSystem/JMessage/JMessage.h
index f727dd390e..a097187998 100644
--- a/include/JSystem/JMessage/JMessage.h
+++ b/include/JSystem/JMessage/JMessage.h
@@ -1,7 +1,7 @@
 #ifndef JMESSAGE_H
 #define JMESSAGE_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 // Struct definitions might be wrong
 typedef struct bmg_header_t {
diff --git a/include/JSystem/JMessage/locale.h b/include/JSystem/JMessage/locale.h
index fca67aa3e6..c5dc58512a 100644
--- a/include/JSystem/JMessage/locale.h
+++ b/include/JSystem/JMessage/locale.h
@@ -1,7 +1,7 @@
 #ifndef JMESSAGE_LOCALE_H
 #define JMESSAGE_LOCALE_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 namespace JMessage {
 
diff --git a/include/JSystem/JStudio/JStudio/fvb-data-parse.h b/include/JSystem/JStudio/JStudio/fvb-data-parse.h
index 7e9ae92f55..1caa417550 100644
--- a/include/JSystem/JStudio/JStudio/fvb-data-parse.h
+++ b/include/JSystem/JStudio/JStudio/fvb-data-parse.h
@@ -27,7 +27,7 @@ public:
         return ret;
     }
     const void* getContent() const {
-        return (const void*)((int)getBlockEnd_() + align_roundUp(get_IDSize(), 4));
+        return (const void*)((intptr_t)getBlockEnd_() + align_roundUp(get_IDSize(), 4));
     }
 };
 
diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h
index 8a652dd722..0b9a37aec5 100644
--- a/include/JSystem/JSupport/JSupport.h
+++ b/include/JSystem/JSupport/JSupport.h
@@ -1,7 +1,7 @@
 #ifndef JSUPPORT_H
 #define JSUPPORT_H
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <stdint.h>
 
 /**
diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h
index b2e5403de8..0df3f24640 100644
--- a/include/JSystem/JUtility/JUTGamePad.h
+++ b/include/JSystem/JUtility/JUTGamePad.h
@@ -3,7 +3,7 @@
 
 #include "JSystem/JKernel/JKRDisposer.h"
 #include "JSystem/JUtility/JUTAssert.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 typedef void (*callbackFn)(int, void*);
 
diff --git a/include/f_pc/f_pc_debug_sv.h b/include/f_pc/f_pc_debug_sv.h
index 78a1d98b3e..680f90bd82 100644
--- a/include/f_pc/f_pc_debug_sv.h
+++ b/include/f_pc/f_pc_debug_sv.h
@@ -2,7 +2,7 @@
 #ifndef F_PC_DEBUG_SV_H_
 #define F_PC_DEBUG_SV_H_
 
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 #if DEBUG
 
diff --git a/include/global.h b/include/global.h
index 42990950e1..63e3defa45 100644
--- a/include/global.h
+++ b/include/global.h
@@ -113,4 +113,10 @@ static const float INF = 2000000000.0f;
     (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; \
     (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0; (void*)0;
 
+#ifdef __MWERKS__
+#define SJIS(character, value) character
+#else
+#define SJIS(character, value) ((u32)value)
+#endif
+
 #endif
diff --git a/src/JSystem/JFramework/JFWDisplay.cpp b/src/JSystem/JFramework/JFWDisplay.cpp
index 4d62a8f483..7f775989b8 100644
--- a/src/JSystem/JFramework/JFWDisplay.cpp
+++ b/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;
     }
 }
 
diff --git a/src/JSystem/JHostIO/JHIMccBuf.cpp b/src/JSystem/JHostIO/JHIMccBuf.cpp
index 6a9df9d841..0e539630ce 100644
--- a/src/JSystem/JHostIO/JHIMccBuf.cpp
+++ b/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);
diff --git a/src/JSystem/JHostIO/JHIMemBuf.cpp b/src/JSystem/JHostIO/JHIMemBuf.cpp
index 9ab585839d..7f02ca32b8 100644
--- a/src/JSystem/JHostIO/JHIMemBuf.cpp
+++ b/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;
diff --git a/src/JSystem/JHostIO/JHIhioASync.cpp b/src/JSystem/JHostIO/JHIhioASync.cpp
index e9dfd586e8..0dc75b4e76 100644
--- a/src/JSystem/JHostIO/JHIhioASync.cpp
+++ b/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;
diff --git a/src/JSystem/JHostIO/JORFile.cpp b/src/JSystem/JHostIO/JORFile.cpp
index b412958d88..10dfa2af9a 100644
--- a/src/JSystem/JHostIO/JORFile.cpp
+++ b/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),
diff --git a/src/JSystem/JStudio/JStudio/functionvalue.cpp b/src/JSystem/JStudio/JStudio/functionvalue.cpp
index bb09bdb5f6..3e5ec522a2 100644
--- a/src/JSystem/JStudio/JStudio/functionvalue.cpp
+++ b/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];
diff --git a/src/JSystem/JStudio/JStudio/jstudio-object.cpp b/src/JSystem/JStudio/JStudio/jstudio-object.cpp
index 00308345df..5d6cb6c443 100644
--- a/src/JSystem/JStudio/JStudio/jstudio-object.cpp
+++ b/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);
     }
 }
 
diff --git a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp b/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
index 5a1dd03a7a..3a0f7f54b9 100644
--- a/src/JSystem/JStudio/JStudio/stb-data-parse.cpp
+++ b/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));
     }
 }
 
diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/src/JSystem/JSupport/JSUInputStream.cpp
index c5f566a577..26830a0b51 100644
--- a/src/JSystem/JSupport/JSUInputStream.cpp
+++ b/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()) {
diff --git a/src/JSystem/JSupport/JSUOutputStream.cpp b/src/JSystem/JSupport/JSUOutputStream.cpp
index c7f37be713..046ab59bda 100644
--- a/src/JSystem/JSupport/JSUOutputStream.cpp
+++ b/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() {
diff --git a/src/JSystem/JUtility/JUTException.cpp b/src/JSystem/JUtility/JUTException.cpp
index 3b72375a40..855e46cf70 100644
--- a/src/JSystem/JUtility/JUTException.cpp
+++ b/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};
diff --git a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp b/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp
index 3a1e55086e..a413a6751a 100644
--- a/src/JSystem/JUtility/JUTFontData_Ascfont_fix12.cpp
+++ b/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) = {
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/__mem.c b/src/PowerPC_EABI_Support/Runtime/Src/__mem.c
index dfafa506f8..bdf3410251 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/__mem.c
+++ b/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;
diff --git a/src/PowerPC_EABI_Support/Runtime/Src/runtime.c b/src/PowerPC_EABI_Support/Runtime/Src/runtime.c
index 639b69630c..c06b108a4d 100644
--- a/src/PowerPC_EABI_Support/Runtime/Src/runtime.c
+++ b/src/PowerPC_EABI_Support/Runtime/Src/runtime.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/Z2AudioLib/Z2SeqMgr.cpp b/src/Z2AudioLib/Z2SeqMgr.cpp
index 390d6aa0b1..cd90349a97 100644
--- a/src/Z2AudioLib/Z2SeqMgr.cpp
+++ b/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);
diff --git a/src/c/c_dylink.cpp b/src/c/c_dylink.cpp
index 503219ae69..27113d7a2a 100644
--- a/src/c/c_dylink.cpp
+++ b/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];
diff --git a/src/d/d_bg_w_kcol.cpp b/src/d/d_bg_w_kcol.cpp
index b618cc0b6a..b41b5a4d87 100644
--- a/src/d/d_bg_w_kcol.cpp
+++ b/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);
diff --git a/src/d/d_item_data.cpp b/src/d/d_item_data.cpp
index 00f6acccda..2a84fb615a 100644
--- a/src/d/d_item_data.cpp
+++ b/src/d/d_item_data.cpp
@@ -3,519 +3,519 @@
 #include "d/d_item_data.h"
 
 dItem_itemResource dItem_data::item_resource[] = {
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x3C, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x1, 0xFF, 0x002D, 0x3C, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x2, 0xFF, 0x002D, 0x3C, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x3, 0xFF, 0x002D, 0x3C, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x4, 0xFF, 0x002D, 0x3C, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x5, 0xFF, 0x002D, 0x3C, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x6, 0xFF, 0x002D, 0x3C, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"O_gD_bomb", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000C, 0x64, 0x019F},
-    {"O_gD_bomb", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000C, 0x64, 0x019F},
-    {"O_gD_bomb", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000C, 0x64, 0x019F},
-    {"O_gD_bomb", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000C, 0x64, 0x019F},
-    {"O_gD_arow", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0053, 0x64, 0x0000},
-    {"O_gD_arow", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0053, 0x64, 0x0000},
-    {"O_gD_arow", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0053, 0x64, 0x0000},
-    {"O_gD_arow", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0053, 0x64, 0x0000},
-    {"O_gD_tane", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x005C, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"O_gD_PG", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000D, 0x64, 0x0000},
-    {"O_gD_PG", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000D, 0x64, 0x0000},
-    {"O_gD_PG", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000D, 0x64, 0x0000},
-    {"O_gD_PG", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000D, 0x64, 0x0000},
-    {"O_gD_BI", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000B, 0x64, 0x0000},
-    {"O_gD_BI", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000B, 0x64, 0x0000},
-    {"O_gD_BI", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000B, 0x64, 0x0000},
-    {"O_gD_BI", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000B, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0079},
-    {"O_gD_hutk", 0x0008, 0xFFFF, 0x0005, 0x000B, 0xFFFF, 0xFF, 0xFF, 0x0050, 0x64, 0x0194},
-    {"O_gD_hutu", 0x0008, 0xFFFF, 0x0005, 0x000B, 0xFFFF, 0xFF, 0xFF, 0x0051, 0x64, 0x0000},
-    {"T_gD_map", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0071, 0x64, 0x0197},
-    {"T_gD_kmps", 0x0007, 0xFFFF, 0x0004, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006F, 0x64, 0x0198},
-    {"O_gD_TKS", 0x0008, 0xFFFF, 0x0005, 0xFFFF, 0x000B, 0xFF, 0xFF, 0x0028, 0x64, 0x0191},
-    {"T_gD_bkey", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0021, 0x64, 0xFFFF},
-    {"O_gD_TKC", 0x0009, 0x000C, 0x0006, 0xFFFF, 0x000F, 0xFF, 0xFF, 0x0026, 0x64, 0x0191},
-    {"O_gD_SWA", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0070, 0x6E, 0x0195},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0042, 0x6E, 0x01B2},
-    {"T_gD_SHB", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0074, 0x6E, 0x01B5},
-    {"O_gD_SHC", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0040, 0x6E, 0x0196},
-    {"O_gD_SHA", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x003C, 0x64, 0x01B4},
-    {"O_gD_mem2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0022, 0x64, 0x01A8},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x006B, 0x64, 0x0192},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x006B, 0x64, 0x0000},
-    {"O_gD_marm", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0041, 0x64, 0x01A9},
-    {"O_gD_zora", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004D, 0x64, 0x01AA},
-    {"O_gD_Injy", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x002D, 0x64, 0x0000},
-    {"O_gD_TKS", 0x0008, 0xFFFF, 0x0005, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0028, 0x64, 0x0000},
-    {"O_gD_puL2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0047, 0x64, 0x0000},
-    {"O_gD_puL2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0048, 0x64, 0x0000},
-    {"O_gD_puL3", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0049, 0x64, 0x01AD},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0050, 0x64, 0x019F},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0050, 0x64, 0x01AF},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0050, 0x64, 0x01B0},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0050, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0072, 0x6E, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x01B3},
-    {"O_gD_sang", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x002A, 0x64, 0x0194},
-    {"O_gD_hawk", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0059, 0x64, 0x0000},
-    {"O_gD_SWB", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0024, 0x6E, 0x0000},
-    {"O_gD_boom", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0062, 0x6E, 0x01AB},
-    {"O_gD_SP", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x002B, 0x5F, 0x01A6},
-    {"O_gD_IB", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0020, 0x78, 0x0000},
-    {"O_gD_bow", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0069, 0x64, 0x01A5},
-    {"O_gD_HS", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006A, 0x78, 0x01AC},
-    {"O_gD_boot", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0025, 0x64, 0x01A7},
-    {"O_gD_CROD", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0016, 0x6E, 0x019E},
-    {"O_gD_HS", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x002C, 0x82, 0x01B5},
-    {"T_gD_kt", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006C, 0x6E, 0x0193},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0042, 0x6E, 0x01B6},
-    {"O_gD_uktr", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0018, 0x64, 0x01B7},
-    {"O_gD_pach", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x005B, 0x64, 0x01B8},
-    {"O_gD_CROD", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0016, 0x6E, 0x01B9},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x01BA},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0197},
-    {"O_gD_bmL2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0056, 0x64, 0x0198},
-    {"O_gD_bomc", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0, 0xFF, 0x0055, 0x64, 0x01BD},
-    {"O_gD_bomc", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0055, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0056, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"O_gD_quL1", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004A, 0x64, 0x01B1},
-    {"O_gD_quL2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004B, 0x64, 0x01F0},
-    {"O_gD_quL3", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004C, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x004E, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x000C, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0059, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0019, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x001B, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x001A, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x001C, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x001D, 0x64, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x01BE},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x0, 0x0011, 0x50, 0x01BF},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x1, 0x0, 0x0011, 0x50, 0x01C0},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x2, 0x0, 0x0011, 0x50, 0x01C1},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x3, 0x0, 0x0011, 0x50, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x3, 0x1, 0x0012, 0x50, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01A1},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x5, 0x0, 0x0011, 0x50, 0x01AE},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01A1},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x0, 0x0011, 0x50, 0x01BF},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x8, 0x0, 0x0011, 0x50, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x5, 0x0, 0x0011, 0x50, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0011, 0x50, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x5, 0x0, 0x0011, 0x50, 0x0000},
-    {"Obj_kntr", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006C, 0x6E, 0x0000},
-    {"Obj_kntr", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006C, 0x6E, 0x0000},
-    {"O_gD_bmL2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000C, 0x64, 0x0198},
-    {"O_gD_PG", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000D, 0x64, 0x0000},
-    {"O_gD_BI", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x000B, 0x64, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0xB, 0x0, 0x0011, 0x50, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0011, 0x50, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0xB, 0x0, 0x0011, 0x50, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0011, 0x50, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x7, 0x0, 0x0011, 0x50, 0x01BF},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x0, 0x0011, 0x50, 0x01BF},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x2, 0x0, 0x0011, 0x50, 0x01BF},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x1, 0x0, 0x0011, 0x50, 0x01BF},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01BF},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x6, 0x0, 0x0011, 0x50, 0x01BF},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0013, 0x50, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0013, 0x50, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0013, 0x50, 0x01CF},
-    {"O_gD_lttr", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x005A, 0x64, 0x0000},
-    {"O_gD_bill", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0054, 0x64, 0x0000},
-    {"O_gD_wood", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0058, 0x64, 0x0000},
-    {"O_gD_pend", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x005D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x005D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x01D3},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x01D2},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"O_gD_mem2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0022, 0x64, 0x0000},
-    {"O_gD_mem2", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0022, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x006C, 0x6E, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01A1},
-    {"O_gD_hk_s", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0011, 0x50, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0011, 0x50, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"N_gD_Lpod", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0052, 0x64, 0x0000},
-    {"N_gD_Lpod", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0052, 0x64, 0x0000},
-    {"N_gD_Lpod", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0052, 0x64, 0x0000},
-    {"N_gD_Lpod", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0052, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x0011, 0x50, 0x0000},
-    {"O_gD_kabo", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0030, 0x50, 0x0000},
-    {"O_gD_kabm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x002F, 0x50, 0x0000},
-    {"O_gD_choo", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0008, 0x50, 0x0000},
-    {"O_gD_chom", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0007, 0x50, 0x0000},
-    {"O_gD_kuwo", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0038, 0x50, 0x0000},
-    {"O_gD_kuwm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0037, 0x50, 0x0000},
-    {"O_gD_bato", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0006, 0x50, 0x0000},
-    {"O_gD_batm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0005, 0x50, 0x0000},
-    {"O_gD_nano", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x003B, 0x50, 0x0000},
-    {"O_gD_nanm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x003A, 0x50, 0x0000},
-    {"O_gD_dano", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x000A, 0x50, 0x0000},
-    {"O_gD_danm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0009, 0x50, 0x0000},
-    {"O_gD_kamo", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0034, 0x50, 0x0000},
-    {"O_gD_kamm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0033, 0x50, 0x0000},
-    {"O_gD_teno", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x005F, 0x50, 0x0000},
-    {"O_gD_tenm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x005E, 0x50, 0x0000},
-    {"O_gD_kato", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0036, 0x50, 0x0000},
-    {"O_gD_katm", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0035, 0x50, 0x0000},
-    {"O_gD_tono", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0061, 0x50, 0x0000},
-    {"O_gD_tonm", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0060, 0x50, 0x0000},
-    {"O_gD_ario", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0004, 0x50, 0x0000},
-    {"O_gD_arim", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x0003, 0x50, 0x0000},
-    {"O_gD_kago", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0032, 0x50, 0x0000},
-    {"O_gD_kagm", 0x0009, 0x000F, 0x0006, 0x000C, 0xFFFF, 0xFF, 0xFF, 0x0031, 0x50, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"O_gD_tama", 0x0005, 0x000B, 0xFFFF, 0x0008, 0xFFFF, 0xFF, 0xFF, 0x003E, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x002D, 0x64, 0x0000},
-    {"O_gD_komo", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004F, 0x64, 0x0000},
-    {"O_gD_komo", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004F, 0x64, 0x0000},
-    {"O_gD_komo", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x004F, 0x64, 0x0000},
-    {"O_gD_TKC", 0x0009, 0x000C, 0x0006, 0xFFFF, 0x000F, 0xFF, 0xFF, 0x0026, 0x64, 0x0191},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x4, 0xFF, 0x002D, 0x3C, 0x0000},
-    {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000},
-    {"O_gD_bott", 0x0006, 0x000C, 0xFFFF, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000},
-    {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0000},
-    {"O_gD_pump", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0029, 0x64, 0x0000},
-    {"O_gD_chee", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0015, 0x64, 0x0000},
-    {"O_gD_bkey", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x003F, 0x64, 0x0000},
-    {"F_gD_rupy", 0x0004, 0xFFFF, 0xFFFF, 0x0007, 0xFFFF, 0x0, 0xFF, 0x003C, 0x64, 0x0000},
-    {"T_gD_kt", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006C, 0x6E, 0x0000},
-    {"D_MKey_01", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0043, 0x78, 0x0000},
-    {"D_MKey_02", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0045, 0x78, 0x0000},
-    {"D_MKey_03", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0046, 0x78, 0x0000},
-    {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0000},
-    {"O_gD_Mkey", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x0017, 0x78, 0x0000},
-    {"T_gD_key", 0x0003, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0xFF, 0x006E, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x3C, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x1, -0x1, 0x002D, 0x3C, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x2, -0x1, 0x002D, 0x3C, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x3, -0x1, 0x002D, 0x3C, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x4, -0x1, 0x002D, 0x3C, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x5, -0x1, 0x002D, 0x3C, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x6, -0x1, 0x002D, 0x3C, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"O_gD_bomb", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000C, 0x64, 0x019F},
+    {"O_gD_bomb", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000C, 0x64, 0x019F},
+    {"O_gD_bomb", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000C, 0x64, 0x019F},
+    {"O_gD_bomb", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000C, 0x64, 0x019F},
+    {"O_gD_arow", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0053, 0x64, 0x0000},
+    {"O_gD_arow", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0053, 0x64, 0x0000},
+    {"O_gD_arow", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0053, 0x64, 0x0000},
+    {"O_gD_arow", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0053, 0x64, 0x0000},
+    {"O_gD_tane", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x005C, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"O_gD_PG", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000D, 0x64, 0x0000},
+    {"O_gD_PG", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000D, 0x64, 0x0000},
+    {"O_gD_PG", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000D, 0x64, 0x0000},
+    {"O_gD_PG", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000D, 0x64, 0x0000},
+    {"O_gD_BI", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000B, 0x64, 0x0000},
+    {"O_gD_BI", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000B, 0x64, 0x0000},
+    {"O_gD_BI", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000B, 0x64, 0x0000},
+    {"O_gD_BI", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000B, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"T_gD_key", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x006E, 0x64, 0x0079},
+    {"O_gD_hutk", 0x0008,-0x0001, 0x0005, 0x000B,-0x0001, -0x1, -0x1, 0x0050, 0x64, 0x0194},
+    {"O_gD_hutu", 0x0008,-0x0001, 0x0005, 0x000B,-0x0001, -0x1, -0x1, 0x0051, 0x64, 0x0000},
+    {"T_gD_map", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0071, 0x64, 0x0197},
+    {"T_gD_kmps", 0x0007,-0x0001, 0x0004,-0x0001,-0x0001, -0x1, -0x1, 0x006F, 0x64, 0x0198},
+    {"O_gD_TKS", 0x0008,-0x0001, 0x0005,-0x0001, 0x000B, -0x1, -0x1, 0x0028, 0x64, 0x0191},
+    {"T_gD_bkey", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0021, 0x64,-0x0001},
+    {"O_gD_TKC", 0x0009, 0x000C, 0x0006,-0x0001, 0x000F, -0x1, -0x1, 0x0026, 0x64, 0x0191},
+    {"O_gD_SWA", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0070, 0x6E, 0x0195},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0042, 0x6E, 0x01B2},
+    {"T_gD_SHB", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0074, 0x6E, 0x01B5},
+    {"O_gD_SHC", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0040, 0x6E, 0x0196},
+    {"O_gD_SHA", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x003C, 0x64, 0x01B4},
+    {"O_gD_mem2", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0022, 0x64, 0x01A8},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x006B, 0x64, 0x0192},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x006B, 0x64, 0x0000},
+    {"O_gD_marm", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0041, 0x64, 0x01A9},
+    {"O_gD_zora", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x004D, 0x64, 0x01AA},
+    {"O_gD_Injy", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x002D, 0x64, 0x0000},
+    {"O_gD_TKS", 0x0008,-0x0001, 0x0005,-0x0001,-0x0001, -0x1, -0x1, 0x0028, 0x64, 0x0000},
+    {"O_gD_puL2", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0047, 0x64, 0x0000},
+    {"O_gD_puL2", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0048, 0x64, 0x0000},
+    {"O_gD_puL3", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0049, 0x64, 0x01AD},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0050, 0x64, 0x019F},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0050, 0x64, 0x01AF},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0050, 0x64, 0x01B0},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0050, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0072, 0x6E, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x01B3},
+    {"O_gD_sang", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x002A, 0x64, 0x0194},
+    {"O_gD_hawk", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0059, 0x64, 0x0000},
+    {"O_gD_SWB", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0024, 0x6E, 0x0000},
+    {"O_gD_boom", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0062, 0x6E, 0x01AB},
+    {"O_gD_SP", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x002B, 0x5F, 0x01A6},
+    {"O_gD_IB", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0020, 0x78, 0x0000},
+    {"O_gD_bow", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0069, 0x64, 0x01A5},
+    {"O_gD_HS", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x006A, 0x78, 0x01AC},
+    {"O_gD_boot", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0025, 0x64, 0x01A7},
+    {"O_gD_CROD", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0016, 0x6E, 0x019E},
+    {"O_gD_HS", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x002C, 0x82, 0x01B5},
+    {"T_gD_kt", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x006C, 0x6E, 0x0193},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0042, 0x6E, 0x01B6},
+    {"O_gD_uktr", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0018, 0x64, 0x01B7},
+    {"O_gD_pach", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x005B, 0x64, 0x01B8},
+    {"O_gD_CROD", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0016, 0x6E, 0x01B9},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x01BA},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0197},
+    {"O_gD_bmL2", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0056, 0x64, 0x0198},
+    {"O_gD_bomc", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, 0x0, -0x1, 0x0055, 0x64, 0x01BD},
+    {"O_gD_bomc", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0055, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0056, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"O_gD_quL1", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x004A, 0x64, 0x01B1},
+    {"O_gD_quL2", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x004B, 0x64, 0x01F0},
+    {"O_gD_quL3", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x004C, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x004E, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x000C, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0059, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0019, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x001B, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x001A, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x001C, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x001D, 0x64, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x01BE},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x0, 0x0, 0x0011, 0x50, 0x01BF},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x1, 0x0, 0x0011, 0x50, 0x01C0},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x2, 0x0, 0x0011, 0x50, 0x01C1},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x3, 0x0, 0x0011, 0x50, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x3, 0x1, 0x0012, 0x50, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01A1},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x5, 0x0, 0x0011, 0x50, 0x01AE},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01A1},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x0, 0x0, 0x0011, 0x50, 0x01BF},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x8, 0x0, 0x0011, 0x50, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x5, 0x0, 0x0011, 0x50, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0011, 0x50, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x5, 0x0, 0x0011, 0x50, 0x0000},
+    {"Obj_kntr", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x006C, 0x6E, 0x0000},
+    {"Obj_kntr", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x006C, 0x6E, 0x0000},
+    {"O_gD_bmL2", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000C, 0x64, 0x0198},
+    {"O_gD_PG", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000D, 0x64, 0x0000},
+    {"O_gD_BI", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x000B, 0x64, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0xB, 0x0, 0x0011, 0x50, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0011, 0x50, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0xB, 0x0, 0x0011, 0x50, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0011, 0x50, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x7, 0x0, 0x0011, 0x50, 0x01BF},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x0, 0x0, 0x0011, 0x50, 0x01BF},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x2, 0x0, 0x0011, 0x50, 0x01BF},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x1, 0x0, 0x0011, 0x50, 0x01BF},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01BF},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x6, 0x0, 0x0011, 0x50, 0x01BF},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0013, 0x50, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0013, 0x50, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0013, 0x50, 0x01CF},
+    {"O_gD_lttr", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x005A, 0x64, 0x0000},
+    {"O_gD_bill", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0054, 0x64, 0x0000},
+    {"O_gD_wood", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0058, 0x64, 0x0000},
+    {"O_gD_pend", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x005D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x005D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x01D3},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x01D2},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"O_gD_mem2", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0022, 0x64, 0x0000},
+    {"O_gD_mem2", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0022, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x006C, 0x6E, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x4, 0x0, 0x0011, 0x50, 0x01A1},
+    {"O_gD_hk_s", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0011, 0x50, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0011, 0x50, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"N_gD_Lpod", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0052, 0x64, 0x0000},
+    {"N_gD_Lpod", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0052, 0x64, 0x0000},
+    {"N_gD_Lpod", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0052, 0x64, 0x0000},
+    {"N_gD_Lpod", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0052, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x0011, 0x50, 0x0000},
+    {"O_gD_kabo", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0030, 0x50, 0x0000},
+    {"O_gD_kabm", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x002F, 0x50, 0x0000},
+    {"O_gD_choo", 0x0009, 0x000F, 0x0006, 0x000C,-0x0001, -0x1, -0x1, 0x0008, 0x50, 0x0000},
+    {"O_gD_chom", 0x0009, 0x000F, 0x0006, 0x000C,-0x0001, -0x1, -0x1, 0x0007, 0x50, 0x0000},
+    {"O_gD_kuwo", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0038, 0x50, 0x0000},
+    {"O_gD_kuwm", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0037, 0x50, 0x0000},
+    {"O_gD_bato", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0006, 0x50, 0x0000},
+    {"O_gD_batm", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0005, 0x50, 0x0000},
+    {"O_gD_nano", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x003B, 0x50, 0x0000},
+    {"O_gD_nanm", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x003A, 0x50, 0x0000},
+    {"O_gD_dano", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x000A, 0x50, 0x0000},
+    {"O_gD_danm", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0009, 0x50, 0x0000},
+    {"O_gD_kamo", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0034, 0x50, 0x0000},
+    {"O_gD_kamm", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0033, 0x50, 0x0000},
+    {"O_gD_teno", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x005F, 0x50, 0x0000},
+    {"O_gD_tenm", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x005E, 0x50, 0x0000},
+    {"O_gD_kato", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0036, 0x50, 0x0000},
+    {"O_gD_katm", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0035, 0x50, 0x0000},
+    {"O_gD_tono", 0x0009, 0x000F, 0x0006, 0x000C,-0x0001, -0x1, -0x1, 0x0061, 0x50, 0x0000},
+    {"O_gD_tonm", 0x0009, 0x000F, 0x0006, 0x000C,-0x0001, -0x1, -0x1, 0x0060, 0x50, 0x0000},
+    {"O_gD_ario", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0004, 0x50, 0x0000},
+    {"O_gD_arim", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x0003, 0x50, 0x0000},
+    {"O_gD_kago", 0x0009, 0x000F, 0x0006, 0x000C,-0x0001, -0x1, -0x1, 0x0032, 0x50, 0x0000},
+    {"O_gD_kagm", 0x0009, 0x000F, 0x0006, 0x000C,-0x0001, -0x1, -0x1, 0x0031, 0x50, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"O_gD_tama", 0x0005, 0x000B,-0x0001, 0x0008,-0x0001, -0x1, -0x1, 0x003E, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x002D, 0x64, 0x0000},
+    {"O_gD_komo", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x004F, 0x64, 0x0000},
+    {"O_gD_komo", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x004F, 0x64, 0x0000},
+    {"O_gD_komo", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x004F, 0x64, 0x0000},
+    {"O_gD_TKC", 0x0009, 0x000C, 0x0006,-0x0001, 0x000F, -0x1, -0x1, 0x0026, 0x64, 0x0191},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x4, -0x1, 0x002D, 0x3C, 0x0000},
+    {"T_gD_key", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x006E, 0x64, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000},
+    {"O_gD_bott", 0x0006, 0x000C,-0x0001, 0x0009, 0x000F, 0x0, 0x2, 0x0011, 0x50, 0x0000},
+    {"T_gD_key", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x006E, 0x64, 0x0000},
+    {"O_gD_pump", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0029, 0x64, 0x0000},
+    {"O_gD_chee", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0015, 0x64, 0x0000},
+    {"O_gD_bkey", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x003F, 0x64, 0x0000},
+    {"F_gD_rupy", 0x0004,-0x0001,-0x0001, 0x0007,-0x0001, 0x0, -0x1, 0x003C, 0x64, 0x0000},
+    {"T_gD_kt", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x006C, 0x6E, 0x0000},
+    {"D_MKey_01", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0043, 0x78, 0x0000},
+    {"D_MKey_02", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0045, 0x78, 0x0000},
+    {"D_MKey_03", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0046, 0x78, 0x0000},
+    {"T_gD_key", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x006E, 0x64, 0x0000},
+    {"O_gD_Mkey", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x0017, 0x78, 0x0000},
+    {"T_gD_key", 0x0003,-0x0001,-0x0001,-0x0001,-0x0001, -0x1, -0x1, 0x006E, 0x64, 0x0000},
 };
 
 dItem_fieldItemResource dItem_data::field_item_res[] = {
-    {"Always", 0x0014, 0xFFFF, 0x0030, 0xFF, 0x1000},
-    {"Always", 0x0017, 0xFFFF, 0x0031, 0x0, 0x1000},
-    {"Always", 0x0017, 0xFFFF, 0x0031, 0x1, 0x1000},
-    {"Always", 0x0017, 0xFFFF, 0x0031, 0x2, 0x1000},
-    {"Always", 0x0017, 0xFFFF, 0x0031, 0x3, 0x1000},
-    {"Always", 0x0017, 0xFFFF, 0x0031, 0x4, 0x1000},
-    {"Always", 0x0017, 0xFFFF, 0x0031, 0x5, 0x1000},
-    {"Always", 0x0017, 0xFFFF, 0x0031, 0x6, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"Always", 0x0023, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"Always", 0x0023, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"Always", 0x0023, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"Always", 0x0022, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"Always", 0x0024, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"Always", 0x0014, 0xFFFF, 0x0030, 0xFF, 0x1000},
-    {"T_g_key", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
+    {"Always", 0x0014,-0x0001, 0x0030, 0xFF, 0x1000},
+    {"Always", 0x0017,-0x0001, 0x0031, 0x0, 0x1000},
+    {"Always", 0x0017,-0x0001, 0x0031, 0x1, 0x1000},
+    {"Always", 0x0017,-0x0001, 0x0031, 0x2, 0x1000},
+    {"Always", 0x0017,-0x0001, 0x0031, 0x3, 0x1000},
+    {"Always", 0x0017,-0x0001, 0x0031, 0x4, 0x1000},
+    {"Always", 0x0017,-0x0001, 0x0031, 0x5, 0x1000},
+    {"Always", 0x0017,-0x0001, 0x0031, 0x6, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"Always", 0x0023,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"Always", 0x0023,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"Always", 0x0023,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"Always", 0x0022,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"Always", 0x0024,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"Always", 0x0014,-0x0001, 0x0030, 0xFF, 0x1000},
+    {"T_g_key", 0x0003,-0x0001,-0x0001, 0xFF, 0x1000},
     {"Always", 0x0015, 0x000D, 0x0033, 0xFF, 0x1000},
     {"Always", 0x0016, 0x000E, 0x0034, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"T_g_bkey", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"O_g_SWA", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"T_g_SHB", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"O_g_ZORA", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"O_gD_SWB", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"T_g_kt", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"O_wood", 0x0004, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"T_g_kt", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {NULL, 0xFFFF, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
-    {"T_g_key", 0x0003, 0xFFFF, 0xFFFF, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"T_g_bkey", 0x0003,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"O_g_SWA", 0x0003,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"T_g_SHB", 0x0003,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"O_g_ZORA", 0x0003,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"O_gD_SWB", 0x0003,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"T_g_kt", 0x0003,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"O_wood", 0x0004,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"T_g_kt", 0x0003,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {NULL,-0x0001,-0x0001,-0x0001, 0xFF, 0x1000},
+    {"T_g_key", 0x0003,-0x0001,-0x0001, 0xFF, 0x1000},
 };
 
 dItem_itemInfo dItem_data::item_info[] = {
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index ac96a6f3df..d59299eccd 100644
--- a/src/d/d_kankyo.cpp
+++ b/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"
diff --git a/src/d/d_kankyo_debug.cpp b/src/d/d_kankyo_debug.cpp
index f7380be066..4d0a26893b 100644
--- a/src/d/d_kankyo_debug.cpp
+++ b/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)) {
diff --git a/src/d/d_map_path_dmap.cpp b/src/d/d_map_path_dmap.cpp
index de6c6e2155..a7d6172436 100644
--- a/src/d/d_map_path_dmap.cpp
+++ b/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);
 
diff --git a/src/d/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp
index 24616375ef..a310746aaf 100644
--- a/src/d/d_menu_fmap.cpp
+++ b/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) {
diff --git a/src/d/d_menu_save.cpp b/src/d/d_menu_save.cpp
index 32b4fa61b7..5929fbfa70 100644
--- a/src/d/d_menu_save.cpp
+++ b/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;
     }
diff --git a/src/d/d_model.cpp b/src/d/d_model.cpp
index 5d89bc2603..59562d9b15 100644
--- a/src/d/d_model.cpp
+++ b/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);
diff --git a/src/d/d_name.cpp b/src/d/d_name.cpp
index 7eaac1851b..81afdfd48a 100644
--- a/src/d/d_name.cpp
+++ b/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;
diff --git a/src/d/d_stage.cpp b/src/d/d_stage.cpp
index 5bae4ade2b..55f2b24244 100644
--- a/src/d/d_stage.cpp
+++ b/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);
         }
     }
 
diff --git a/src/dolphin/G2D/G2D.c b/src/dolphin/G2D/G2D.c
index 351a5046f5..92302f4ef9 100644
--- a/src/dolphin/G2D/G2D.c
+++ b/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"
diff --git a/src/dolphin/am/am.c b/src/dolphin/am/am.c
index ba3fd2e4b7..924f70bb41 100644
--- a/src/dolphin/am/am.c
+++ b/src/dolphin/am/am.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/am.h>
 
 #include "__am.h"
diff --git a/src/dolphin/amcnotstub/amcnotstub.c b/src/dolphin/amcnotstub/amcnotstub.c
index 0c38a4aa35..ee78c7ce40 100644
--- a/src/dolphin/amcnotstub/amcnotstub.c
+++ b/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);
diff --git a/src/dolphin/amcstubs/AmcExi2Stubs.c b/src/dolphin/amcstubs/AmcExi2Stubs.c
index 99073a34cb..718256d351 100644
--- a/src/dolphin/amcstubs/AmcExi2Stubs.c
+++ b/src/dolphin/amcstubs/AmcExi2Stubs.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/amc/AmcExi2Comm.h>
 
 // prototypes
diff --git a/src/dolphin/ar/ar.c b/src/dolphin/ar/ar.c
index a7c9400fc5..5f5d6b1b60 100644
--- a/src/dolphin/ar/ar.c
+++ b/src/dolphin/ar/ar.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ar.h>
 #include "fake_tgmath.h"
 
diff --git a/src/dolphin/ar/arq.c b/src/dolphin/ar/arq.c
index baf3acead4..318d77bcb3 100644
--- a/src/dolphin/ar/arq.c
+++ b/src/dolphin/ar/arq.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ar.h>
 
 #include "__ar.h"
diff --git a/src/dolphin/ax/AX.c b/src/dolphin/ax/AX.c
index eb06c5906d..ef50391f89 100644
--- a/src/dolphin/ax/AX.c
+++ b/src/dolphin/ax/AX.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"
diff --git a/src/dolphin/ax/AXAlloc.c b/src/dolphin/ax/AXAlloc.c
index 3fcd6278c1..d84e93042e 100644
--- a/src/dolphin/ax/AXAlloc.c
+++ b/src/dolphin/ax/AXAlloc.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"
diff --git a/src/dolphin/ax/AXAux.c b/src/dolphin/ax/AXAux.c
index 7c3294d1a6..7d392d8f1c 100644
--- a/src/dolphin/ax/AXAux.c
+++ b/src/dolphin/ax/AXAux.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"
diff --git a/src/dolphin/ax/AXCL.c b/src/dolphin/ax/AXCL.c
index e51eb3d311..81e60f7623 100644
--- a/src/dolphin/ax/AXCL.c
+++ b/src/dolphin/ax/AXCL.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"
diff --git a/src/dolphin/ax/AXComp.c b/src/dolphin/ax/AXComp.c
index bc0eb97c87..6d9b21f307 100644
--- a/src/dolphin/ax/AXComp.c
+++ b/src/dolphin/ax/AXComp.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"
diff --git a/src/dolphin/ax/AXOut.c b/src/dolphin/ax/AXOut.c
index b7402c4966..3f049436f3 100644
--- a/src/dolphin/ax/AXOut.c
+++ b/src/dolphin/ax/AXOut.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dsp.h>
 #include <dolphin/ax.h>
 
diff --git a/src/dolphin/ax/AXProf.c b/src/dolphin/ax/AXProf.c
index 316cadf5bb..09ae37c6c3 100644
--- a/src/dolphin/ax/AXProf.c
+++ b/src/dolphin/ax/AXProf.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"
diff --git a/src/dolphin/ax/AXSPB.c b/src/dolphin/ax/AXSPB.c
index 829c8ef35a..3729589b62 100644
--- a/src/dolphin/ax/AXSPB.c
+++ b/src/dolphin/ax/AXSPB.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 
 #include "__ax.h"
diff --git a/src/dolphin/ax/AXVPB.c b/src/dolphin/ax/AXVPB.c
index bd6ffe02aa..6bf7f4ae6e 100644
--- a/src/dolphin/ax/AXVPB.c
+++ b/src/dolphin/ax/AXVPB.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include "fake_tgmath.h"
 
diff --git a/src/dolphin/ax/DSPCode.c b/src/dolphin/ax/DSPCode.c
index d54b0de21a..7ca0d067ba 100644
--- a/src/dolphin/ax/DSPCode.c
+++ b/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);
diff --git a/src/dolphin/axfx/axfx.c b/src/dolphin/axfx/axfx.c
index 64c25fc063..6ebdd31424 100644
--- a/src/dolphin/axfx/axfx.c
+++ b/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) {
diff --git a/src/dolphin/axfx/chorus.c b/src/dolphin/axfx/chorus.c
index f383a03b36..ba38864258 100644
--- a/src/dolphin/axfx/chorus.c
+++ b/src/dolphin/axfx/chorus.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/axfx.h>
 
diff --git a/src/dolphin/axfx/delay.c b/src/dolphin/axfx/delay.c
index 5c26e59c33..41e426236d 100644
--- a/src/dolphin/axfx/delay.c
+++ b/src/dolphin/axfx/delay.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/axfx.h>
 
diff --git a/src/dolphin/axfx/reverb_hi.c b/src/dolphin/axfx/reverb_hi.c
index 02283ac476..44f8d3c04e 100644
--- a/src/dolphin/axfx/reverb_hi.c
+++ b/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"
diff --git a/src/dolphin/axfx/reverb_hi_4ch.c b/src/dolphin/axfx/reverb_hi_4ch.c
index a840dfee15..f7770c9959 100644
--- a/src/dolphin/axfx/reverb_hi_4ch.c
+++ b/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"
diff --git a/src/dolphin/axfx/reverb_std.c b/src/dolphin/axfx/reverb_std.c
index 960c68c514..ef74a8d1e7 100644
--- a/src/dolphin/axfx/reverb_std.c
+++ b/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"
diff --git a/src/dolphin/base/PPCArch.c b/src/dolphin/base/PPCArch.c
index b23dc209ee..e8be975a11 100644
--- a/src/dolphin/base/PPCArch.c
+++ b/src/dolphin/base/PPCArch.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/base/PPCArch.h>
 
 asm u32 PPCMfmsr() {
diff --git a/src/dolphin/base/PPCPm.c b/src/dolphin/base/PPCPm.c
index d5ffcb4bb0..b892839645 100644
--- a/src/dolphin/base/PPCPm.c
+++ b/src/dolphin/base/PPCPm.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/base/PPCArch.h>
 
 void PMBegin(void) {
diff --git a/src/dolphin/card/CARDStatEx.c b/src/dolphin/card/CARDStatEx.c
index 681dbd5a8c..0ec84c1cea 100644
--- a/src/dolphin/card/CARDStatEx.c
+++ b/src/dolphin/card/CARDStatEx.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/card.h>
 
 #include "__card.h"
diff --git a/src/dolphin/card/CARDUnlock.c b/src/dolphin/card/CARDUnlock.c
index 2287abf7e2..63313c5098 100644
--- a/src/dolphin/card/CARDUnlock.c
+++ b/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"
diff --git a/src/dolphin/demo/DEMOAVX.c b/src/dolphin/demo/DEMOAVX.c
index 27d49172d1..927c09661c 100644
--- a/src/dolphin/demo/DEMOAVX.c
+++ b/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"
diff --git a/src/dolphin/demo/DEMOFont.c b/src/dolphin/demo/DEMOFont.c
index 9b371704c2..48299131d9 100644
--- a/src/dolphin/demo/DEMOFont.c
+++ b/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) = {
diff --git a/src/dolphin/demo/DEMOInit.c b/src/dolphin/demo/DEMOInit.c
index 630c2f5db4..c0ba85ad3f 100644
--- a/src/dolphin/demo/DEMOInit.c
+++ b/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>
diff --git a/src/dolphin/demo/DEMOPad.c b/src/dolphin/demo/DEMOPad.c
index 3320523b9f..a345c5f044 100644
--- a/src/dolphin/demo/DEMOPad.c
+++ b/src/dolphin/demo/DEMOPad.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/pad.h>
 #include <dolphin/demo.h>
 
diff --git a/src/dolphin/demo/DEMOPuts.c b/src/dolphin/demo/DEMOPuts.c
index af0ea2fe27..60dbc5326e 100644
--- a/src/dolphin/demo/DEMOPuts.c
+++ b/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>
diff --git a/src/dolphin/demo/DEMOStats.c b/src/dolphin/demo/DEMOStats.c
index ca79effef3..d16f846306 100644
--- a/src/dolphin/demo/DEMOStats.c
+++ b/src/dolphin/demo/DEMOStats.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/gx.h>
 #include <dolphin/demo.h>
 
diff --git a/src/dolphin/demo/DEMOWin.c b/src/dolphin/demo/DEMOWin.c
index 108e3769a5..b9c72bc43f 100644
--- a/src/dolphin/demo/DEMOWin.c
+++ b/src/dolphin/demo/DEMOWin.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/gx.h>
 #include <dolphin/demo.h>
 
diff --git a/src/dolphin/dsp/dsp.c b/src/dolphin/dsp/dsp.c
index 3c4177a7b7..2737aaa229 100644
--- a/src/dolphin/dsp/dsp.c
+++ b/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"
diff --git a/src/dolphin/dsp/dsp_task.c b/src/dolphin/dsp/dsp_task.c
index be844c3e17..236950cddf 100644
--- a/src/dolphin/dsp/dsp_task.c
+++ b/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"
diff --git a/src/dolphin/dvd/dvd.c b/src/dolphin/dvd/dvd.c
index 003be19cf6..d820b8354d 100644
--- a/src/dolphin/dvd/dvd.c
+++ b/src/dolphin/dvd/dvd.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 #include <dolphin/dvd.h>
 
diff --git a/src/dolphin/dvd/dvdFatal.c b/src/dolphin/dvd/dvdFatal.c
index abb3a64f3c..9bcf757247 100644
--- a/src/dolphin/dvd/dvdFatal.c
+++ b/src/dolphin/dvd/dvdFatal.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dvd.h>
 
 #include "__dvd.h"
diff --git a/src/dolphin/dvd/dvderror.c b/src/dolphin/dvd/dvderror.c
index 894312ed1d..529fcfbe71 100644
--- a/src/dolphin/dvd/dvderror.c
+++ b/src/dolphin/dvd/dvderror.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 #include <dolphin/dvd.h>
 
diff --git a/src/dolphin/dvd/dvdfs.c b/src/dolphin/dvd/dvdfs.c
index 4a0a28282f..07cd0e5ce3 100644
--- a/src/dolphin/dvd/dvdfs.c
+++ b/src/dolphin/dvd/dvdfs.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dvd.h>
 
 #include "__dvd.h"
diff --git a/src/dolphin/dvd/dvdidutils.c b/src/dolphin/dvd/dvdidutils.c
index 64e533ea43..4dc13d7e46 100644
--- a/src/dolphin/dvd/dvdidutils.c
+++ b/src/dolphin/dvd/dvdidutils.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dvd.h>
 
 #include "__dvd.h"
diff --git a/src/dolphin/dvd/dvdlow.c b/src/dolphin/dvd/dvdlow.c
index 9e2c834f37..19c8439d92 100644
--- a/src/dolphin/dvd/dvdlow.c
+++ b/src/dolphin/dvd/dvdlow.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dvd.h>
 
 #include "__dvd.h"
diff --git a/src/dolphin/dvd/dvdqueue.c b/src/dolphin/dvd/dvdqueue.c
index 2106f8cdad..fcede7672f 100644
--- a/src/dolphin/dvd/dvdqueue.c
+++ b/src/dolphin/dvd/dvdqueue.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/dvd.h>
 
 #include "__dvd.h"
diff --git a/src/dolphin/dvd/fstload.c b/src/dolphin/dvd/fstload.c
index 555517ddf1..db588254f0 100644
--- a/src/dolphin/dvd/fstload.c
+++ b/src/dolphin/dvd/fstload.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 #include <dolphin/dvd.h>
 
diff --git a/src/dolphin/exi/EXIAd16.c b/src/dolphin/exi/EXIAd16.c
index 668dcaa140..ead4b21dd4 100644
--- a/src/dolphin/exi/EXIAd16.c
+++ b/src/dolphin/exi/EXIAd16.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/exi.h>
 
 static BOOL Initialized;
diff --git a/src/dolphin/exi/EXIBios.c b/src/dolphin/exi/EXIBios.c
index 4f4465bcbe..aca473001f 100644
--- a/src/dolphin/exi/EXIBios.c
+++ b/src/dolphin/exi/EXIBios.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 #define REG_MAX 5
 #define REG(chan, idx) (__EXIRegs[((chan) * REG_MAX) + (idx)])
diff --git a/src/dolphin/mcc/fio.c b/src/dolphin/mcc/fio.c
index e576373491..b60e64ef96 100644
--- a/src/dolphin/mcc/fio.c
+++ b/src/dolphin/mcc/fio.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mcc.h>
 
 #if DEBUG
diff --git a/src/dolphin/mcc/mcc.c b/src/dolphin/mcc/mcc.c
index e0f3014fcc..fa75efe415 100644
--- a/src/dolphin/mcc/mcc.c
+++ b/src/dolphin/mcc/mcc.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mcc.h>
 
 #if DEBUG
diff --git a/src/dolphin/mcc/tty.c b/src/dolphin/mcc/tty.c
index bb8aa31818..8e99578a71 100644
--- a/src/dolphin/mcc/tty.c
+++ b/src/dolphin/mcc/tty.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mcc.h>
 
 #if DEBUG
diff --git a/src/dolphin/mix/mix.c b/src/dolphin/mix/mix.c
index 1ec6539b02..45d727856a 100644
--- a/src/dolphin/mix/mix.c
+++ b/src/dolphin/mix/mix.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mix.h>
 
 u16 __MIXVolumeTable[965] = {
diff --git a/src/dolphin/mtx/mtx.c b/src/dolphin/mtx/mtx.c
index 2fd287beb5..888246b1f1 100644
--- a/src/dolphin/mtx/mtx.c
+++ b/src/dolphin/mtx/mtx.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mtx.h>
 #include <math.h>
 
diff --git a/src/dolphin/mtx/mtx44.c b/src/dolphin/mtx/mtx44.c
index d1657d341a..8c6526833b 100644
--- a/src/dolphin/mtx/mtx44.c
+++ b/src/dolphin/mtx/mtx44.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mtx.h>
 #include <math.h>
 
diff --git a/src/dolphin/mtx/mtx44vec.c b/src/dolphin/mtx/mtx44vec.c
index e0989ed750..19b03894a7 100644
--- a/src/dolphin/mtx/mtx44vec.c
+++ b/src/dolphin/mtx/mtx44vec.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mtx.h>
 #include "fake_tgmath.h"
 
diff --git a/src/dolphin/mtx/mtxstack.c b/src/dolphin/mtx/mtxstack.c
index 475175c2ca..5502b2e9d4 100644
--- a/src/dolphin/mtx/mtxstack.c
+++ b/src/dolphin/mtx/mtxstack.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mtx.h>
 #include "fake_tgmath.h"
 
diff --git a/src/dolphin/mtx/mtxvec.c b/src/dolphin/mtx/mtxvec.c
index befb7684b8..61cb3ae6ad 100644
--- a/src/dolphin/mtx/mtxvec.c
+++ b/src/dolphin/mtx/mtxvec.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mtx.h>
 #include <math.h>
 
diff --git a/src/dolphin/mtx/psmtx.c b/src/dolphin/mtx/psmtx.c
index f8f79d1573..cc75ea8b3d 100644
--- a/src/dolphin/mtx/psmtx.c
+++ b/src/dolphin/mtx/psmtx.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mtx.h>
 #include "fake_tgmath.h"
 
diff --git a/src/dolphin/mtx/quat.c b/src/dolphin/mtx/quat.c
index 2acb4a7d3b..cf00deb3df 100644
--- a/src/dolphin/mtx/quat.c
+++ b/src/dolphin/mtx/quat.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mtx.h>
 #include <math.h>
 
diff --git a/src/dolphin/mtx/vec.c b/src/dolphin/mtx/vec.c
index 3a3aff27a2..c501097268 100644
--- a/src/dolphin/mtx/vec.c
+++ b/src/dolphin/mtx/vec.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/mtx.h>
 #include <math.h>
 
diff --git a/src/dolphin/odemustubs/odemustubs.c b/src/dolphin/odemustubs/odemustubs.c
index ed3c2bbb1c..bdd9b9760e 100644
--- a/src/dolphin/odemustubs/odemustubs.c
+++ b/src/dolphin/odemustubs/odemustubs.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 // prototypes
 DECL_WEAK int Hu_IsStub();
diff --git a/src/dolphin/odenotstub/odenotstub.c b/src/dolphin/odenotstub/odenotstub.c
index 987b74e9c7..be358495b9 100644
--- a/src/dolphin/odenotstub/odenotstub.c
+++ b/src/dolphin/odenotstub/odenotstub.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 // prototypes
 DECL_WEAK int Hu_IsStub();
diff --git a/src/dolphin/os/OS.c b/src/dolphin/os/OS.c
index 24a274b571..4c4d65ee43 100644
--- a/src/dolphin/os/OS.c
+++ b/src/dolphin/os/OS.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/exi.h>
 #include <dolphin/os.h>
 #include <dolphin/si.h>
diff --git a/src/dolphin/os/OSAlarm.c b/src/dolphin/os/OSAlarm.c
index b1922a6fa2..676f41010d 100644
--- a/src/dolphin/os/OSAlarm.c
+++ b/src/dolphin/os/OSAlarm.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSAlloc.c b/src/dolphin/os/OSAlloc.c
index b45ba83aef..879f93af00 100644
--- a/src/dolphin/os/OSAlloc.c
+++ b/src/dolphin/os/OSAlloc.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #define ALIGNMENT 32
diff --git a/src/dolphin/os/OSArena.c b/src/dolphin/os/OSArena.c
index ab7b5feeab..507fcfa7da 100644
--- a/src/dolphin/os/OSArena.c
+++ b/src/dolphin/os/OSArena.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #define ROUND(n, a) (((u32)(n) + (a)-1) & ~((a)-1))
diff --git a/src/dolphin/os/OSAudioSystem.c b/src/dolphin/os/OSAudioSystem.c
index 3ffd4403e2..6a820e7268 100644
--- a/src/dolphin/os/OSAudioSystem.c
+++ b/src/dolphin/os/OSAudioSystem.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSCache.c b/src/dolphin/os/OSCache.c
index c1bd1f2590..c950516af6 100644
--- a/src/dolphin/os/OSCache.c
+++ b/src/dolphin/os/OSCache.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/db.h>
 #include <dolphin/os.h>
 
diff --git a/src/dolphin/os/OSContext.c b/src/dolphin/os/OSContext.c
index 0edc0f863c..93064549ca 100644
--- a/src/dolphin/os/OSContext.c
+++ b/src/dolphin/os/OSContext.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSError.c b/src/dolphin/os/OSError.c
index 5a545392f4..f01258fca2 100644
--- a/src/dolphin/os/OSError.c
+++ b/src/dolphin/os/OSError.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSExec.c b/src/dolphin/os/OSExec.c
index 77fc0c86c1..5ed339fbe8 100644
--- a/src/dolphin/os/OSExec.c
+++ b/src/dolphin/os/OSExec.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSFatal.c b/src/dolphin/os/OSFatal.c
index 673ddf90db..2624f504c0 100644
--- a/src/dolphin/os/OSFatal.c
+++ b/src/dolphin/os/OSFatal.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 #include <dolphin/gx.h>
 #include <dolphin/exi.h>
diff --git a/src/dolphin/os/OSFont.c b/src/dolphin/os/OSFont.c
index 6cab5a1a52..0ae2538f50 100644
--- a/src/dolphin/os/OSFont.c
+++ b/src/dolphin/os/OSFont.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSInterrupt.c b/src/dolphin/os/OSInterrupt.c
index 3c174a21e4..a075e88829 100644
--- a/src/dolphin/os/OSInterrupt.c
+++ b/src/dolphin/os/OSInterrupt.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSLink.c b/src/dolphin/os/OSLink.c
index fbe11fef3c..54801396ff 100644
--- a/src/dolphin/os/OSLink.c
+++ b/src/dolphin/os/OSLink.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSMemory.c b/src/dolphin/os/OSMemory.c
index 0e0ac287b1..04148cadf5 100644
--- a/src/dolphin/os/OSMemory.c
+++ b/src/dolphin/os/OSMemory.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 #include <dolphin/dvd.h>
 
diff --git a/src/dolphin/os/OSMessage.c b/src/dolphin/os/OSMessage.c
index 476891b6ee..0fb17b4114 100644
--- a/src/dolphin/os/OSMessage.c
+++ b/src/dolphin/os/OSMessage.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 void OSInitMessageQueue(OSMessageQueue* mq, void* msgArray, s32 msgCount) {
diff --git a/src/dolphin/os/OSMutex.c b/src/dolphin/os/OSMutex.c
index 66b4abd2cb..c223c3eaed 100644
--- a/src/dolphin/os/OSMutex.c
+++ b/src/dolphin/os/OSMutex.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSReboot.c b/src/dolphin/os/OSReboot.c
index c921b4d8a7..d18476d047 100644
--- a/src/dolphin/os/OSReboot.c
+++ b/src/dolphin/os/OSReboot.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSReset.c b/src/dolphin/os/OSReset.c
index 21953da870..67e80900e8 100644
--- a/src/dolphin/os/OSReset.c
+++ b/src/dolphin/os/OSReset.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSResetSW.c b/src/dolphin/os/OSResetSW.c
index bbc5d2d161..e27224947b 100644
--- a/src/dolphin/os/OSResetSW.c
+++ b/src/dolphin/os/OSResetSW.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSSemaphore.c b/src/dolphin/os/OSSemaphore.c
index c58e20dd51..864689678e 100644
--- a/src/dolphin/os/OSSemaphore.c
+++ b/src/dolphin/os/OSSemaphore.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 void OSInitSemaphore(OSSemaphore* sem, s32 count) {
diff --git a/src/dolphin/os/OSStopwatch.c b/src/dolphin/os/OSStopwatch.c
index c53c1689e5..a5e4e3a5aa 100644
--- a/src/dolphin/os/OSStopwatch.c
+++ b/src/dolphin/os/OSStopwatch.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 void OSInitStopwatch(OSStopwatch* sw, char* name) {
diff --git a/src/dolphin/os/OSSync.c b/src/dolphin/os/OSSync.c
index 0f91a19fce..5a468efabc 100644
--- a/src/dolphin/os/OSSync.c
+++ b/src/dolphin/os/OSSync.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSThread.c b/src/dolphin/os/OSThread.c
index 6befa33a5d..48dd553eb9 100644
--- a/src/dolphin/os/OSThread.c
+++ b/src/dolphin/os/OSThread.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSTimer.c b/src/dolphin/os/OSTimer.c
index 1d0f90a02b..bab96915f0 100644
--- a/src/dolphin/os/OSTimer.c
+++ b/src/dolphin/os/OSTimer.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/OSUtf.c b/src/dolphin/os/OSUtf.c
index ddfa23dde4..b4c1cf55c3 100644
--- a/src/dolphin/os/OSUtf.c
+++ b/src/dolphin/os/OSUtf.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 char* OSUTF8to32(const char* utf8, u32* utf32) {
diff --git a/src/dolphin/os/__ppc_eabi_init.c b/src/dolphin/os/__ppc_eabi_init.c
index 3e4d27b501..9c0054a4c7 100644
--- a/src/dolphin/os/__ppc_eabi_init.c
+++ b/src/dolphin/os/__ppc_eabi_init.c
@@ -1,5 +1,5 @@
 #include <stdlib.h>
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/os/__start.c b/src/dolphin/os/__start.c
index c9172e44f5..62349da961 100644
--- a/src/dolphin/os/__start.c
+++ b/src/dolphin/os/__start.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include "__ppc_eabi_linker.h"
 
 extern void InitMetroTRK();
diff --git a/src/dolphin/os/time.dolphin.c b/src/dolphin/os/time.dolphin.c
index 5e9d20af8e..0bbe26b9db 100644
--- a/src/dolphin/os/time.dolphin.c
+++ b/src/dolphin/os/time.dolphin.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 
 #include "__os.h"
diff --git a/src/dolphin/pad/Pad.c b/src/dolphin/pad/Pad.c
index 27c554518e..942716514c 100644
--- a/src/dolphin/pad/Pad.c
+++ b/src/dolphin/pad/Pad.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/pad.h>
 #include <dolphin/si.h>
 
diff --git a/src/dolphin/pad/Padclamp.c b/src/dolphin/pad/Padclamp.c
index 741a0e87b7..960e38880c 100644
--- a/src/dolphin/pad/Padclamp.c
+++ b/src/dolphin/pad/Padclamp.c
@@ -1,5 +1,5 @@
 #include "fake_tgmath.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/pad.h>
 
 static const PADClampRegion ClampRegion = {
diff --git a/src/dolphin/perf/perf.c b/src/dolphin/perf/perf.c
index fc86eebd67..a5529239bb 100644
--- a/src/dolphin/perf/perf.c
+++ b/src/dolphin/perf/perf.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/gx.h>
 #include <dolphin/perf.h>
 #include "fake_tgmath.h"
diff --git a/src/dolphin/perf/perfdraw.c b/src/dolphin/perf/perfdraw.c
index 8bd961af0c..2e23517082 100644
--- a/src/dolphin/perf/perfdraw.c
+++ b/src/dolphin/perf/perfdraw.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/perf.h>
 #include "fake_tgmath.h"
 
diff --git a/src/dolphin/seq/seq.c b/src/dolphin/seq/seq.c
index 582a323395..1c5745dc73 100644
--- a/src/dolphin/seq/seq.c
+++ b/src/dolphin/seq/seq.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/seq.h>
 
 static u8 __SEQMidiEventLength[128] = {
diff --git a/src/dolphin/si/SISamplingRate.c b/src/dolphin/si/SISamplingRate.c
index b1a6f60f8c..53d37d407a 100644
--- a/src/dolphin/si/SISamplingRate.c
+++ b/src/dolphin/si/SISamplingRate.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/si.h>
 
 #include "__os.h"
diff --git a/src/dolphin/si/SISteering.c b/src/dolphin/si/SISteering.c
index ceae68b131..156fea91d5 100644
--- a/src/dolphin/si/SISteering.c
+++ b/src/dolphin/si/SISteering.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/si.h>
 
 #include "__si.h"
diff --git a/src/dolphin/si/SISteeringAuto.c b/src/dolphin/si/SISteeringAuto.c
index b8e23e97fd..98d38991b6 100644
--- a/src/dolphin/si/SISteeringAuto.c
+++ b/src/dolphin/si/SISteeringAuto.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/si.h>
 
 static void (*SamplingCallback)();
diff --git a/src/dolphin/si/SISteeringXfer.c b/src/dolphin/si/SISteeringXfer.c
index 3bb8abdb89..7f37b70664 100644
--- a/src/dolphin/si/SISteeringXfer.c
+++ b/src/dolphin/si/SISteeringXfer.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/si.h>
 
 #include "__os.h"
diff --git a/src/dolphin/sp/sp.c b/src/dolphin/sp/sp.c
index b934423b2b..0031e60d7d 100644
--- a/src/dolphin/sp/sp.c
+++ b/src/dolphin/sp/sp.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/sp.h>
 
 void SPInitSoundTable(SPSoundTable* table, u32 aramBase, u32 zeroBase) {
diff --git a/src/dolphin/syn/syn.c b/src/dolphin/syn/syn.c
index 17bdebc515..8dd2771166 100644
--- a/src/dolphin/syn/syn.c
+++ b/src/dolphin/syn/syn.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/os.h>
 #include <dolphin/ax.h>
 #include <dolphin/mix.h>
diff --git a/src/dolphin/syn/synctrl.c b/src/dolphin/syn/synctrl.c
index cfae4ec96e..8c96fb8368 100644
--- a/src/dolphin/syn/synctrl.c
+++ b/src/dolphin/syn/synctrl.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/mix.h>
 #include <dolphin/syn.h>
diff --git a/src/dolphin/syn/synenv.c b/src/dolphin/syn/synenv.c
index caafb5ea07..7d7f15fe8a 100644
--- a/src/dolphin/syn/synenv.c
+++ b/src/dolphin/syn/synenv.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/syn.h>
 #include "fake_tgmath.h"
diff --git a/src/dolphin/syn/synlfo.c b/src/dolphin/syn/synlfo.c
index 22ace20110..9625c3b176 100644
--- a/src/dolphin/syn/synlfo.c
+++ b/src/dolphin/syn/synlfo.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/syn.h>
 #include "fake_tgmath.h"
diff --git a/src/dolphin/syn/synmix.c b/src/dolphin/syn/synmix.c
index 56dc0ac178..bfa9fdd49a 100644
--- a/src/dolphin/syn/synmix.c
+++ b/src/dolphin/syn/synmix.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/syn.h>
 #include <dolphin/mix.h>
diff --git a/src/dolphin/syn/synpitch.c b/src/dolphin/syn/synpitch.c
index ed1d543734..ce38a83114 100644
--- a/src/dolphin/syn/synpitch.c
+++ b/src/dolphin/syn/synpitch.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/syn.h>
 #include "fake_tgmath.h"
 
diff --git a/src/dolphin/syn/synsample.c b/src/dolphin/syn/synsample.c
index 8419c57189..e1c1f05ac1 100644
--- a/src/dolphin/syn/synsample.c
+++ b/src/dolphin/syn/synsample.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/syn.h>
 #include "fake_tgmath.h"
diff --git a/src/dolphin/syn/synvoice.c b/src/dolphin/syn/synvoice.c
index ea5e66d5ba..ec6ea4437b 100644
--- a/src/dolphin/syn/synvoice.c
+++ b/src/dolphin/syn/synvoice.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/ax.h>
 #include <dolphin/mix.h>
 #include <dolphin/syn.h>
diff --git a/src/dolphin/syn/synwt.c b/src/dolphin/syn/synwt.c
index 6a03e030af..8b29c511a8 100644
--- a/src/dolphin/syn/synwt.c
+++ b/src/dolphin/syn/synwt.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 #include <dolphin/syn.h>
 #include "fake_tgmath.h"
 
diff --git a/src/f_pc/f_pc_deletor.cpp b/src/f_pc/f_pc_deletor.cpp
index 23b061652c..6eec2c76e2 100644
--- a/src/f_pc/f_pc_deletor.cpp
+++ b/src/f_pc/f_pc_deletor.cpp
@@ -39,7 +39,7 @@ void fpcDt_Handler() {
         g_fpcDbSv_service[6](&g_fpcDtTg_Queue.mSize);
     }
 #endif
-    cLsIt_Method(&g_fpcDtTg_Queue, (cNdIt_MethodFunc)fpcDtTg_Do, fpcDt_deleteMethod);
+    cLsIt_Method(&g_fpcDtTg_Queue, (cNdIt_MethodFunc)fpcDtTg_Do, (void*)fpcDt_deleteMethod);
 }
 
 s32 fpcDt_ToQueue(base_process_class* i_proc) {
diff --git a/src/f_pc/f_pc_layer_iter.cpp b/src/f_pc/f_pc_layer_iter.cpp
index df8344aa20..3ea631f1eb 100644
--- a/src/f_pc/f_pc_layer_iter.cpp
+++ b/src/f_pc/f_pc_layer_iter.cpp
@@ -10,7 +10,7 @@
 
 s32 fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) {
     layer_iter iter;
-    iter.func = i_func;
+    iter.func = (void*)i_func;
     iter.data = i_data;
     return cTrIt_Method(&i_layer->node_tree, (cNdIt_MethodFunc)cTgIt_MethodCall, &iter);
 }
@@ -31,7 +31,7 @@ s32 fpcLyIt_All(fpcLyIt_OnlyHereFunc i_func, void* i_data) {
 
     layer_iter iter;
     layer_class* layer;
-    iter.func = i_func;
+    iter.func = (void*)i_func;
     iter.data = i_data;
 
     for (layer = fpcLy_RootLayer(); layer != NULL; layer = (layer_class*)layer->node.mpNextNode) {
@@ -45,7 +45,7 @@ s32 fpcLyIt_All(fpcLyIt_OnlyHereFunc i_func, void* i_data) {
 
 void* fpcLyIt_Judge(layer_class* i_layer, fpcLyIt_JudgeFunc i_func, void* i_data) {
     layer_iter iter;
-    iter.func = i_func;
+    iter.func = (void*)i_func;
     iter.data = i_data;
     return cTrIt_Judge(&i_layer->node_tree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &iter);
 }
@@ -55,7 +55,7 @@ void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc i_func, void* i_data) {
 
     layer_iter iter;
     layer_class* layer;
-    iter.func = i_func;
+    iter.func = (void*)i_func;
     iter.data = i_data;
 
     for (layer = fpcLy_RootLayer(); layer != NULL; layer = (layer_class*)layer->node.mpNextNode) {
diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp
index b445e994bc..0d5bc43e4d 100644
--- a/src/f_pc/f_pc_stdcreate_req.cpp
+++ b/src/f_pc/f_pc_stdcreate_req.cpp
@@ -8,7 +8,7 @@
 #include "f_pc/f_pc_node.h"
 #include "f_pc/f_pc_manager.h"
 #include "f_pc/f_pc_debug_sv.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 s32 fpcSCtRq_phase_Load(standard_create_request_class* i_request) {
     int ret = fpcLd_Load(i_request->process_name);
diff --git a/src/m_Do/m_Do_ext.cpp b/src/m_Do/m_Do_ext.cpp
index 4c4f85c785..ffe36c4cec 100644
--- a/src/m_Do/m_Do_ext.cpp
+++ b/src/m_Do/m_Do_ext.cpp
@@ -2189,8 +2189,8 @@ void mDoExt_3DlineMat0_c::draw() {
     int var_r26 = (field_0x14 << 1) & 0xFFFF;
 
     for (int i = 0; i < field_0x10; i++) {
-        GXSetArray(GX_VA_POS, ((mDoExt_3Dline_c*)((int)var_r28 + field_0x16 * 4))->field_0x8, sizeof(cXyz));
-        GXSetArray(GX_VA_NRM, ((mDoExt_3Dline_c*)((int)var_r28 + field_0x16 * 4))->field_0x10, 3);
+        GXSetArray(GX_VA_POS, ((mDoExt_3Dline_c*)((intptr_t)var_r28 + field_0x16 * 4))->field_0x8, sizeof(cXyz));
+        GXSetArray(GX_VA_NRM, ((mDoExt_3Dline_c*)((intptr_t)var_r28 + field_0x16 * 4))->field_0x10, 3);
 
         GXBegin(GX_TRIANGLESTRIP, GX_VTXFMT0, var_r26);
         for (u16 j = 0; j < (u16)var_r26; j++) {
@@ -2245,9 +2245,9 @@ void mDoExt_3DlineMat0_c::update(int param_0, f32 param_1, GXColor& param_2, u16
     for (s32 sp_14 = 0; sp_14 < field_0x10; sp_14++) {
         local_r27 = sp_28->field_0x0;
 
-        sp_1c = ((mDoExt_3Dline_c*)((int)sp_28 + (field_0x16 << 2)))->field_0x8;
+        sp_1c = ((mDoExt_3Dline_c*)((intptr_t)sp_28 + (field_0x16 << 2)))->field_0x8;
         local_r26 = sp_1c;
-        sp_18 = ((mDoExt_3Dline_c*)((int)sp_28 + (field_0x16 << 2)))->field_0x10;
+        sp_18 = ((mDoExt_3Dline_c*)((intptr_t)sp_28 + (field_0x16 << 2)))->field_0x10;
         local_r30 = sp_18;
 
         local_r29 = local_r30 + 1;
@@ -2366,9 +2366,9 @@ void mDoExt_3DlineMat0_c::update(int param_0, GXColor& param_2, dKy_tevstr_c* pa
 
         JUT_ASSERT(0x1545, sp_18 != NULL);
 
-        sp_20 = ((mDoExt_3Dline_c*)((int)sp_30 + (field_0x16 << 2)))->field_0x8;
+        sp_20 = ((mDoExt_3Dline_c*)((intptr_t)sp_30 + (field_0x16 << 2)))->field_0x8;
         sp_24 = sp_20;
-        sp_1c = ((mDoExt_3Dline_c*)((int)sp_30 + (field_0x16 << 2)))->field_0x10;
+        sp_1c = ((mDoExt_3Dline_c*)((intptr_t)sp_30 + (field_0x16 << 2)))->field_0x10;
         local_r30 = sp_1c;
 
         local_r29 = local_r30 + 1;
@@ -2455,7 +2455,7 @@ int mDoExt_3DlineMat1_c::init(u16 param_0, u16 param_1, ResTIMG* param_2, int pa
     field_0x4 = 0;
     mIsDrawn = 0;
 
-    GXInitTexObj(&mTextureObject, (void*)((int)param_2 + param_2->imageOffset), param_2->width,
+    GXInitTexObj(&mTextureObject, (void*)((intptr_t)param_2 + param_2->imageOffset), param_2->width,
                  param_2->height, (GXTexFmt)param_2->format, (GXTexWrapMode)param_2->wrapS,
                  (GXTexWrapMode)param_2->wrapT, param_2->mipmapCount > 1 ? GX_TRUE : GX_FALSE);
     GXInitTexObjLOD(&mTextureObject, (GXTexFilter)param_2->minFilter,
@@ -2564,14 +2564,14 @@ void mDoExt_3DlineMat1_c::update(int param_0, f32 param_1, _GXColor& param_2, u1
 
     for (s32 sp_14 = 0; sp_14 < mNumLines; sp_14++) {
         local_r27 = sp_38[0].field_0x0;
-        sp_24 = ((mDoExt_3Dline_c*)((int)sp_38 + (mIsDrawn << 2)))->field_0x8;
+        sp_24 = ((mDoExt_3Dline_c*)((intptr_t)sp_38 + (mIsDrawn << 2)))->field_0x8;
         sp_28 = sp_24;
 
-        sp_20 = ((mDoExt_3Dline_c*)((int)sp_38 + (mIsDrawn << 2)))->field_0x10;
+        sp_20 = ((mDoExt_3Dline_c*)((intptr_t)sp_38 + (mIsDrawn << 2)))->field_0x10;
         local_r30 = sp_20;
         local_r28 = local_r30 + 1;
 
-        sp_18 = ((mDoExt_3Dline_c*)((int)sp_38 + (mIsDrawn << 2)))->field_0x18;
+        sp_18 = ((mDoExt_3Dline_c*)((intptr_t)sp_38 + (mIsDrawn << 2)))->field_0x18;
         sp_1c = sp_18;
 
         local_f29 = param_1;
@@ -2711,12 +2711,12 @@ void mDoExt_3DlineMat1_c::update(int param_0, _GXColor& param_2, dKy_tevstr_c* p
         local_r27 = sp_38[0].field_0x0;
         local_r18 = sp_38->field_0x4;
         JUT_ASSERT(0x16f3, sp_18 != NULL);
-        sp_24 = ((mDoExt_3Dline_c*)((int)sp_38 + (mIsDrawn << 2)))->field_0x8;
+        sp_24 = ((mDoExt_3Dline_c*)((intptr_t)sp_38 + (mIsDrawn << 2)))->field_0x8;
         sp_28 = sp_24;
-        sp_20 = ((mDoExt_3Dline_c*)((int)sp_38 + (mIsDrawn << 2)))->field_0x10;
+        sp_20 = ((mDoExt_3Dline_c*)((intptr_t)sp_38 + (mIsDrawn << 2)))->field_0x10;
         local_r30 = sp_20;
         local_r28 = local_r30 + 1;
-        sp_18 = ((mDoExt_3Dline_c*)((int)sp_38 + (mIsDrawn << 2)))->field_0x18;
+        sp_18 = ((mDoExt_3Dline_c*)((intptr_t)sp_38 + (mIsDrawn << 2)))->field_0x18;
         sp_1c = sp_18;
         sp_1c++->field_0x4 = local_f31;
         sp_1c++->field_0x4 = local_f31;
diff --git a/src/m_Do/m_Do_graphic.cpp b/src/m_Do/m_Do_graphic.cpp
index 5b80b40201..7c6074323a 100644
--- a/src/m_Do/m_Do_graphic.cpp
+++ b/src/m_Do/m_Do_graphic.cpp
@@ -191,8 +191,10 @@ static void drawHeapMap() {
                 heap = mDoExt_getGameHeap();
                 OSReport_Error("ゲームヒープマップ表示\n");
             } else if (l_heapMapMode == 2) {
+#if PLATFORM_WII || PLATFORM_SHIELD
                 heap = (JKRExpHeap*)DynamicModuleControlBase::getHeap();
                 OSReport_Error("ダイナミックリンクヒープマップ表示\n");
+#endif
             } else if (l_heapMapMode == 4) {
                 heap = mDoExt_getZeldaHeap();
                 OSReport_Error("ゼルダヒープマップ表示\n");
@@ -1166,7 +1168,7 @@ void mDoGph_gInf_c::bloom_c::draw() {
             GXSetTevAlphaOp(GX_TEVSTAGE2, GX_TEV_ADD, GX_TB_ZERO, GX_CS_SCALE_1, GX_TRUE,
                             GX_TEVPREV);
             GXSetBlendMode(GX_BM_NONE, GX_BL_ZERO, GX_BL_ZERO, GX_LO_OR);
-            GXColorS10 tevColor0 = {-mPoint, -mPoint, -mPoint, 0x40};
+            GXColorS10 tevColor0 = {(s16)-mPoint, (s16)-mPoint, (s16)-mPoint, 0x40};
             GXSetTevColorS10(GX_TEVREG0, tevColor0);
             GXColor tevColor1 = {mBlureRatio, mBlureRatio, mBlureRatio, mBlureRatio};
             GXSetTevColor(GX_TEVREG1, tevColor1);
diff --git a/src/m_Do/m_Do_hostIO.cpp b/src/m_Do/m_Do_hostIO.cpp
index 3183dc76e7..ba3523106e 100644
--- a/src/m_Do/m_Do_hostIO.cpp
+++ b/src/m_Do/m_Do_hostIO.cpp
@@ -1,5 +1,5 @@
 #include "m_Do/m_Do_hostIO.h"
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 #if DEBUG
 
diff --git a/src/m_Do/m_Do_machine.cpp b/src/m_Do/m_Do_machine.cpp
index fed3d8c4d3..19fc4e6d57 100644
--- a/src/m_Do/m_Do_machine.cpp
+++ b/src/m_Do/m_Do_machine.cpp
@@ -16,7 +16,9 @@
 #include "SSystem/SComponent/c_malloc.h"
 #include "SSystem/SComponent/c_math.h"
 #include "SSystem/SComponent/c_API_controller_pad.h"
+#ifdef __MWERKS__
 #include "base/PPCArch.h"
+#endif
 #include "m_Do/m_Do_DVDError.h"
 #include "m_Do/m_Do_MemCard.h"
 #include "m_Do/m_Do_Reset.h"
diff --git a/src/odenotstub/odenotstub.c b/src/odenotstub/odenotstub.c
index ca91654dbd..48e09dbd05 100644
--- a/src/odenotstub/odenotstub.c
+++ b/src/odenotstub/odenotstub.c
@@ -1,4 +1,4 @@
-#include <dolphin.h>
+#include <dolphin/dolphin.h>
 
 u8 Hu_IsStub() {
     return 0;