From d91ba5eeb7484fe518fa40e1d2169e69fd229ce0 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 9 Sep 2023 13:48:14 -0700 Subject: [PATCH 1/4] f_pc progress --- configure.py | 22 +-- include/c/c_dylink.h | 26 +++ include/f_pc/f_pc_layer.h | 2 +- include/f_pc/f_pc_method_iter.h | 2 +- include/f_pc/f_pc_stdcreate_req.h | 12 +- src/f_pc/f_pc_draw.cpp | 33 +++- src/f_pc/f_pc_draw_priority.cpp | 13 +- src/f_pc/f_pc_executor.cpp | 73 ++++++-- src/f_pc/f_pc_fstcreate_req.cpp | 47 ++++- src/f_pc/f_pc_layer.cpp | 140 +++++++++----- src/f_pc/f_pc_layer_iter.cpp | 45 ++++- src/f_pc/f_pc_layer_tag.cpp | 70 ++++++- src/f_pc/f_pc_leaf.cpp | 54 ++++-- src/f_pc/f_pc_line.cpp | 15 +- src/f_pc/f_pc_line_iter.cpp | 25 ++- src/f_pc/f_pc_line_tag.cpp | 32 +++- src/f_pc/f_pc_load.cpp | 30 ++- src/f_pc/f_pc_manager.cpp | 20 +- src/f_pc/f_pc_method.cpp | 24 +-- src/f_pc/f_pc_method_iter.cpp | 6 +- src/f_pc/f_pc_method_tag.cpp | 20 +- src/f_pc/f_pc_node.cpp | 95 ++++++++-- src/f_pc/f_pc_node_req.cpp | 292 +++++++++++++++++++++++++----- src/f_pc/f_pc_pause.cpp | 41 ++++- src/f_pc/f_pc_priority.cpp | 147 +++++++++++++-- src/f_pc/f_pc_profile.cpp | 7 +- src/f_pc/f_pc_profile_lst.cpp | 15 +- src/f_pc/f_pc_searcher.cpp | 17 +- src/f_pc/f_pc_stdcreate_req.cpp | 113 +++++++++--- 29 files changed, 1127 insertions(+), 311 deletions(-) create mode 100644 include/c/c_dylink.h diff --git a/configure.py b/configure.py index 449b9fe..1e63960 100644 --- a/configure.py +++ b/configure.py @@ -214,23 +214,23 @@ LIBS = [ NonMatching("f_pc/f_pc_deletor.cpp"), NonMatching("f_pc/f_pc_draw_priority.cpp"), NonMatching("f_pc/f_pc_executor.cpp"), + NonMatching("f_pc/f_pc_layer.cpp"), + Matching ("f_pc/f_pc_leaf.cpp"), NonMatching("f_pc/f_pc_layer_iter.cpp"), NonMatching("f_pc/f_pc_layer_tag.cpp"), - NonMatching("f_pc/f_pc_layer.cpp"), - NonMatching("f_pc/f_pc_leaf.cpp"), - NonMatching("f_pc/f_pc_line.cpp"), - NonMatching("f_pc/f_pc_load.cpp"), + Matching ("f_pc/f_pc_line.cpp"), + Matching ("f_pc/f_pc_load.cpp"), NonMatching("f_pc/f_pc_manager.cpp"), - NonMatching("f_pc/f_pc_method.cpp"), - NonMatching("f_pc/f_pc_node_req.cpp"), + Matching ("f_pc/f_pc_method.cpp"), NonMatching("f_pc/f_pc_node.cpp"), - NonMatching("f_pc/f_pc_priority.cpp"), + NonMatching("f_pc/f_pc_node_req.cpp"), + Matching ("f_pc/f_pc_priority.cpp"), NonMatching("f_pc/f_pc_profile_lst.cpp"), - NonMatching("f_pc/f_pc_profile.cpp"), - NonMatching("f_pc/f_pc_searcher.cpp"), - NonMatching("f_pc/f_pc_line_tag.cpp"), + Matching ("f_pc/f_pc_profile.cpp"), + Matching ("f_pc/f_pc_searcher.cpp"), + Matching ("f_pc/f_pc_line_tag.cpp"), NonMatching("f_pc/f_pc_line_iter.cpp"), - NonMatching("f_pc/f_pc_method_iter.cpp"), + Matching ("f_pc/f_pc_method_iter.cpp"), NonMatching("f_pc/f_pc_method_tag.cpp"), NonMatching("f_pc/f_pc_pause.cpp"), NonMatching("f_pc/f_pc_draw.cpp"), diff --git a/include/c/c_dylink.h b/include/c/c_dylink.h new file mode 100644 index 0000000..27cb75e --- /dev/null +++ b/include/c/c_dylink.h @@ -0,0 +1,26 @@ +#ifndef C_C_DYLINK_H +#define C_C_DYLINK_H + +#include "f_op/f_op_scene_mng.h" + +struct cDylPhs { + /* 80018804 */ static int phase_01(void*); + /* 8001880C */ static int phase_02(s16*); + /* 80018844 */ static int phase_03(void*); + /* 8001884C */ static int Link(request_of_phase_process_class*, s16); + /* 80018890 */ static int Unlink(request_of_phase_process_class*, s16); +}; + +struct DynamicNameTableEntry { + s16 mKey; + const char* name; +}; + +int cDyl_InitAsyncIsDone(); +void cDyl_InitAsync(); + +s32 cDyl_IsLinked(s16 i_procName); +s32 cDyl_Unlink(s16 i_procName); +s32 cDyl_LinkASync(s16 i_procName); + +#endif /* C_C_DYLINK_H */ diff --git a/include/f_pc/f_pc_layer.h b/include/f_pc/f_pc_layer.h index 02f844d..57417a1 100644 --- a/include/f_pc/f_pc_layer.h +++ b/include/f_pc/f_pc_layer.h @@ -41,7 +41,7 @@ s32 fpcLy_IntoQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag s32 fpcLy_ToQueue(layer_class* pLayer, int treeListIdx, create_tag_class* pTag); s32 fpcLy_QueueTo(layer_class* pLayer, create_tag_class* pTag); -BOOL fpcLy_Cancel(layer_class* pLayer); +s32 fpcLy_Cancel(layer_class* pLayer); bool fpcLy_CancelMethod(process_method_tag_class* pLayer); void fpcLy_CancelQTo(process_method_tag_class* pMthd); diff --git a/include/f_pc/f_pc_method_iter.h b/include/f_pc/f_pc_method_iter.h index 633aace..c858382 100644 --- a/include/f_pc/f_pc_method_iter.h +++ b/include/f_pc/f_pc_method_iter.h @@ -8,6 +8,6 @@ typedef struct node_list_class node_list_class; typedef int (*fpcMtdIt_MethodFunc)(void*); -void fpcMtdIt_Method(node_list_class* pList, fpcMtdIt_MethodFunc pMethod); +int fpcMtdIt_Method(node_list_class* pList, fpcMtdIt_MethodFunc pMethod); #endif diff --git a/include/f_pc/f_pc_stdcreate_req.h b/include/f_pc/f_pc_stdcreate_req.h index 0184402..dcd4144 100644 --- a/include/f_pc/f_pc_stdcreate_req.h +++ b/include/f_pc/f_pc_stdcreate_req.h @@ -9,11 +9,11 @@ typedef int (*stdCreateFunc)(void*, void*); typedef struct standard_create_request_class { /* 0x00 */ create_request mBase; - /* 0x48 */ request_of_phase_process_class unk_0x48; - /* 0x50 */ s16 mLoadID; - /* 0x54 */ void* unk_0x54; - /* 0x58 */ stdCreateFunc unk_0x58; - /* 0x5C */ void* unk_0x5C; + /* 0x48 */ request_of_phase_process_class mPhase; + /* 0x50 */ s16 mProcName; + /* 0x54 */ void* mpUserData; + /* 0x58 */ stdCreateFunc mpCallBack; + /* 0x5C */ void* mpCallBackUserData; } standard_create_request_class; s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* pStdCreateReq); @@ -31,4 +31,4 @@ extern "C" { void fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv(void); } -#endif \ No newline at end of file +#endif diff --git a/src/f_pc/f_pc_draw.cpp b/src/f_pc/f_pc_draw.cpp index 22733b4..ef7b7bc 100644 --- a/src/f_pc/f_pc_draw.cpp +++ b/src/f_pc/f_pc_draw.cpp @@ -4,14 +4,37 @@ // #include "f_pc/f_pc_draw.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_API_graphic.h" +#include "f_pc/f_pc_leaf.h" +#include "f_pc/f_pc_node.h" +#include "f_pc/f_pc_pause.h" /* 8004042C-800404CC .text fpcDw_Execute__FP18base_process_class */ -void fpcDw_Execute(base_process_class*) { - /* Nonmatching */ +s32 fpcDw_Execute(base_process_class* i_proc) { + if (!fpcPause_IsEnable(i_proc, 2)) { + layer_class* curLay; + s32 ret; + process_method_func draw_func; + curLay = fpcLy_CurrentLayer(); + if (fpcBs_Is_JustOfType(g_fpcLf_type, i_proc->mSubType)) { + draw_func = ((leafdraw_method_class*)i_proc->mpPcMtd)->mpDrawFunc; + } else { + draw_func = ((nodedraw_method_class*)i_proc->mpPcMtd)->mpDrawFunc; + } + fpcLy_SetCurrentLayer(i_proc->mLyTg.mpLayer); + ret = draw_func(i_proc); + fpcLy_SetCurrentLayer(curLay); + return ret; + } else { + return 0; + } } /* 800404CC-80040520 .text fpcDw_Handler__FPFPFPvPv_i_iPFPvPv_i */ -void fpcDw_Handler(int (*)(int (*)(void*, void*)), int (*)(void*, void*)) { - /* Nonmatching */ +s32 fpcDw_Handler(fpcDw_HandlerFuncFunc param_1, fpcDw_HandlerFunc param_2) { + s32 ret; + cAPIGph_BeforeOfDraw(); + ret = param_1(param_2); + cAPIGph_AfterOfDraw(); + return ret; } diff --git a/src/f_pc/f_pc_draw_priority.cpp b/src/f_pc/f_pc_draw_priority.cpp index e3610a8..67b3008 100644 --- a/src/f_pc/f_pc_draw_priority.cpp +++ b/src/f_pc/f_pc_draw_priority.cpp @@ -4,19 +4,18 @@ // #include "f_pc/f_pc_draw_priority.h" -#include "dolphin/types.h" /* 8003D580-8003D588 .text fpcDwPi_Get__FP19draw_priority_class */ -void fpcDwPi_Get(draw_priority_class*) { - /* Nonmatching */ +s16 fpcDwPi_Get(const draw_priority_class* i_drawPrioClass) { + return i_drawPrioClass->mPriority; } /* 8003D588-8003D590 .text fpcDwPi_Set__FP19draw_priority_classs */ -void fpcDwPi_Set(draw_priority_class*, short) { - /* Nonmatching */ +void fpcDwPi_Set(draw_priority_class* i_drawPrioClass, s16 i_priority) { + i_drawPrioClass->mPriority = i_priority; } /* 8003D590-8003D5B0 .text fpcDwPi_Init__FP19draw_priority_classs */ -void fpcDwPi_Init(draw_priority_class*, short) { - /* Nonmatching */ +void fpcDwPi_Init(draw_priority_class* i_drawPrioClass, s16 i_priority) { + fpcDwPi_Set(i_drawPrioClass, i_priority); } diff --git a/src/f_pc/f_pc_executor.cpp b/src/f_pc/f_pc_executor.cpp index f613efa..cb330f4 100644 --- a/src/f_pc/f_pc_executor.cpp +++ b/src/f_pc/f_pc_executor.cpp @@ -4,44 +4,83 @@ // #include "f_pc/f_pc_executor.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_node.h" +#include "f_pc/f_pc_pause.h" +#include "f_pc/f_pc_searcher.h" /* 8003D5B0-8003D5D0 .text fpcEx_Search__FPFPvPv_PvPv */ -void fpcEx_Search(void* (*)(void*, void*), void*) { - /* Nonmatching */ +base_process_class* fpcEx_Search(fpcLyIt_JudgeFunc i_judgeFunc, void* i_data) { + return (base_process_class*)fpcLyIt_AllJudge(i_judgeFunc, i_data); } /* 8003D5D0-8003D614 .text fpcEx_SearchByID__FUi */ -void fpcEx_SearchByID(unsigned int) { - /* Nonmatching */ +base_process_class* fpcEx_SearchByID(unsigned int i_id) { + if (i_id + 2 <= 1) + return NULL; + + return fpcEx_Search(fpcSch_JudgeByID, &i_id); } /* 8003D614-8003D63C .text fpcEx_IsExist__FUi */ -void fpcEx_IsExist(unsigned int) { - /* Nonmatching */ +BOOL fpcEx_IsExist(unsigned int i_id) { + return fpcEx_SearchByID(i_id) != NULL ? TRUE : FALSE; } /* 8003D63C-8003D690 .text fpcEx_Execute__FP18base_process_class */ -void fpcEx_Execute(base_process_class*) { - /* Nonmatching */ +s32 fpcEx_Execute(base_process_class* i_proc) { + if (i_proc->mInitState != 2 || fpcPause_IsEnable(i_proc, 1) == 1) + return 0; + return fpcBs_Execute(i_proc); } /* 8003D690-8003D73C .text fpcEx_ToLineQ__FP18base_process_class */ -void fpcEx_ToLineQ(base_process_class*) { - /* Nonmatching */ +s32 fpcEx_ToLineQ(base_process_class* i_proc) { + layer_class* pLayer = i_proc->mLyTg.mpLayer; + base_process_class* pLayerPcNode = &pLayer->mpPcNode->mBase; + + if (pLayer->mLayerID == 0 || cTg_IsUse(&pLayerPcNode->mLnTg.mBase) == TRUE) { + s32 ret = fpcLnTg_ToQueue(&i_proc->mLnTg, i_proc->mPi.mInfoCurr.mListID); + if (ret == 0) { + fpcLyTg_QueueTo(&i_proc->mLyTg); + return 0; + } + + i_proc->mInitState = 2; + if (fpcBs_Is_JustOfType(g_fpcNd_type, i_proc->mSubType)) { + process_node_class* pNode = (process_node_class*)i_proc; + fpcLyIt_OnlyHere(&pNode->mLayer, (fpcLyIt_OnlyHereFunc)fpcEx_ToLineQ, pNode); + } + + return 1; + } + + return 0; } /* 8003D73C-8003D788 .text fpcEx_ExecuteQTo__FP18base_process_class */ -void fpcEx_ExecuteQTo(base_process_class*) { - /* Nonmatching */ +s32 fpcEx_ExecuteQTo(base_process_class* i_proc) { + s32 ret = fpcLyTg_QueueTo(&i_proc->mLyTg); + if (ret == 1) { + i_proc->mInitState = 3; + return 1; + } else { + return 0; + } } /* 8003D788-8003D7E0 .text fpcEx_ToExecuteQ__FP18base_process_class */ -void fpcEx_ToExecuteQ(base_process_class*) { - /* Nonmatching */ +s32 fpcEx_ToExecuteQ(base_process_class* i_proc) { + s32 ret = fpcLyTg_ToQueue(&i_proc->mLyTg, i_proc->mPi.mInfoCurr.mLayer, + i_proc->mPi.mInfoCurr.mListID, i_proc->mPi.mInfoCurr.mListPrio); + if (ret == 1) { + fpcEx_ToLineQ(i_proc); + return 1; + } else { + return 0; + } } /* 8003D7E0-8003D800 .text fpcEx_Handler__FPFPvPv_i */ -void fpcEx_Handler(int (*)(void*, void*)) { - /* Nonmatching */ +void fpcEx_Handler(fpcLnIt_QueueFunc i_queueFunc) { + fpcLnIt_Queue(i_queueFunc); } diff --git a/src/f_pc/f_pc_fstcreate_req.cpp b/src/f_pc/f_pc_fstcreate_req.cpp index e5ceb97..2c02cdb 100644 --- a/src/f_pc/f_pc_fstcreate_req.cpp +++ b/src/f_pc/f_pc_fstcreate_req.cpp @@ -4,19 +4,52 @@ // #include "f_pc/f_pc_fstcreate_req.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_base.h" +#include "f_pc/f_pc_layer.h" +#include "f_pc/f_pc_load.h" +#include "SSystem/SComponent/c_phase.h" /* 80040520-80040570 .text fpcFCtRq_Do__FP19fast_create_request */ -void fpcFCtRq_Do(fast_create_request*) { - /* Nonmatching */ +s32 fpcFCtRq_Do(fast_create_request* i_createReq) { + if (i_createReq->mpFastCreateFunc != NULL && i_createReq->mpFastCreateFunc(i_createReq->mBase.mpRes, i_createReq->mpFastCreateData) == 0) { + return cPhs_UNK3_e; + } else { + return cPhs_COMPLEATE_e; + } } /* 80040570-80040578 .text fpcFCtRq_Delete__FP19fast_create_request */ -void fpcFCtRq_Delete(fast_create_request*) { - /* Nonmatching */ +s32 fpcFCtRq_Delete(fast_create_request* i_createReq) { + return 1; } /* 80040578-80040648 .text fpcFCtRq_Request__FP11layer_classsPFPvPv_iPvPv */ -void fpcFCtRq_Request(layer_class*, short, int (*)(void*, void*), void*, void*) { - /* Nonmatching */ +base_process_class* fpcFCtRq_Request(layer_class* i_layer, s16 i_procTypeID, + fstCreateFunc i_createFunc, void* i_createData, void* pData) { + static create_request_method_class submethod = {(cPhs__Handler)fpcFCtRq_Do, NULL, + (process_method_func)fpcFCtRq_Delete}; + + if (!fpcLd_Use(i_procTypeID)) { + return NULL; + } else { + fast_create_request* request = + (fast_create_request*)fpcCtRq_Create(i_layer, 0x50, &submethod); + if (request != NULL) { + base_process_class* proc; + fpcLy_SetCurrentLayer(i_layer); + proc = fpcBs_Create(i_procTypeID, fpcBs_MakeOfId(), pData); + if (proc != NULL) { + proc->mpCtRq = (struct create_request*)request; + request->mBase.mpRes = proc; + request->mBase.mBsPcId = proc->mBsPcId; + if (fpcBs_SubCreate(proc) == 2) { + request->mpFastCreateFunc = i_createFunc; + request->mpFastCreateData = i_createData; + return proc; + } + } + fpcCtRq_Cancel(&request->mBase); + } + return NULL; + } } diff --git a/src/f_pc/f_pc_layer.cpp b/src/f_pc/f_pc_layer.cpp index 2210f45..db5bb80 100644 --- a/src/f_pc/f_pc_layer.cpp +++ b/src/f_pc/f_pc_layer.cpp @@ -4,109 +4,163 @@ // #include "f_pc/f_pc_layer.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_method_iter.h" +#include "f_pc/f_pc_method_tag.h" /* 8003D800-8003D820 .text fpcLy_CancelQTo__FP24process_method_tag_class */ -void fpcLy_CancelQTo(process_method_tag_class*) { - /* Nonmatching */ +void fpcLy_CancelQTo(process_method_tag_class* i_methods) { + fpcMtdTg_MethodQTo(i_methods); } /* 8003D820-8003D844 .text fpcLy_ToCancelQ__FP11layer_classP24process_method_tag_class */ -void fpcLy_ToCancelQ(layer_class*, process_method_tag_class*) { - /* Nonmatching */ +s32 fpcLy_ToCancelQ(layer_class* i_layer, process_method_tag_class* i_methods) { + return fpcMtdTg_ToMethodQ(&i_layer->mCancelList, i_methods); } /* 8003D844-8003D870 .text fpcLy_CancelMethod__FP24process_method_tag_class */ -void fpcLy_CancelMethod(process_method_tag_class*) { - /* Nonmatching */ +bool fpcLy_CancelMethod(process_method_tag_class* i_layer) { + return fpcMtdTg_Do(i_layer) == 1; } /* 8003D870-8003D894 .text fpcLy_IntoQueue__FP11layer_classiP16create_tag_classi */ -void fpcLy_IntoQueue(layer_class*, int, create_tag_class*, int) { - /* Nonmatching */ +s32 fpcLy_IntoQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag, int i_no) { + return cTg_InsertToTree(&i_layer->mNodeListTree, i_treeListNo, i_createTag, i_no); } /* 8003D894-8003D8B8 .text fpcLy_ToQueue__FP11layer_classiP16create_tag_class */ -void fpcLy_ToQueue(layer_class*, int, create_tag_class*) { - /* Nonmatching */ +s32 fpcLy_ToQueue(layer_class* i_layer, int i_treeListNo, create_tag_class* i_createTag) { + return cTg_AdditionToTree(&i_layer->mNodeListTree, i_treeListNo, i_createTag); } /* 8003D8B8-8003D8DC .text fpcLy_QueueTo__FP11layer_classP16create_tag_class */ -void fpcLy_QueueTo(layer_class*, create_tag_class*) { - /* Nonmatching */ +s32 fpcLy_QueueTo(layer_class* i_layer, create_tag_class* i_createTag) { + return cTg_SingleCutFromTree(i_createTag); } /* 8003D8DC-8003D8F0 .text fpcLy_IsDeletingMesg__FP11layer_class */ -void fpcLy_IsDeletingMesg(layer_class*) { - /* Nonmatching */ +BOOL fpcLy_IsDeletingMesg(layer_class* i_layer) { + return i_layer->counts.mDeletingCount > 0; } /* 8003D8F0-8003D900 .text fpcLy_DeletingMesg__FP11layer_class */ -void fpcLy_DeletingMesg(layer_class*) { - /* Nonmatching */ +void fpcLy_DeletingMesg(layer_class* i_layer) { + i_layer->counts.mDeletingCount++; } /* 8003D900-8003D918 .text fpcLy_DeletedMesg__FP11layer_class */ -void fpcLy_DeletedMesg(layer_class*) { - /* Nonmatching */ +void fpcLy_DeletedMesg(layer_class* i_layer) { + if (i_layer->counts.mDeletingCount > 0) { + i_layer->counts.mDeletingCount--; + } } /* 8003D918-8003D92C .text fpcLy_IsCreatingMesg__FP11layer_class */ -void fpcLy_IsCreatingMesg(layer_class*) { - /* Nonmatching */ +BOOL fpcLy_IsCreatingMesg(layer_class* i_layer) { + return i_layer->counts.mCreatingCount > 0; } /* 8003D92C-8003D93C .text fpcLy_CreatingMesg__FP11layer_class */ -void fpcLy_CreatingMesg(layer_class*) { - /* Nonmatching */ +void fpcLy_CreatingMesg(layer_class* i_layer) { + i_layer->counts.mCreatingCount++; } /* 8003D93C-8003D954 .text fpcLy_CreatedMesg__FP11layer_class */ -void fpcLy_CreatedMesg(layer_class*) { - /* Nonmatching */ +void fpcLy_CreatedMesg(layer_class* i_layer) { + if (i_layer->counts.mCreatingCount > 0) { + i_layer->counts.mCreatingCount--; + } } +layer_class l_fpcLy_Crear = { + NULL, NULL, 0, 0xFFFFFFFF, NULL, 0, NULL, NULL, NULL, 0, 0, 0, +}; + +node_list_class l_fpcLy_LayerList = { + NULL, + NULL, + 0, +}; + /* 8003D954-8003D964 .text fpcLy_RootLayer__Fv */ -void fpcLy_RootLayer() { - /* Nonmatching */ +layer_class* fpcLy_RootLayer(void) { + return (layer_class*)l_fpcLy_LayerList.mpHead; } +static layer_class* l_fpcLy_CurrLayer_p; + /* 8003D964-8003D96C .text fpcLy_SetCurrentLayer__FP11layer_class */ -void fpcLy_SetCurrentLayer(layer_class*) { - /* Nonmatching */ +void fpcLy_SetCurrentLayer(layer_class* i_layer) { + l_fpcLy_CurrLayer_p = i_layer; } /* 8003D96C-8003D974 .text fpcLy_CurrentLayer__Fv */ -void fpcLy_CurrentLayer() { - /* Nonmatching */ +layer_class* fpcLy_CurrentLayer() { + return l_fpcLy_CurrLayer_p; } /* 8003D974-8003D9C4 .text fpcLy_Search__FUi */ -void fpcLy_Search(unsigned int) { - /* Nonmatching */ +layer_class* fpcLy_Search(unsigned int i_id) { + layer_class* layer_p = fpcLy_RootLayer(); + while (layer_p != NULL) { + if (layer_p->mLayerID == i_id) { + return layer_p; + } + layer_p = (layer_class*)layer_p->mNode.mpNextNode; + } + return NULL; } /* 8003D9C4-8003DA34 .text fpcLy_Layer__FUi */ -void fpcLy_Layer(unsigned int) { - /* Nonmatching */ +layer_class* fpcLy_Layer(unsigned int i_id) { + if (i_id == 0 || fpcLy_RootLayer()->mLayerID == i_id) { + return fpcLy_RootLayer(); + } else if (i_id == ~2 || fpcLy_CurrentLayer()->mLayerID == i_id) { + return fpcLy_CurrentLayer(); + } else { + return fpcLy_Search(i_id); + } } /* 8003DA34-8003DA60 .text fpcLy_Regist__FP11layer_class */ -void fpcLy_Regist(layer_class*) { - /* Nonmatching */ +void fpcLy_Regist(layer_class* i_layer) { + cLs_Addition(&l_fpcLy_LayerList, (node_class*)i_layer); } /* 8003DA60-8003DB14 .text fpcLy_Delete__FP11layer_class */ -void fpcLy_Delete(layer_class*) { - /* Nonmatching */ +s32 fpcLy_Delete(layer_class* i_layer) { + if (i_layer->mNodeListTree.mpLists->mSize == 0 && i_layer->mCancelList.mSize == 0) { + cLs_SingleCut((node_class*)i_layer); + *i_layer = l_fpcLy_Crear; + return 1; + } else { + return 0; + } } /* 8003DB14-8003DB40 .text fpcLy_Cancel__FP11layer_class */ -void fpcLy_Cancel(layer_class*) { - /* Nonmatching */ +s32 fpcLy_Cancel(layer_class* i_layer) { + return fpcMtdIt_Method(&i_layer->mCancelList, (fpcMtdIt_MethodFunc)fpcLy_CancelMethod); } /* 8003DB40-8003DC78 .text fpcLy_Create__FP11layer_classPvP15node_list_classi */ -void fpcLy_Create(layer_class*, void*, node_list_class*, int) { - /* Nonmatching */ +void fpcLy_Create(layer_class* i_layer, void* i_node, node_list_class* i_nodeList, int i_numLists) { + void* pvVar1; + s32 iVar2; + + static int IsInitOfLayerList = 1; + static int layer_id = 0; + *i_layer = l_fpcLy_Crear; + cNd_Create((node_class*)i_layer, NULL); + i_layer->mLayerID = layer_id++; + i_layer->mpPcNode = static_cast(i_node); + if (IsInitOfLayerList == 1) { + IsInitOfLayerList = 0; + cLs_Create(&l_fpcLy_LayerList); + fpcLy_SetCurrentLayer(i_layer); + } + (i_layer->mNodeListTree).mpLists = i_nodeList; + (i_layer->mNodeListTree).mNumLists = i_numLists; + cTr_Create(&i_layer->mNodeListTree, (i_layer->mNodeListTree).mpLists, + (i_layer->mNodeListTree).mNumLists); + fpcLy_Regist(i_layer); } diff --git a/src/f_pc/f_pc_layer_iter.cpp b/src/f_pc/f_pc_layer_iter.cpp index b603b15..e68f6d2 100644 --- a/src/f_pc/f_pc_layer_iter.cpp +++ b/src/f_pc/f_pc_layer_iter.cpp @@ -4,24 +4,51 @@ // #include "f_pc/f_pc_layer_iter.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_tag_iter.h" +#include "SSystem/SComponent/c_tree_iter.h" +#include "f_pc/f_pc_layer.h" /* 8003DE00-8003DE38 .text fpcLyIt_OnlyHere__FP11layer_classPFPvPv_iPv */ -void fpcLyIt_OnlyHere(layer_class*, int (*)(void*, void*), void*) { - /* Nonmatching */ +s32 fpcLyIt_OnlyHere(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) { + layer_iter lIter; + lIter.mpFunc = i_func; + lIter.mpUserData = i_data; + return cTrIt_Method(&i_layer->mNodeListTree, (cNdIt_MethodFunc)cTgIt_MethodCall, &lIter); } /* 8003DE38-8003DEA0 .text fpcLyIt_OnlyHereLY__FP11layer_classPFPvPv_iPv */ -void fpcLyIt_OnlyHereLY(layer_class*, int (*)(void*, void*), void*) { - /* Nonmatching */ +s32 fpcLyIt_OnlyHereLY(layer_class* i_layer, fpcLyIt_OnlyHereFunc i_func, void* i_data) { + s32 result; + layer_class* currentLayer = fpcLy_CurrentLayer(); + fpcLy_SetCurrentLayer(i_layer); + result = fpcLyIt_OnlyHere(i_layer, i_func, i_data); + fpcLy_SetCurrentLayer(currentLayer); + return result; } /* 8003DEA0-8003DED8 .text fpcLyIt_Judge__FP11layer_classPFPvPv_PvPv */ -void fpcLyIt_Judge(layer_class*, void* (*)(void*, void*), void*) { - /* Nonmatching */ +void* fpcLyIt_Judge(layer_class* i_layer, fpcLyIt_JudgeFunc i_func, void* i_data) { + layer_iter lIter; + lIter.mpFunc = i_func; + lIter.mpUserData = i_data; + return cTrIt_Judge(&i_layer->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &lIter); } /* 8003DED8-8003DF4C .text fpcLyIt_AllJudge__FPFPvPv_PvPv */ -void fpcLyIt_AllJudge(void* (*)(void*, void*), void*) { - /* Nonmatching */ +void* fpcLyIt_AllJudge(fpcLyIt_JudgeFunc i_func, void* i_data) { + layer_iter lIter; + layer_class* current; + lIter.mpFunc = i_func; + lIter.mpUserData = i_data; + + current = fpcLy_RootLayer(); + while (current != NULL) { + void* result = + cTrIt_Judge(¤t->mNodeListTree, (cNdIt_JudgeFunc)cTgIt_JudgeFilter, &lIter); + if (result != NULL) { + return result; + } + current = (layer_class*)current->mNode.mpNextNode; + } + return NULL; } diff --git a/src/f_pc/f_pc_layer_tag.cpp b/src/f_pc/f_pc_layer_tag.cpp index f5e9255..8b617a7 100644 --- a/src/f_pc/f_pc_layer_tag.cpp +++ b/src/f_pc/f_pc_layer_tag.cpp @@ -4,24 +4,76 @@ // #include "f_pc/f_pc_layer_tag.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_layer.h" /* 8003DF4C-8003E044 .text fpcLyTg_ToQueue__FP26layer_management_tag_classUiUsUs */ -void fpcLyTg_ToQueue(layer_management_tag_class*, unsigned int, unsigned short, unsigned short) { - /* Nonmatching */ +s32 fpcLyTg_ToQueue(layer_management_tag_class* i_LyTag, unsigned int i_layerID, u16 i_listID, + u16 i_listPriority) { + if (i_LyTag->mpLayer == NULL && i_layerID == -1) { + return 0; + } else { + // ghidra says i_layerID is unsigned? + if (i_layerID != -1 && i_layerID != -3 && i_LyTag->mpLayer->mLayerID != i_layerID) { + i_LyTag->mpLayer = fpcLy_Layer(i_layerID); + } + if (i_layerID == -1 || i_layerID == -3) { + s32 tmp = fpcLy_ToQueue(i_LyTag->mpLayer, i_listID, &i_LyTag->mCreateTag); + if (tmp != 0) { + i_LyTag->mNodeListID = i_listID; + i_LyTag->mNodeListIdx = tmp - 1; + return 1; + } + } else if (fpcLy_IntoQueue(i_LyTag->mpLayer, i_listID, &i_LyTag->mCreateTag, + i_listPriority) != 0) + { + i_LyTag->mNodeListID = i_listID; + i_LyTag->mNodeListIdx = i_listPriority; + return 1; + } + return 0; + } } /* 8003E044-8003E0A4 .text fpcLyTg_QueueTo__FP26layer_management_tag_class */ -void fpcLyTg_QueueTo(layer_management_tag_class*) { - /* Nonmatching */ +s32 fpcLyTg_QueueTo(layer_management_tag_class* i_LyTag) { + if (fpcLy_QueueTo(i_LyTag->mpLayer, &i_LyTag->mCreateTag) == 1) { + i_LyTag->mpLayer = NULL; + i_LyTag->mNodeListID = 0xFFFF; + i_LyTag->mNodeListIdx = 0xFFFF; + return 1; + } else { + return 0; + } } /* 8003E0A4-8003E128 .text fpcLyTg_Move__FP26layer_management_tag_classUiUsUs */ -void fpcLyTg_Move(layer_management_tag_class*, unsigned int, unsigned short, unsigned short) { - /* Nonmatching */ +s32 fpcLyTg_Move(layer_management_tag_class* i_LyTag, unsigned int i_layerID, u16 i_listID, + u16 i_listPriority) { + layer_class* layer = fpcLy_Layer(i_layerID); + if (layer == NULL) { + return 0; + } else if (fpcLyTg_QueueTo(i_LyTag) == 0x1) { + i_LyTag->mpLayer = layer; + return fpcLyTg_ToQueue(i_LyTag, i_layerID, i_listID, i_listPriority); + } else { + return 0; + } } /* 8003E128-8003E1DC .text fpcLyTg_Init__FP26layer_management_tag_classUiPv */ -void fpcLyTg_Init(layer_management_tag_class*, unsigned int, void*) { - /* Nonmatching */ +s32 fpcLyTg_Init(layer_management_tag_class* i_LyTag, unsigned int i_id, void* i_data) { + static layer_management_tag_class crear = { + NULL, NULL, NULL, NULL, 0, NULL, 0xFFFF, 0xFFFF, + }; + + layer_class* layer; + *i_LyTag = crear; + cTg_Create(&i_LyTag->mCreateTag, i_data); + layer = fpcLy_Layer(i_id); + if (layer != NULL) { + i_LyTag->mpLayer = layer; + return 1; + } else { + return 0; + } } diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index f8ed967..f896f3d 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -4,39 +4,63 @@ // #include "f_pc/f_pc_leaf.h" -#include "dolphin/types.h" /* 8003DC78-8003DC9C .text fpcLf_GetPriority__FP14leafdraw_class */ -void fpcLf_GetPriority(leafdraw_class*) { - /* Nonmatching */ +s16 fpcLf_GetPriority(const leafdraw_class* i_leaf) { + return fpcDwPi_Get(&i_leaf->mDwPi); } /* 8003DC9C-8003DCC0 .text fpcLf_DrawMethod__FP21leafdraw_method_classPv */ -void fpcLf_DrawMethod(leafdraw_method_class*, void*) { - /* Nonmatching */ +s32 fpcLf_DrawMethod(leafdraw_method_class* i_methods, void* i_data) { + return fpcMtd_Method(i_methods->mpDrawFunc, i_data); } /* 8003DCC0-8003DCF8 .text fpcLf_Draw__FP14leafdraw_class */ -void fpcLf_Draw(leafdraw_class*) { - /* Nonmatching */ +s32 fpcLf_Draw(leafdraw_class* i_leaf) { + s32 ret = 0; + if (i_leaf->mbUnk0 == 0) + ret = fpcLf_DrawMethod(i_leaf->mpDrawMtd, i_leaf); + return ret; } /* 8003DCF8-8003DD20 .text fpcLf_Execute__FP14leafdraw_class */ -void fpcLf_Execute(leafdraw_class*) { - /* Nonmatching */ +s32 fpcLf_Execute(leafdraw_class* i_leaf) { + return fpcMtd_Execute(&i_leaf->mpDrawMtd->mBase, i_leaf); } /* 8003DD20-8003DD48 .text fpcLf_IsDelete__FP14leafdraw_class */ -void fpcLf_IsDelete(leafdraw_class*) { - /* Nonmatching */ +s32 fpcLf_IsDelete(leafdraw_class* i_leaf) { + return fpcMtd_IsDelete(&i_leaf->mpDrawMtd->mBase, i_leaf); } /* 8003DD48-8003DD8C .text fpcLf_Delete__FP14leafdraw_class */ -void fpcLf_Delete(leafdraw_class*) { - /* Nonmatching */ +s32 fpcLf_Delete(leafdraw_class* i_leaf) { + s32 ret = fpcMtd_Delete(&i_leaf->mpDrawMtd->mBase, i_leaf); + if (ret == 1) { + i_leaf->mBase.mSubType = 0; + } + return ret; } +int g_fpcLf_type; + /* 8003DD8C-8003DE00 .text fpcLf_Create__FP14leafdraw_class */ -void fpcLf_Create(leafdraw_class*) { - /* Nonmatching */ +s32 fpcLf_Create(leafdraw_class* i_leaf) { + leaf_process_profile_definition* profDef; + if (i_leaf->mBase.mInitState == 0) { + profDef = (leaf_process_profile_definition*)i_leaf->mBase.mpProf; + i_leaf->mpDrawMtd = profDef->mSubMtd; + i_leaf->mBase.mSubType = fpcBs_MakeOfType(&g_fpcLf_type); + fpcDwPi_Init(&i_leaf->mDwPi, profDef->mPriority); + i_leaf->mbUnk0 = 0; + } + return fpcMtd_Create(&i_leaf->mpDrawMtd->mBase, i_leaf); } + +leafdraw_method_class g_fpcLf_Method = { + (process_method_func)fpcLf_Create, + (process_method_func)fpcLf_Delete, + (process_method_func)fpcLf_Execute, + (process_method_func)fpcLf_IsDelete, + (process_method_func)fpcLf_Draw, +}; diff --git a/src/f_pc/f_pc_line.cpp b/src/f_pc/f_pc_line.cpp index 0702858..6859610 100644 --- a/src/f_pc/f_pc_line.cpp +++ b/src/f_pc/f_pc_line.cpp @@ -4,9 +4,20 @@ // #include "f_pc/f_pc_line.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_node.h" +#include "global.h" + +static node_list_class l_fpcLn_Line[16]; /* 8003E1DC-8003E230 .text fpcLn_Create__Fv */ void fpcLn_Create() { - /* Nonmatching */ + s32 i = ARRAY_SIZE(l_fpcLn_Line); + node_list_class* pLine = l_fpcLn_Line; + while (i-- > 0) + cLs_Create(pLine++); } + +node_lists_tree_class g_fpcLn_Queue = { + l_fpcLn_Line, + ARRAY_SIZE(l_fpcLn_Line), +}; diff --git a/src/f_pc/f_pc_line_iter.cpp b/src/f_pc/f_pc_line_iter.cpp index be421dd..b0188c8 100644 --- a/src/f_pc/f_pc_line_iter.cpp +++ b/src/f_pc/f_pc_line_iter.cpp @@ -4,14 +4,29 @@ // #include "f_pc/f_pc_line_iter.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_tag_iter.h" +#include "SSystem/SComponent/c_tree_iter.h" +#include "f_pc/f_pc_base.h" +#include "f_pc/f_pc_layer.h" +#include "f_pc/f_pc_line.h" /* 80040198-80040200 .text fpcLnIt_MethodCall__FP16create_tag_classP13method_filter */ -void fpcLnIt_MethodCall(create_tag_class*, method_filter*) { - /* Nonmatching */ +static s32 fpcLnIt_MethodCall(create_tag_class* i_createTag, method_filter* i_filter) { + layer_class* pLayer = static_cast(i_createTag->mpTagData)->mLyTg.mpLayer; + layer_class* pCurLayer = fpcLy_CurrentLayer(); + s32 ret; + + fpcLy_SetCurrentLayer(pLayer); + ret = cTgIt_MethodCall(i_createTag, i_filter); + fpcLy_SetCurrentLayer(pCurLayer); + + return ret; } /* 80040200-8004023C .text fpcLnIt_Queue__FPFPvPv_i */ -void fpcLnIt_Queue(int (*)(void*, void*)) { - /* Nonmatching */ +void fpcLnIt_Queue(fpcLnIt_QueueFunc i_queueFunc) { + method_filter filter; + filter.mpMethodFunc = (cNdIt_MethodFunc)i_queueFunc; + filter.mpUserData = NULL; + cTrIt_Method(&g_fpcLn_Queue, (cNdIt_MethodFunc)fpcLnIt_MethodCall, &filter); } diff --git a/src/f_pc/f_pc_line_tag.cpp b/src/f_pc/f_pc_line_tag.cpp index 0c2862e..27cd0de 100644 --- a/src/f_pc/f_pc_line_tag.cpp +++ b/src/f_pc/f_pc_line_tag.cpp @@ -4,24 +4,38 @@ // #include "f_pc/f_pc_line_tag.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_line.h" /* 80040080-800400D8 .text fpcLnTg_Move__FP8line_tagi */ -void fpcLnTg_Move(line_tag*, int) { - /* Nonmatching */ +s32 fpcLnTg_Move(line_tag* i_lineTag, int i_newListID) { + if (i_lineTag->mLineListID != i_newListID) { + fpcLnTg_QueueTo(i_lineTag); + return fpcLnTg_ToQueue(i_lineTag, i_newListID); + } + + return 1; } /* 800400D8-8004010C .text fpcLnTg_QueueTo__FP8line_tag */ -void fpcLnTg_QueueTo(line_tag*) { - /* Nonmatching */ +void fpcLnTg_QueueTo(line_tag* i_lineTag) { + cTg_SingleCutFromTree(&i_lineTag->mBase); + i_lineTag->mLineListID = -1; } /* 8004010C-80040164 .text fpcLnTg_ToQueue__FP8line_tagi */ -void fpcLnTg_ToQueue(line_tag*, int) { - /* Nonmatching */ +s32 fpcLnTg_ToQueue(line_tag* i_lineTag, int lineListID) { + s32 ret = cTg_AdditionToTree(&g_fpcLn_Queue, lineListID, &i_lineTag->mBase); + + if (ret) { + i_lineTag->mLineListID = lineListID; + return 1; + } else { + return 0; + } } /* 80040164-80040198 .text fpcLnTg_Init__FP8line_tagPv */ -void fpcLnTg_Init(line_tag*, void*) { - /* Nonmatching */ +void fpcLnTg_Init(line_tag* i_lineTag, void* i_data) { + cTg_Create(&i_lineTag->mBase, i_data); + i_lineTag->mLineListID = -1; } diff --git a/src/f_pc/f_pc_load.cpp b/src/f_pc/f_pc_load.cpp index 550b7b8..0c216fe 100644 --- a/src/f_pc/f_pc_load.cpp +++ b/src/f_pc/f_pc_load.cpp @@ -3,25 +3,37 @@ // Translation Unit: f_pc_load.cpp // +#include "c/c_dylink.h" #include "f_pc/f_pc_load.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_phase.h" /* 8003E230-8003E280 .text fpcLd_Use__Fs */ -void fpcLd_Use(short) { - /* Nonmatching */ +BOOL fpcLd_Use(s16 i_procName) { + if (fpcLd_IsLoaded(i_procName) == TRUE && fpcLd_Load(i_procName) == cPhs_COMPLEATE_e) + return TRUE; + return FALSE; } /* 8003E280-8003E2A4 .text fpcLd_IsLoaded__Fs */ -void fpcLd_IsLoaded(short) { - /* Nonmatching */ +s32 fpcLd_IsLoaded(s16 i_procName) { + return cDyl_IsLinked((int)i_procName); } /* 8003E2A4-8003E2C8 .text fpcLd_Free__Fs */ -void fpcLd_Free(short) { - /* Nonmatching */ +void fpcLd_Free(s16 i_procName) { + cDyl_Unlink((int)i_procName); } /* 8003E2C8-8003E318 .text fpcLd_Load__Fs */ -void fpcLd_Load(short) { - /* Nonmatching */ +s32 fpcLd_Load(s16 i_procName) { + s32 phase = cDyl_LinkASync((int)i_procName); + + switch (phase) { + case cPhs_COMPLEATE_e: + return cPhs_COMPLEATE_e; + case 0: + return 0; + default: + return cPhs_ERROR_e; + } } diff --git a/src/f_pc/f_pc_manager.cpp b/src/f_pc/f_pc_manager.cpp index 4b75f90..4f66d61 100644 --- a/src/f_pc/f_pc_manager.cpp +++ b/src/f_pc/f_pc_manager.cpp @@ -7,28 +7,28 @@ #include "dolphin/types.h" /* 8003E318-8003E338 .text fpcM_Draw__FPv */ -void fpcM_Draw(void*) { - /* Nonmatching */ +void fpcM_Draw(void* i_proc) { + fpcDw_Execute((base_process_class*)i_proc); } /* 8003E338-8003E370 .text fpcM_DrawIterater__FPFPvPv_i */ -void fpcM_DrawIterater(int (*)(void*, void*)) { - /* Nonmatching */ +s32 fpcM_DrawIterater(fpcM_DrawIteraterFunc i_drawIterFunc) { + return fpcLyIt_OnlyHere(fpcLy_RootLayer(), (fpcLyIt_OnlyHereFunc)i_drawIterFunc, NULL); } /* 8003E370-8003E390 .text fpcM_Execute__FPv */ -void fpcM_Execute(void*) { - /* Nonmatching */ +s32 fpcM_Execute(void* i_proc) { + return fpcEx_Execute((base_process_class*)i_proc); } /* 8003E390-8003E3B0 .text fpcM_Delete__FPv */ -void fpcM_Delete(void*) { - /* Nonmatching */ +s32 fpcM_Delete(void* i_proc) { + return fpcDt_Delete((base_process_class*)i_proc); } /* 8003E3B0-8003E3D0 .text fpcM_IsCreating__FUi */ -void fpcM_IsCreating(unsigned int) { - /* Nonmatching */ +BOOL fpcM_IsCreating(unsigned int pID) { + return fpcCt_IsCreatingByID(pID); } /* 8003E3D0-8003E9F0 .text messageSet__FUl */ diff --git a/src/f_pc/f_pc_method.cpp b/src/f_pc/f_pc_method.cpp index 317221e..9b96b97 100644 --- a/src/f_pc/f_pc_method.cpp +++ b/src/f_pc/f_pc_method.cpp @@ -4,29 +4,31 @@ // #include "f_pc/f_pc_method.h" -#include "dolphin/types.h" /* 8003EF00-8003EF38 .text fpcMtd_Method__FPFPv_iPv */ -void fpcMtd_Method(int (*)(void*), void*) { - /* Nonmatching */ +s32 fpcMtd_Method(process_method_func i_methodFunc, void* i_data) { + if (i_methodFunc != NULL) + return i_methodFunc(i_data); + else + return 1; } /* 8003EF38-8003EF5C .text fpcMtd_Execute__FP20process_method_classPv */ -void fpcMtd_Execute(process_method_class*, void*) { - /* Nonmatching */ +s32 fpcMtd_Execute(process_method_class* i_methods, void* i_data) { + return fpcMtd_Method(i_methods->mpExecuteFunc, i_data); } /* 8003EF5C-8003EF80 .text fpcMtd_IsDelete__FP20process_method_classPv */ -void fpcMtd_IsDelete(process_method_class*, void*) { - /* Nonmatching */ +s32 fpcMtd_IsDelete(process_method_class* i_methods, void* i_data) { + return fpcMtd_Method(i_methods->mpIsDeleteFunc, i_data); } /* 8003EF80-8003EFA4 .text fpcMtd_Delete__FP20process_method_classPv */ -void fpcMtd_Delete(process_method_class*, void*) { - /* Nonmatching */ +s32 fpcMtd_Delete(process_method_class* i_methods, void* i_data) { + return fpcMtd_Method(i_methods->mpDeleteFunc, i_data); } /* 8003EFA4-8003EFC8 .text fpcMtd_Create__FP20process_method_classPv */ -void fpcMtd_Create(process_method_class*, void*) { - /* Nonmatching */ +s32 fpcMtd_Create(process_method_class* i_methods, void* i_data) { + return fpcMtd_Method(i_methods->mpCreateFunc, i_data); } diff --git a/src/f_pc/f_pc_method_iter.cpp b/src/f_pc/f_pc_method_iter.cpp index 643e21f..aedc952 100644 --- a/src/f_pc/f_pc_method_iter.cpp +++ b/src/f_pc/f_pc_method_iter.cpp @@ -4,9 +4,9 @@ // #include "f_pc/f_pc_method_iter.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_list_iter.h" /* 8004023C-80040260 .text fpcMtdIt_Method__FP15node_list_classPFPv_i */ -void fpcMtdIt_Method(node_list_class*, int (*)(void*)) { - /* Nonmatching */ +int fpcMtdIt_Method(node_list_class* i_nodeList, fpcMtdIt_MethodFunc i_methods) { + return cLsIt_Method(i_nodeList, (cNdIt_MethodFunc)i_methods, NULL); } diff --git a/src/f_pc/f_pc_method_tag.cpp b/src/f_pc/f_pc_method_tag.cpp index f735e90..4d79f38 100644 --- a/src/f_pc/f_pc_method_tag.cpp +++ b/src/f_pc/f_pc_method_tag.cpp @@ -4,24 +4,26 @@ // #include "f_pc/f_pc_method_tag.h" -#include "dolphin/types.h" /* 80040260-80040290 .text fpcMtdTg_Do__FP24process_method_tag_class */ -void fpcMtdTg_Do(process_method_tag_class*) { - /* Nonmatching */ +s32 fpcMtdTg_Do(process_method_tag_class* i_methodTag) { + return i_methodTag->mpFunc(i_methodTag->mpMthdData); } /* 80040290-800402B0 .text fpcMtdTg_ToMethodQ__FP15node_list_classP24process_method_tag_class */ -void fpcMtdTg_ToMethodQ(node_list_class*, process_method_tag_class*) { - /* Nonmatching */ +s32 fpcMtdTg_ToMethodQ(node_list_class* pList, process_method_tag_class* i_methodTag) { + return cTg_Addition(pList, &i_methodTag->mCreateTag); } /* 800402B0-800402D0 .text fpcMtdTg_MethodQTo__FP24process_method_tag_class */ -void fpcMtdTg_MethodQTo(process_method_tag_class*) { - /* Nonmatching */ +void fpcMtdTg_MethodQTo(process_method_tag_class* i_methodTag) { + cTg_SingleCut(&i_methodTag->mCreateTag); } /* 800402D0-8004031C .text fpcMtdTg_Init__FP24process_method_tag_classPFPv_iPv */ -void fpcMtdTg_Init(process_method_tag_class*, int (*)(void*), void*) { - /* Nonmatching */ +s32 fpcMtdTg_Init(process_method_tag_class* i_methodTag, process_method_tag_func i_mtdTgFunc, void* i_data) { + cTg_Create(&i_methodTag->mCreateTag, i_methodTag); + i_methodTag->mpFunc = i_mtdTgFunc; + i_methodTag->mpMthdData = i_data; + return 1; } diff --git a/src/f_pc/f_pc_node.cpp b/src/f_pc/f_pc_node.cpp index 7c59fc0..3fa23c9 100644 --- a/src/f_pc/f_pc_node.cpp +++ b/src/f_pc/f_pc_node.cpp @@ -4,44 +4,105 @@ // #include "f_pc/f_pc_node.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_layer_iter.h" /* 8003EFC8-8003EFEC .text fpcNd_DrawMethod__FP21nodedraw_method_classPv */ -void fpcNd_DrawMethod(nodedraw_method_class*, void*) { - /* Nonmatching */ +s32 fpcNd_DrawMethod(nodedraw_method_class* i_nodeMethods, void* i_data) { + return fpcMtd_Method(i_nodeMethods->mpDrawFunc, i_data); } /* 8003EFEC-8003F058 .text fpcNd_Draw__FP18process_node_class */ -void fpcNd_Draw(process_node_class*) { - /* Nonmatching */ +s32 fpcNd_Draw(process_node_class* i_procNode) { + s32 ret = 0; + if (i_procNode->mUnk0 == 0) { + layer_class* curLayer_p = fpcLy_CurrentLayer(); + fpcLy_SetCurrentLayer(&i_procNode->mLayer); + ret = fpcNd_DrawMethod(i_procNode->mpNodeMtd, i_procNode); + fpcLy_SetCurrentLayer(curLayer_p); + } + return ret; } /* 8003F058-8003F0B4 .text fpcNd_Execute__FP18process_node_class */ -void fpcNd_Execute(process_node_class*) { - /* Nonmatching */ +s32 fpcNd_Execute(process_node_class* i_procNode) { + s32 ret; + layer_class* curLayer_p = fpcLy_CurrentLayer(); + fpcLy_SetCurrentLayer(&i_procNode->mLayer); + ret = fpcMtd_Execute(&i_procNode->mpNodeMtd->mBase, i_procNode); + fpcLy_SetCurrentLayer(curLayer_p); + return ret; } +int g_fpcNd_type; + /* 8003F0B4-8003F134 .text fpcNd_IsCreatingFromUnder__FPv */ -void fpcNd_IsCreatingFromUnder(void*) { - /* Nonmatching */ +void* fpcNd_IsCreatingFromUnder(void* i_procNode) { + layer_class* layer; + process_node_class* pProcNode = static_cast(i_procNode); + if (pProcNode != NULL && fpcBs_Is_JustOfType(g_fpcNd_type, pProcNode->mBase.mSubType) != FALSE) { + layer = &pProcNode->mLayer; + if (fpcLy_IsCreatingMesg(layer) == 0) { + return (process_node_class*)fpcLyIt_Judge( + layer, (fpcLyIt_JudgeFunc)fpcNd_IsCreatingFromUnder, NULL); + } else { + return pProcNode; + } + } else { + return NULL; + } } +static s32 g_fpcNd_IsCheckOfDeleteTiming = 1; + /* 8003F134-8003F174 .text fpcNd_IsDeleteTiming__FP18process_node_class */ -void fpcNd_IsDeleteTiming(process_node_class*) { - /* Nonmatching */ +s32 fpcNd_IsDeleteTiming(process_node_class* i_procNode) { + if (g_fpcNd_IsCheckOfDeleteTiming == 1 && fpcNd_IsCreatingFromUnder(i_procNode) != NULL) { + return 0; + } else { + return 1; + } } /* 8003F174-8003F19C .text fpcNd_IsDelete__FP18process_node_class */ -void fpcNd_IsDelete(process_node_class*) { - /* Nonmatching */ +s32 fpcNd_IsDelete(process_node_class* i_procNode) { + return fpcMtd_IsDelete(&i_procNode->mpNodeMtd->mBase, i_procNode); } /* 8003F19C-8003F200 .text fpcNd_Delete__FP18process_node_class */ -void fpcNd_Delete(process_node_class*) { - /* Nonmatching */ +s32 fpcNd_Delete(process_node_class* i_procNode) { + if ((fpcLy_IsDeletingMesg(&i_procNode->mLayer) == 0) && fpcMtd_Delete(&i_procNode->mpNodeMtd->mBase, i_procNode) == 1) { + i_procNode->mBase.mSubType = 0; + return fpcLy_Delete(&i_procNode->mLayer); + } else { + return 0; + } } /* 8003F200-8003F29C .text fpcNd_Create__FP18process_node_class */ -void fpcNd_Create(process_node_class*) { - /* Nonmatching */ +s32 fpcNd_Create(process_node_class* i_procNode) { + // this cast looks like a fake match, but it doesn't match without the cast, naive approach + // swaps r31 and r30 most likely it gets casted to another unknown struct + process_node_class* pProcNode = (process_node_class*)i_procNode; + layer_class* curLayer_p; + s32 ret; + if (pProcNode->mBase.mInitState == 0) { + node_process_profile_definition* pProcProfileDef = (node_process_profile_definition*)pProcNode->mBase.mpProf; + pProcNode->mBase.mSubType = fpcBs_MakeOfType(&g_fpcNd_type); + pProcNode->mpNodeMtd = (nodedraw_method_class*)pProcProfileDef->mSubMtd; + fpcLy_Create(&pProcNode->mLayer, pProcNode, pProcNode->mLayerNodeLists, 0x10); + pProcNode->mUnk0 = 0; + } + curLayer_p = fpcLy_CurrentLayer(); + fpcLy_SetCurrentLayer(&pProcNode->mLayer); + ret = fpcMtd_Create(&pProcNode->mpNodeMtd->mBase, pProcNode); + fpcLy_SetCurrentLayer(curLayer_p); + return ret; } + +nodedraw_method_class g_fpcNd_Method = { + (process_method_func)fpcNd_Create, + (process_method_func)fpcNd_Delete, + (process_method_func)fpcNd_Execute, + (process_method_func)fpcNd_IsDelete, + (process_method_func)fpcNd_Draw +}; diff --git a/src/f_pc/f_pc_node_req.cpp b/src/f_pc/f_pc_node_req.cpp index 96dc7cb..a1fb960 100644 --- a/src/f_pc/f_pc_node_req.cpp +++ b/src/f_pc/f_pc_node_req.cpp @@ -4,109 +4,315 @@ // #include "f_pc/f_pc_node_req.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_malloc.h" +#include "SSystem/SComponent/c_node.h" +#include "SSystem/SStandard/s_basic.h" +#include "f_pc/f_pc_deletor.h" +#include "f_pc/f_pc_executor.h" +#include "f_pc/f_pc_layer.h" +#include "f_pc/f_pc_node.h" +#include "f_pc/f_pc_stdcreate_req.h" /* 8003F29C-8003F2DC .text fpcNdRq_RequestQTo__FP19node_create_request */ -void fpcNdRq_RequestQTo(node_create_request*) { - /* Nonmatching */ +void fpcNdRq_RequestQTo(node_create_request* i_NdCtReq) { + fpcLy_CreatedMesg(i_NdCtReq->mpLayerClass); + fpcLy_CancelQTo(&i_NdCtReq->mProcMthCls); + cTg_SingleCut(&i_NdCtReq->mCreateTag); } +static node_list_class l_fpcNdRq_Queue = {NULL, NULL, 0}; + /* 8003F2DC-8003F328 .text fpcNdRq_ToRequestQ__FP19node_create_request */ -void fpcNdRq_ToRequestQ(node_create_request*) { - /* Nonmatching */ +void fpcNdRq_ToRequestQ(node_create_request* i_NdCtReq) { + cTg_Addition(&l_fpcNdRq_Queue, &i_NdCtReq->mCreateTag); + fpcLy_ToCancelQ(i_NdCtReq->mpLayerClass, &i_NdCtReq->mProcMthCls); + fpcLy_CreatingMesg(i_NdCtReq->mpLayerClass); } /* 8003F328-8003F380 .text fpcNdRq_phase_IsCreated__FP19node_create_request */ -void fpcNdRq_phase_IsCreated(node_create_request*) { - /* Nonmatching */ +s32 fpcNdRq_phase_IsCreated(node_create_request* i_NdCtReq) { + if (fpcCtRq_IsCreatingByID(i_NdCtReq->mCreatingID) == TRUE) { + return cPhs_INIT_e; + } else { + return fpcEx_IsExist(i_NdCtReq->mCreatingID) == TRUE ? 2 : 3; + } } /* 8003F380-8003F3DC .text fpcNdRq_phase_Create__FP19node_create_request */ -void fpcNdRq_phase_Create(node_create_request*) { - /* Nonmatching */ +s32 fpcNdRq_phase_Create(node_create_request* i_NdCtReq) { + i_NdCtReq->mCreatingID = fpcSCtRq_Request(i_NdCtReq->mpLayerClass, i_NdCtReq->mProcName, + (stdCreateFunc)i_NdCtReq->mpNodeCrReqMthCls->mpPostMethodFunc, i_NdCtReq, + i_NdCtReq->mpUserData); + return i_NdCtReq->mCreatingID == -1 ? 3 : 2; } /* 8003F3DC-8003F3E4 .text fpcNdRq_phase_IsDeleteTiming__FP19node_create_request */ -void fpcNdRq_phase_IsDeleteTiming(node_create_request*) { - /* Nonmatching */ +s32 fpcNdRq_phase_IsDeleteTiming(node_create_request* i_NdCtReq) { + return 2; } /* 8003F3E4-8003F414 .text fpcNdRq_phase_IsDeleted__FP19node_create_request */ -void fpcNdRq_phase_IsDeleted(node_create_request*) { - /* Nonmatching */ +s32 fpcNdRq_phase_IsDeleted(node_create_request* i_NdCtReq) { + return fpcDt_IsComplete() == 0 ? cPhs_INIT_e : 2; } /* 8003F414-8003F468 .text fpcNdRq_phase_Delete__FP19node_create_request */ -void fpcNdRq_phase_Delete(node_create_request*) { - /* Nonmatching */ +s32 fpcNdRq_phase_Delete(node_create_request* i_NdCtReq) { + if (i_NdCtReq->mNodeProc.mpNodeProc != NULL) { + if (fpcDt_Delete(&i_NdCtReq->mNodeProc.mpNodeProc->mBase) == 0) { + return cPhs_INIT_e; + } + i_NdCtReq->mNodeProc.mpNodeProc = NULL; + } + return 2; } /* 8003F468-8003F4B0 .text fpcNdRq_DoPhase__FP19node_create_request */ -void fpcNdRq_DoPhase(node_create_request*) { - /* Nonmatching */ +s32 fpcNdRq_DoPhase(node_create_request* i_NdCtReq) { + s32 result = cPhs_Handler(&i_NdCtReq->mReqPhsProc, i_NdCtReq->mpPhsHandler, i_NdCtReq); + if (result == 2) { + return fpcNdRq_DoPhase(i_NdCtReq); + } + return result; } /* 8003F4B0-8003F514 .text fpcNdRq_Execute__FP19node_create_request */ -void fpcNdRq_Execute(node_create_request*) { - /* Nonmatching */ +s32 fpcNdRq_Execute(node_create_request* i_NdCtReq) { + s32 result = fpcNdRq_DoPhase(i_NdCtReq); + switch (result) { + case cPhs_INIT_e: + case cPhs_LOADING_e: + return cPhs_INIT_e; + case cPhs_COMPLEATE_e: + return cPhs_NEXT_e; + case cPhs_ERROR_e: + case cPhs_UNK3_e: + return cPhs_UNK3_e; + default: + return result; + } } /* 8003F514-8003F57C .text fpcNdRq_Delete__FP19node_create_request */ -void fpcNdRq_Delete(node_create_request*) { - /* Nonmatching */ +s32 fpcNdRq_Delete(node_create_request* i_NdCtReq) { + fpcNdRq_RequestQTo(i_NdCtReq); + if (i_NdCtReq->mpNodeCrReqMthCls != NULL && i_NdCtReq->mpNodeCrReqMthCls->mpUnkFunc != NULL && fpcMtd_Method(i_NdCtReq->mpNodeCrReqMthCls->mpUnkFunc, i_NdCtReq) == 0) + return 0; + cMl::free(i_NdCtReq); + return 1; } /* 8003F57C-8003F5D4 .text fpcNdRq_Cancel__FP19node_create_request */ -void fpcNdRq_Cancel(node_create_request*) { - /* Nonmatching */ +s32 fpcNdRq_Cancel(node_create_request* i_NdCtReq) { + if (i_NdCtReq->mpNodeCrReqMthCls != NULL && fpcMtd_Method(i_NdCtReq->mpNodeCrReqMthCls->mpCancelFunc, i_NdCtReq) == 0) + return 0; + return fpcNdRq_Delete(i_NdCtReq); } /* 8003F5D4-8003F6BC .text fpcNdRq_Handler__Fv */ -void fpcNdRq_Handler() { - /* Nonmatching */ +s32 fpcNdRq_Handler() { + node_class* currentNode = l_fpcNdRq_Queue.mpHead; + while (currentNode != NULL) { + node_create_request* req = ((request_node_class*)currentNode)->mNodeCrReq; + switch (req->mpNodeCrReqMthCls->mpExecuteFunc(req)) { + case cPhs_UNK3_e: + case cPhs_ERROR_e: + currentNode = NODE_GET_NEXT(currentNode); + if (fpcNdRq_Cancel(req) == 0) { + return 0; + } + break; + case cPhs_COMPLEATE_e: + currentNode = NODE_GET_NEXT(currentNode); + if (fpcNdRq_Delete(req) == 0) { + return 0; + } + break; + default: + currentNode = NODE_GET_NEXT(currentNode); + break; + } + } + return 1; } /* 8003F6BC-8003F728 .text fpcNdRq_IsPossibleTarget__FP18process_node_class */ -void fpcNdRq_IsPossibleTarget(process_node_class*) { - /* Nonmatching */ +s32 fpcNdRq_IsPossibleTarget(process_node_class* i_procNode) { + s32 bsPcId = i_procNode->mBase.mBsPcId; + request_node_class* currentNode; + node_create_request* currentNdCr; + currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead; + while (currentNode != NULL) { + currentNdCr = currentNode->mNodeCrReq; + if ((currentNdCr->mParameter == 2 || currentNdCr->mParameter == 4 || currentNdCr->mParameter == 1) && currentNdCr->mNodeProc.mProcId == bsPcId) + return 0; + currentNode = (request_node_class*)NODE_GET_NEXT((¤tNode->mBase)); + } + return 1; } /* 8003F728-8003F774 .text fpcNdRq_IsIng__FP18process_node_class */ -void fpcNdRq_IsIng(process_node_class*) { - /* Nonmatching */ +s32 fpcNdRq_IsIng(process_node_class* i_procNode) { + request_node_class* currentNode; + node_create_request* currentNodeReq; + s32 bsPcId = i_procNode->mBase.mBsPcId; + currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead; + while (currentNode != NULL) { + currentNodeReq = currentNode->mNodeCrReq; + if (currentNodeReq->mCreatingID == bsPcId) + return 1; + currentNode = (request_node_class*)NODE_GET_NEXT((¤tNode->mBase)); + } + return 0; } /* 8003F774-8003F8EC .text fpcNdRq_Create__FUl */ -void fpcNdRq_Create(unsigned long) { - /* Nonmatching */ +node_create_request* fpcNdRq_Create(u32 i_requestSize) { + static node_create_request clear = { + NULL, NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, + 0, NULL, NULL, NULL, 0, 0, NULL, 5, 0xFFFFFFFF, + NULL, 0xFFFFFFFE, NULL, 0xFFFFFFFE, 0x7FFF, NULL, 0x7FFF, + }; + + node_create_request* req = (node_create_request*)cMl::memalignB(-4, i_requestSize); + if (req != NULL) { + static int request_id = 0; + sBs_ClearArea(req, i_requestSize); + *req = clear; + cTg_Create(&req->mCreateTag, req); + fpcMtdTg_Init(&req->mProcMthCls, (process_method_tag_func)fpcNdRq_Cancel, req); + req->mRequestId = request_id++; + } + return req; } /* 8003F8EC-8003F988 .text fpcNdRq_ChangeNode__FUlP18process_node_classsPv */ -void fpcNdRq_ChangeNode(unsigned long, process_node_class*, short, void*) { - /* Nonmatching */ +node_create_request* fpcNdRq_ChangeNode(u32 i_requestSize, process_node_class* i_procNode, + s16 i_procName, void* i_data) { + static cPhs__Handler methods[] = { + (cPhs__Handler)fpcNdRq_phase_IsDeleteTiming, + (cPhs__Handler)fpcNdRq_phase_Delete, + (cPhs__Handler)fpcNdRq_phase_IsDeleted, + (cPhs__Handler)fpcNdRq_phase_Create, + (cPhs__Handler)fpcNdRq_phase_IsCreated, + NULL, + }; + + if (fpcNdRq_IsPossibleTarget(i_procNode) == 1 && fpcNdRq_IsIng(i_procNode) == 0) { + node_create_request* req = fpcNdRq_Create(i_requestSize); + if (req != NULL) { + req->mpPhsHandler = methods; + req->mNodeProc.mpNodeProc = i_procNode; + req->mNodeProc.mProcId = i_procNode->mBase.mBsPcId; + req->mpLayerClass = i_procNode->mBase.mLyTg.mpLayer; + req->mProcName = i_procName; + req->mpUserData = i_data; + } + return req; + } else { + return NULL; + } } /* 8003F988-8003FA14 .text fpcNdRq_DeleteNode__FUlP18process_node_class */ -void fpcNdRq_DeleteNode(unsigned long, process_node_class*) { - /* Nonmatching */ +node_create_request* fpcNdRq_DeleteNode(u32 i_requestSize, process_node_class* i_procNode) { + static cPhs__Handler methods[] = { + (cPhs__Handler)fpcNdRq_phase_IsDeleteTiming, + (cPhs__Handler)fpcNdRq_phase_Delete, + (cPhs__Handler)fpcNdRq_phase_IsDeleted, + NULL, + }; + + if (fpcNdRq_IsPossibleTarget(i_procNode) == 1 && fpcNdRq_IsIng(i_procNode) == 0) { + node_create_request* req = fpcNdRq_Create(i_requestSize); + if (req != NULL) { + req->mpPhsHandler = methods; + req->mNodeProc.mpNodeProc = i_procNode; + req->mNodeProc.mProcId = i_procNode->mBase.mBsPcId; + req->mpLayerClass = i_procNode->mBase.mLyTg.mpLayer; + } + return req; + } else { + return NULL; + } } /* 8003FA14-8003FAC0 .text fpcNdRq_CreateNode__FUlsPv */ -void fpcNdRq_CreateNode(unsigned long, short, void*) { - /* Nonmatching */ +node_create_request* fpcNdRq_CreateNode(u32 i_requestSize, s16 i_procName, void* i_data) { + static cPhs__Handler methods[] = { + (cPhs__Handler)fpcNdRq_phase_Create, + (cPhs__Handler)fpcNdRq_phase_IsCreated, + NULL, + }; + + layer_class* layer = fpcLy_CurrentLayer(); + if (layer->mLayerID != 0 && fpcNdRq_IsPossibleTarget(layer->mpPcNode) == 0) { + return NULL; + } else { + node_create_request* req = fpcNdRq_Create(i_requestSize); + if (req != NULL) { + req->mpPhsHandler = methods; + if (layer->mLayerID != 0) { + req->mNodeProc.mpNodeProc = layer->mpPcNode; + req->mNodeProc.mProcId = layer->mpPcNode->mBase.mBsPcId; + } + req->mpLayerClass = layer; + req->mProcName = i_procName; + req->mpUserData = i_data; + } + return req; + } } /* 8003FAC0-8003FB70 .text fpcNdRq_Request__FUliP18process_node_classsPvP32node_create_request_method_class */ -void fpcNdRq_Request(unsigned long, int, process_node_class*, short, void*, node_create_request_method_class*) { - /* Nonmatching */ +node_create_request* fpcNdRq_Request(u32 i_requestSize, int i_reqType, + process_node_class* i_procNode, s16 i_procName, void* i_data, + node_create_request_method_class* i_nodeCtRqMtd) { + node_create_request* req; + switch (i_reqType) { + case 0: + req = fpcNdRq_CreateNode(i_requestSize, i_procName, i_data); + break; + case 1: + req = fpcNdRq_DeleteNode(i_requestSize, i_procNode); + break; + case 2: + req = fpcNdRq_ChangeNode(i_requestSize, i_procNode, i_procName, i_data); + break; + case 4: + break; + } + + if (req != NULL) { + req->mParameter = i_reqType; + req->mpNodeCrReqMthCls = i_nodeCtRqMtd; + fpcNdRq_ToRequestQ(req); + } + + return req; } /* 8003FB70-8003FBE8 .text fpcNdRq_ReChangeNode__FUisPv */ -void fpcNdRq_ReChangeNode(unsigned int, short, void*) { - /* Nonmatching */ +s32 fpcNdRq_ReChangeNode(unsigned int i_requestID, s16 i_procName, void* i_data) { + request_node_class* currentNode; + node_create_request* found; + currentNode = (request_node_class*)l_fpcNdRq_Queue.mpHead; + while (currentNode != NULL) { + found = currentNode->mNodeCrReq; + if (found->mParameter == 2 && found->mRequestId == i_requestID) { + if (found->mCreatingID == -2) { + found->mProcName = i_procName; + found->mpUserData = i_data; + return 1; + } + return 0; + } + currentNode = (request_node_class*)NODE_GET_NEXT((¤tNode->mBase)); + } + return 0; } /* 8003FBE8-8003FC08 .text fpcNdRq_ReRequest__FUisPv */ -void fpcNdRq_ReRequest(unsigned int, short, void*) { - /* Nonmatching */ +s32 fpcNdRq_ReRequest(unsigned int i_requestID, s16 i_procName, void* i_data) { + return fpcNdRq_ReChangeNode(i_requestID, i_procName, i_data); } diff --git a/src/f_pc/f_pc_pause.cpp b/src/f_pc/f_pc_pause.cpp index d0e6c2a..32f1ca1 100644 --- a/src/f_pc/f_pc_pause.cpp +++ b/src/f_pc/f_pc_pause.cpp @@ -4,24 +4,47 @@ // #include "f_pc/f_pc_pause.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_node.h" +#include "f_pc/f_pc_layer_iter.h" /* 8004031C-80040340 .text fpcPause_IsEnable__FPvUc */ -void fpcPause_IsEnable(void*, unsigned char) { - /* Nonmatching */ +s32 fpcPause_IsEnable(void* i_proc, u8 i_flag) { + base_process_class* pProc = (base_process_class*)i_proc; + if ((pProc->mPauseFlag & i_flag) == i_flag) { + return 1; + } else { + return 0; + } } /* 80040340-800403AC .text fpcPause_Enable__FPvUc */ -void fpcPause_Enable(void*, unsigned char) { - /* Nonmatching */ +s32 fpcPause_Enable(void* i_proc, u8 i_flag) { + base_process_class* pProc = (base_process_class*)i_proc; + pProc->mPauseFlag |= i_flag; + + if (fpcBs_Is_JustOfType(g_fpcNd_type, pProc->mSubType)) { + process_node_class* pNode = (process_node_class*)pProc; + fpcLyIt_OnlyHere(&pNode->mLayer, (fpcLyIt_OnlyHereFunc)fpcPause_Enable, + (void*)(i_flag & 0xFF)); + } + return 1; } /* 800403AC-80040420 .text fpcPause_Disable__FPvUc */ -void fpcPause_Disable(void*, unsigned char) { - /* Nonmatching */ +s32 fpcPause_Disable(void* i_proc, u8 i_flag) { + base_process_class* pProc = (base_process_class*)i_proc; + pProc->mPauseFlag &= (0xFF - i_flag) & 0xFF; + + if (fpcBs_Is_JustOfType(g_fpcNd_type, pProc->mSubType)) { + process_node_class* pNode = (process_node_class*)pProc; + fpcLyIt_OnlyHere(&pNode->mLayer, (fpcLyIt_OnlyHereFunc)fpcPause_Disable, (void*)i_flag); + } + + return 1; } /* 80040420-8004042C .text fpcPause_Init__FPv */ -void fpcPause_Init(void*) { - /* Nonmatching */ +void fpcPause_Init(void* i_proc) { + base_process_class* pProc = (base_process_class*)i_proc; + pProc->mPauseFlag = 0; } diff --git a/src/f_pc/f_pc_priority.cpp b/src/f_pc/f_pc_priority.cpp index cc55cfa..ee0a571 100644 --- a/src/f_pc/f_pc_priority.cpp +++ b/src/f_pc/f_pc_priority.cpp @@ -4,49 +4,158 @@ // #include "f_pc/f_pc_priority.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_base.h" +#include "f_pc/f_pc_layer.h" /* 8003FC08-8003FC28 .text fpcPi_IsInQueue__FP22process_priority_class */ -void fpcPi_IsInQueue(process_priority_class*) { - /* Nonmatching */ +s32 fpcPi_IsInQueue(process_priority_class* i_procPriority) { + return cTg_IsUse(&i_procPriority->mBase); } /* 8003FC28-8003FC60 .text fpcPi_QueueTo__FP22process_priority_class */ -void fpcPi_QueueTo(process_priority_class*) { - /* Nonmatching */ +s32 fpcPi_QueueTo(process_priority_class* i_procPriority) { + cTg_SingleCut(&i_procPriority->mBase); + fpcLy_CancelQTo(&i_procPriority->mMtdTag); + return 1; } +static node_list_class l_fpcPi_Queue; + /* 8003FC60-8003FCEC .text fpcPi_ToQueue__FP22process_priority_class */ -void fpcPi_ToQueue(process_priority_class*) { - /* Nonmatching */ +s32 fpcPi_ToQueue(process_priority_class* i_procPriority) { + u32 layer = i_procPriority->mInfoQ.mLayer; + + if (cTg_Addition(&l_fpcPi_Queue, &i_procPriority->mBase)) { + if (layer != 0xFFFFFFFD) { + layer_class* pLayer = fpcLy_Layer(layer); + + if (!fpcLy_ToCancelQ(pLayer, &i_procPriority->mMtdTag)) { + cTg_SingleCut(&i_procPriority->mBase); + return 0; + } + } + + return 1; + } + + return 0; } /* 8003FCEC-8003FD40 .text fpcPi_GetFromQueue__Fv */ -void fpcPi_GetFromQueue() { - /* Nonmatching */ +process_priority_class* fpcPi_GetFromQueue() { + process_priority_class* i_procPriority = (process_priority_class*)cTg_GetFirst(&l_fpcPi_Queue); + + if (i_procPriority != NULL) { + base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData; + process_priority_class* pProcPi = &pProc->mPi; + fpcLy_CancelQTo(&pProcPi->mMtdTag); + return pProcPi; + } + + return NULL; } /* 8003FD40-8003FD8C .text fpcPi_Delete__FP22process_priority_class */ -void fpcPi_Delete(process_priority_class*) { - /* Nonmatching */ +s32 fpcPi_Delete(process_priority_class* i_procPriority) { + static process_priority_queue_info crear = { + 0xFFFFFFFF, + 0xFFFF, + 0xFFFF, + }; + + fpcPi_QueueTo(i_procPriority); + i_procPriority->mInfoQ.mLayer = crear.mLayer; + i_procPriority->mInfoQ.mListID = crear.mListID; + i_procPriority->mInfoQ.mListPrio = crear.mListPrio; + return 1; } /* 8003FD8C-8003FDC0 .text fpcPi_IsNormal__FUiUsUs */ -void fpcPi_IsNormal(unsigned int, unsigned short, unsigned short) { - /* Nonmatching */ +s32 fpcPi_IsNormal(unsigned int i_layer, u16 i_listID, u16 i_priority) { + if ((i_layer < 0xFFFFFFFE) && (i_listID < 0xFFFE) && (i_priority < 0xFFFE)) + return 1; + + return 0; } /* 8003FDC0-8003FF00 .text fpcPi_Change__FP22process_priority_classUiUsUs */ -void fpcPi_Change(process_priority_class*, unsigned int, unsigned short, unsigned short) { - /* Nonmatching */ +s32 fpcPi_Change(process_priority_class* i_procPriority, unsigned int i_layer, u16 i_listID, u16 i_priority) { + base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData; + BOOL changed = 0; + + if (pProc->mInitState == 3) + return 0; + + if (!fpcPi_IsNormal(i_layer, i_listID, i_priority)) + return 0; + + i_procPriority->mInfoQ.mLayer = i_procPriority->mInfoCurr.mLayer; + i_procPriority->mInfoQ.mListID = i_procPriority->mInfoCurr.mListID; + i_procPriority->mInfoQ.mListPrio = i_procPriority->mInfoCurr.mListPrio; + + if (i_layer != 0xFFFFFFFD && i_procPriority->mInfoCurr.mLayer != i_layer) { + i_procPriority->mInfoQ.mLayer = i_layer; + changed = 1; + } + + if (i_listID != 0xFFFD && i_procPriority->mInfoCurr.mListID != i_listID) { + i_procPriority->mInfoQ.mListID = i_listID; + changed = 1; + } + + if (i_priority != 0xFFFD && i_procPriority->mInfoCurr.mListPrio != i_priority) { + i_procPriority->mInfoQ.mListPrio = i_priority; + changed = 1; + } + + if (pProc->mInitState == 0 || pProc->mInitState == 1) { + i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer; + i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID; + i_procPriority->mInfoCurr.mListPrio = i_procPriority->mInfoQ.mListPrio; + return 1; + } + + if (changed == 1) + return fpcPi_ToQueue(i_procPriority); + else + return 0; } /* 8003FF00-8003FF94 .text fpcPi_Handler__Fv */ -void fpcPi_Handler() { - /* Nonmatching */ +s32 fpcPi_Handler() { + process_priority_class* i_procPriority; + while (i_procPriority = fpcPi_GetFromQueue()) { + base_process_class* pProc = (base_process_class*)i_procPriority->mBase.mpTagData; + layer_management_tag_class* pLayerTag = &pProc->mLyTg; + line_tag* pLineTag = &pProc->mLnTg; + if (fpcLyTg_Move(pLayerTag, i_procPriority->mInfoQ.mLayer, i_procPriority->mInfoQ.mListID, + i_procPriority->mInfoQ.mListPrio) == 1) { + fpcLnTg_Move(pLineTag, i_procPriority->mInfoCurr.mListID); + i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer; + i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID; + i_procPriority->mInfoCurr.mListPrio = i_procPriority->mInfoQ.mListPrio; + } else { + return 0; + } + } + + return 1; } /* 8003FF94-8004003C .text fpcPi_Init__FP22process_priority_classPvUiUsUs */ -void fpcPi_Init(process_priority_class*, void*, unsigned int, unsigned short, unsigned short) { - /* Nonmatching */ +s32 fpcPi_Init(process_priority_class* i_procPriority, void* i_data, unsigned int i_layer, u16 i_listID, + u16 i_priority) { + if (!fpcPi_IsNormal(i_layer, i_listID, i_priority)) + return 0; + + i_procPriority->mInfoQ.mLayer = i_layer; + i_procPriority->mInfoQ.mListID = i_listID; + i_procPriority->mInfoQ.mListPrio = i_priority; + + i_procPriority->mInfoCurr.mLayer = i_procPriority->mInfoQ.mLayer; + i_procPriority->mInfoCurr.mListID = i_procPriority->mInfoQ.mListID; + i_procPriority->mInfoCurr.mListPrio = i_procPriority->mInfoQ.mListPrio; + cTg_Create(&i_procPriority->mBase, i_data); + fpcMtdTg_Init(&i_procPriority->mMtdTag, (process_method_tag_func)fpcPi_Delete, i_procPriority); + return 1; } diff --git a/src/f_pc/f_pc_profile.cpp b/src/f_pc/f_pc_profile.cpp index 34cada1..cd1f5c2 100644 --- a/src/f_pc/f_pc_profile.cpp +++ b/src/f_pc/f_pc_profile.cpp @@ -4,9 +4,10 @@ // #include "f_pc/f_pc_profile.h" -#include "dolphin/types.h" + +process_profile_definition** g_fpcPf_ProfileList_p; /* 8004003C-80040050 .text fpcPf_Get__Fs */ -void fpcPf_Get(short) { - /* Nonmatching */ +process_profile_definition* fpcPf_Get(s16 i_profName) { + return g_fpcPf_ProfileList_p[i_profName]; } diff --git a/src/f_pc/f_pc_profile_lst.cpp b/src/f_pc/f_pc_profile_lst.cpp index 1053282..15be931 100644 --- a/src/f_pc/f_pc_profile_lst.cpp +++ b/src/f_pc/f_pc_profile_lst.cpp @@ -4,14 +4,19 @@ // #include "f_pc/f_pc_profile_lst.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_profile.h" + +// TODO(jstpierre): Fill in profile list +SECTION_DATA static process_profile_definition* g_fpcPfLst_ProfileList[] = { + NULL, +}; /* 00000078-0000008C .text ModuleProlog */ -void ModuleProlog { - /* Nonmatching */ +void ModuleProlog() { + g_fpcPf_ProfileList_p = g_fpcPf_ProfileList; } /* 0000008C-0000009C .text ModuleEpilog */ -void ModuleEpilog { - /* Nonmatching */ +void ModuleEpilog() { + g_fpcPf_ProfileList_p = NULL; } diff --git a/src/f_pc/f_pc_searcher.cpp b/src/f_pc/f_pc_searcher.cpp index b132f84..ac1c842 100644 --- a/src/f_pc/f_pc_searcher.cpp +++ b/src/f_pc/f_pc_searcher.cpp @@ -4,14 +4,21 @@ // #include "f_pc/f_pc_searcher.h" -#include "dolphin/types.h" /* 80040050-80040068 .text fpcSch_JudgeForPName__FPvPv */ -void fpcSch_JudgeForPName(void*, void*) { - /* Nonmatching */ +void* fpcSch_JudgeForPName(void* i_proc, void* i_data) { + s16 proc_name = *(s16*)i_data; + + if (((base_process_class*)i_proc)->mProcName == proc_name) + return i_proc; + return NULL; } /* 80040068-80040080 .text fpcSch_JudgeByID__FPvPv */ -void fpcSch_JudgeByID(void*, void*) { - /* Nonmatching */ +void* fpcSch_JudgeByID(void* i_proc, void* i_data) { + s32 process_id = *(s32*)i_data; + + if (((base_process_class*)i_proc)->mBsPcId == process_id) + return i_proc; + return NULL; } diff --git a/src/f_pc/f_pc_stdcreate_req.cpp b/src/f_pc/f_pc_stdcreate_req.cpp index dc4eb79..8562f0b 100644 --- a/src/f_pc/f_pc_stdcreate_req.cpp +++ b/src/f_pc/f_pc_stdcreate_req.cpp @@ -4,54 +4,125 @@ // #include "f_pc/f_pc_stdcreate_req.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_load.h" +#include "f_pc/f_pc_node.h" /* 80040648-8004069C .text fpcSCtRq_phase_Load__FP29standard_create_request_class */ -void fpcSCtRq_phase_Load(standard_create_request_class*) { - /* Nonmatching */ +s32 fpcSCtRq_phase_Load(standard_create_request_class* i_SCtReq) { + switch (fpcLd_Load(i_SCtReq->mProcName)) { + case cPhs_INIT_e: + return cPhs_INIT_e; + case cPhs_COMPLEATE_e: + return cPhs_NEXT_e; + case cPhs_ERROR_e: + default: + return cPhs_ERROR_e; + } } + /* 8004069C-80040704 .text fpcSCtRq_phase_CreateProcess__FP29standard_create_request_class */ -void fpcSCtRq_phase_CreateProcess(standard_create_request_class*) { - /* Nonmatching */ +s32 fpcSCtRq_phase_CreateProcess(standard_create_request_class* i_SCtReq) { + fpcLy_SetCurrentLayer(i_SCtReq->mBase.mpLayer); + i_SCtReq->mBase.mpRes = fpcBs_Create(i_SCtReq->mProcName, i_SCtReq->mBase.mBsPcId, i_SCtReq->mpUserData); + if (i_SCtReq->mBase.mpRes == NULL) { + fpcLd_Free(i_SCtReq->mProcName); + return cPhs_ERROR_e; + } else { + i_SCtReq->mBase.mpRes->mpCtRq = (struct create_request*)i_SCtReq; + return cPhs_NEXT_e; + } } /* 80040704-8004073C .text fpcSCtRq_phase_SubCreateProcess__FP29standard_create_request_class */ -void fpcSCtRq_phase_SubCreateProcess(standard_create_request_class*) { - /* Nonmatching */ +s32 fpcSCtRq_phase_SubCreateProcess(standard_create_request_class* i_SCtReq) { + fpcLy_SetCurrentLayer(i_SCtReq->mBase.mpLayer); + return fpcBs_SubCreate(i_SCtReq->mBase.mpRes); } /* 8004073C-80040794 .text fpcSCtRq_phase_IsComplete__FP29standard_create_request_class */ -void fpcSCtRq_phase_IsComplete(standard_create_request_class*) { - /* Nonmatching */ +s32 fpcSCtRq_phase_IsComplete(standard_create_request_class* i_SCtReq) { + process_node_class* procNode = (process_node_class*)i_SCtReq->mBase.mpRes; + if (fpcBs_Is_JustOfType(g_fpcNd_type, procNode->mBase.mSubType) == 1) { + if (fpcLy_IsCreatingMesg(&procNode->mLayer) == 1) { + return cPhs_INIT_e; + } + } + return cPhs_NEXT_e; } /* 80040794-800407E4 .text fpcSCtRq_phase_PostMethod__FP29standard_create_request_class */ -void fpcSCtRq_phase_PostMethod(standard_create_request_class*) { - /* Nonmatching */ +s32 fpcSCtRq_phase_PostMethod(standard_create_request_class* i_SCtReq) { + if (i_SCtReq->mpCallBack != NULL && i_SCtReq->mpCallBack(i_SCtReq->mBase.mpRes, i_SCtReq->mpCallBackUserData) == 0) { + return cPhs_INIT_e; + } else { + return cPhs_NEXT_e; + } } /* 800407E4-800407EC .text fpcSCtRq_phase_Done__FP29standard_create_request_class */ -void fpcSCtRq_phase_Done(standard_create_request_class*) { - /* Nonmatching */ +s32 fpcSCtRq_phase_Done(standard_create_request_class* i_SCtReq) { + return cPhs_NEXT_e; } /* 800407EC-8004085C .text fpcSCtRq_Handler__FP29standard_create_request_class */ -void fpcSCtRq_Handler(standard_create_request_class*) { - /* Nonmatching */ +s32 fpcSCtRq_Handler(standard_create_request_class* i_SCtReq) { + s32 phase_state = cPhs_Do(&i_SCtReq->mPhase, i_SCtReq); + + switch (phase_state) { + case cPhs_NEXT_e: + return fpcSCtRq_Handler(i_SCtReq); + case cPhs_COMPLEATE_e: + return cPhs_COMPLEATE_e; + case cPhs_LOADING_e: + case cPhs_ERROR_e: + default: + return phase_state; + } } /* 8004085C-80040864 .text fpcSCtRq_Delete__FP29standard_create_request_class */ -void fpcSCtRq_Delete(standard_create_request_class*) { - /* Nonmatching */ +s32 fpcSCtRq_Delete(standard_create_request_class* i_SCtReq) { + return 1; } /* 80040864-8004086C .text fpcSCtRq_Cancel__FP29standard_create_request_class */ -void fpcSCtRq_Cancel(standard_create_request_class*) { - /* Nonmatching */ +s32 fpcSCtRq_Cancel(standard_create_request_class* i_SCtReq) { + return 1; } /* 8004086C-80040900 .text fpcSCtRq_Request__FP11layer_classsPFPvPv_iPvPv */ -void fpcSCtRq_Request(layer_class*, short, int (*)(void*, void*), void*, void*) { - /* Nonmatching */ +s32 fpcSCtRq_Request(layer_class* i_layer, s16 i_procName, stdCreateFunc i_createFunc, + void* param_4, void* param_5) { + static create_request_method_class submethod = { + (cPhs__Handler)fpcSCtRq_Handler, + (process_method_func)fpcSCtRq_Cancel, + (process_method_func)fpcSCtRq_Delete, + }; + + static cPhs__Handler method[] = { + (cPhs__Handler)fpcSCtRq_phase_Load, + (cPhs__Handler)fpcSCtRq_phase_CreateProcess, + (cPhs__Handler)fpcSCtRq_phase_SubCreateProcess, + (cPhs__Handler)fpcSCtRq_phase_IsComplete, + (cPhs__Handler)fpcSCtRq_phase_PostMethod, + (cPhs__Handler)fpcSCtRq_phase_Done, + NULL, + }; + + if (i_procName >= 0x7FFF) { + return -1; + } else { + standard_create_request_class* request = (standard_create_request_class*)fpcCtRq_Create(i_layer, sizeof(standard_create_request_class), &submethod); + if (request == NULL) { + return -1; + } else { + cPhs_Set(&request->mPhase, method); + request->mProcName = i_procName; + request->mpCallBack = i_createFunc; + request->mpCallBackUserData = param_4; + request->mpUserData = param_5; + return request->mBase.mBsPcId; + } + } } From 9ca10a312b48cc2e46dc6c9d54303941bd41ea4b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 9 Sep 2023 16:23:02 -0700 Subject: [PATCH 2/4] m3d, jsu, jkr matches --- config/GZLE01/splits.txt | 36 +- config/GZLJ01/splits.txt | 36 +- config/GZLP01/splits.txt | 36 +- configure.py | 30 +- include/JSystem/JKernel/JKRAram.h | 89 ++ include/JSystem/JKernel/JKRAramArchive.h | 36 + include/JSystem/JKernel/JKRAramBlock.h | 36 + include/JSystem/JKernel/JKRAramHeap.h | 54 ++ include/JSystem/JKernel/JKRAramPiece.h | 73 ++ include/JSystem/JKernel/JKRAramStream.h | 68 ++ include/JSystem/JKernel/JKRArchive.h | 227 +++++ include/JSystem/JKernel/JKRArchivePri.h | 5 + include/JSystem/JKernel/JKRArchivePub.h | 5 + include/JSystem/JKernel/JKRAssertHeap.h | 34 + include/JSystem/JKernel/JKRCompArchive.h | 38 + include/JSystem/JKernel/JKRCompression.h | 10 + include/JSystem/JKernel/JKRDecomp.h | 72 ++ include/JSystem/JKernel/JKRDisposer.h | 19 + include/JSystem/JKernel/JKRDvdAramRipper.h | 56 ++ include/JSystem/JKernel/JKRDvdArchive.h | 32 + include/JSystem/JKernel/JKRDvdFile.h | 63 ++ include/JSystem/JKernel/JKRDvdRipper.h | 65 ++ include/JSystem/JKernel/JKRExpHeap.h | 113 +++ include/JSystem/JKernel/JKRFile.h | 29 + include/JSystem/JKernel/JKRFileCache.h | 66 ++ include/JSystem/JKernel/JKRFileFinder.h | 72 ++ include/JSystem/JKernel/JKRFileLoader.h | 68 ++ include/JSystem/JKernel/JKRHeap.h | 242 ++++++ include/JSystem/JKernel/JKRMemArchive.h | 42 + include/JSystem/JKernel/JKRSolidHeap.h | 60 ++ include/JSystem/JKernel/JKRThread.h | 164 ++++ include/JSystem/JKernel/SArc.h | 0 include/JSystem/JParticle/JPATexture.h | 46 + include/JSystem/JSupport/JSUFileStream.h | 24 + include/JSystem/JSupport/JSUInputStream.h | 77 ++ include/JSystem/JSupport/JSUIosBase.h | 24 + include/JSystem/JSupport/JSUList.h | 223 +++++ include/JSystem/JSupport/JSUMemoryStream.h | 23 + .../JSystem/JSupport/JSURandomInputStream.h | 24 + include/JSystem/JSupport/JSupport.h | 27 + include/JSystem/JUtility/JUTAssert.h | 5 +- include/JSystem/JUtility/JUTCacheFont.h | 80 ++ include/JSystem/JUtility/JUTConsole.h | 153 ++++ include/JSystem/JUtility/JUTDbPrint.h | 43 + include/JSystem/JUtility/JUTDirectFile.h | 25 + include/JSystem/JUtility/JUTDirectPrint.h | 57 ++ include/JSystem/JUtility/JUTException.h | 141 +++ include/JSystem/JUtility/JUTFader.h | 35 + include/JSystem/JUtility/JUTFont.h | 128 +++ .../JUtility/JUTFontData_Ascfont_fix12.h | 6 + include/JSystem/JUtility/JUTGamePad.h | 283 ++++++ include/JSystem/JUtility/JUTGraphFifo.h | 36 + include/JSystem/JUtility/JUTNameTab.h | 37 + include/JSystem/JUtility/JUTPalette.h | 44 + include/JSystem/JUtility/JUTProcBar.h | 103 +++ include/JSystem/JUtility/JUTReport.h | 7 + include/JSystem/JUtility/JUTResFont.h | 74 ++ include/JSystem/JUtility/JUTResource.h | 30 + include/JSystem/JUtility/JUTTexture.h | 106 +++ include/JSystem/JUtility/JUTVideo.h | 74 ++ include/JSystem/JUtility/JUTXfb.h | 71 ++ include/JSystem/JUtility/TColor.h | 34 + include/SSystem/SComponent/c_API.h | 13 +- .../SSystem/SComponent/c_API_controller_pad.h | 19 +- include/SSystem/SComponent/c_bg_s_lin_chk.h | 2 +- include/SSystem/SComponent/c_data_tbl.h | 51 ++ include/SSystem/SComponent/c_m2d_g_box.h | 14 + include/SSystem/SComponent/c_m3d_g_aab.h | 12 - include/SSystem/SComponent/c_m3d_g_cps.h | 34 - include/SSystem/SComponent/c_m3d_g_cyl.h | 12 +- include/SSystem/SComponent/c_m3d_g_lin.h | 32 - include/SSystem/SComponent/c_m3d_g_pla.h | 28 +- include/SSystem/SComponent/c_m3d_g_sph.h | 13 +- include/SSystem/SComponent/c_m3d_g_tri.h | 17 +- include/SSystem/SComponent/c_xyz.h | 5 + include/d/d_resorce.h | 115 +++ include/dolphin/dvd/dvd.h | 146 ++++ include/dolphin/dvd/dvdFatal.h | 5 + include/dolphin/dvd/dvderror.h | 5 + include/dolphin/dvd/dvdfs.h | 5 + include/dolphin/dvd/dvdidutils.h | 5 + include/dolphin/dvd/dvdlow.h | 9 + include/dolphin/dvd/dvdqueue.h | 5 + include/dolphin/dvd/fstload.h | 5 + include/dolphin/gx/GX.h | 147 ++++ include/dolphin/gx/GXAttr.h | 45 + include/dolphin/gx/GXBump.h | 23 + include/dolphin/gx/GXDisplayList.h | 18 + include/dolphin/gx/GXDraw.h | 16 + include/dolphin/gx/GXEnum.h | 809 ++++++++++++++++++ include/dolphin/gx/GXFifo.h | 38 + include/dolphin/gx/GXFrameBuf.h | 31 + include/dolphin/gx/GXGeometry.h | 24 + include/dolphin/gx/GXInit.h | 122 +++ include/dolphin/gx/GXLight.h | 27 + include/dolphin/gx/GXMisc.h | 38 + include/dolphin/gx/GXPerf.h | 18 + include/dolphin/gx/GXPixel.h | 28 + include/dolphin/gx/GXStruct.h | 101 +++ include/dolphin/gx/GXTev.h | 37 + include/dolphin/gx/GXTexture.h | 47 + include/dolphin/gx/GXTransform.h | 31 + include/dolphin/os/OS.h | 311 +++++++ include/dolphin/os/OSAlarm.h | 46 + include/dolphin/os/OSAlloc.h | 48 ++ include/dolphin/os/OSArena.h | 20 + include/dolphin/os/OSAudioSystem.h | 16 + include/dolphin/os/OSCache.h | 34 + include/dolphin/os/OSContext.h | 175 ++++ include/dolphin/os/OSError.h | 66 ++ include/dolphin/os/OSExec.h | 23 + include/dolphin/os/OSFont.h | 18 + include/dolphin/os/OSInterrupt.h | 131 +++ include/dolphin/os/OSLink.h | 65 ++ include/dolphin/os/OSMemory.h | 31 + include/dolphin/os/OSMessage.h | 34 + include/dolphin/os/OSMutex.h | 38 + include/dolphin/os/OSReboot.h | 18 + include/dolphin/os/OSReset.h | 57 ++ include/dolphin/os/OSResetSW.h | 19 + include/dolphin/os/OSRtc.h | 76 ++ include/dolphin/os/OSSync.h | 18 + include/dolphin/os/OSThread.h | 116 +++ include/dolphin/os/OSTime.h | 56 ++ include/dolphin/os/__ppc_eabi_init.h | 5 + include/dolphin/pad/Pad.h | 83 ++ include/dolphin/pad/Padclamp.h | 29 + include/dolphin/vi/vi.h | 63 ++ include/f_pc/f_pc_draw_priority.h | 2 +- include/m_Do/m_Do_Reset.h | 62 ++ include/m_Do/m_Do_controller_pad.h | 4 + include/m_Do/m_Do_main.h | 62 ++ src/JPALoader/JPATexture.cpp | 42 - src/JSystem/JKernel/JKRFile.cpp | 14 +- .../JParticle}/JPABaseShape.cpp | 2 +- .../JParticle}/JPADraw.cpp | 2 +- .../JParticle}/JPADrawSetupTev.cpp | 2 +- .../JParticle}/JPADrawVisitor.cpp | 2 +- .../JParticle}/JPADynamicsBlock.cpp | 2 +- .../JParticle}/JPAEmitter.cpp | 2 +- .../JParticle}/JPAEmitterLoader.cpp | 2 +- .../JParticle}/JPAEmitterManager.cpp | 2 +- .../JParticle}/JPAExTexShape.cpp | 2 +- .../JParticle}/JPAExtraShape.cpp | 2 +- .../JParticle}/JPAField.cpp | 2 +- .../JParticle}/JPAFieldBlock.cpp | 2 +- .../JParticle}/JPAKeyBlock.cpp | 2 +- .../JParticle}/JPAMath.cpp | 2 +- .../JParticle}/JPAParticle.cpp | 2 +- .../JParticle}/JPAResourceManager.cpp | 2 +- .../JParticle}/JPASweepShape.cpp | 2 +- src/JSystem/JParticle/JPATexture.cpp | 152 ++++ src/JSystem/JSupport/JSUFileStream.cpp | 61 +- src/JSystem/JSupport/JSUInputStream.cpp | 62 +- src/JSystem/JSupport/JSUList.cpp | 138 ++- src/JSystem/JSupport/JSUMemoryStream.cpp | 55 +- src/JSystem/JUtility/JUTNameTab.cpp | 60 +- src/JSystem/JUtility/JUTPalette.cpp | 42 +- src/SSystem/SComponent/c_API.cpp | 30 +- src/SSystem/SComponent/c_API_graphic.cpp | 6 +- src/SSystem/SComponent/c_bg_s_chk.cpp | 9 +- src/SSystem/SComponent/c_bg_s_gnd_chk.cpp | 4 +- src/SSystem/SComponent/c_bg_s_lin_chk.cpp | 16 +- src/SSystem/SComponent/c_data_tbl.cpp | 53 +- src/SSystem/SComponent/c_m2d.cpp | 46 +- src/SSystem/SComponent/c_m2d_g_box.cpp | 18 +- src/SSystem/SComponent/c_m3d_g_aab.cpp | 13 +- src/SSystem/SComponent/c_m3d_g_cyl.cpp | 45 +- src/SSystem/SComponent/c_m3d_g_pla.cpp | 12 +- src/SSystem/SComponent/c_m3d_g_sph.cpp | 34 +- src/SSystem/SComponent/c_m3d_g_tri.cpp | 12 +- src/d/d_resorce.cpp | 242 +++++- src/f_pc/f_pc_draw_priority.cpp | 2 +- src/f_pc/f_pc_leaf.cpp | 2 +- src/m_Do/m_Do_controller_pad.cpp | 108 ++- 175 files changed, 8709 insertions(+), 497 deletions(-) create mode 100644 include/JSystem/JKernel/JKRAram.h create mode 100644 include/JSystem/JKernel/JKRAramArchive.h create mode 100644 include/JSystem/JKernel/JKRAramBlock.h create mode 100644 include/JSystem/JKernel/JKRAramHeap.h create mode 100644 include/JSystem/JKernel/JKRAramPiece.h create mode 100644 include/JSystem/JKernel/JKRAramStream.h create mode 100644 include/JSystem/JKernel/JKRArchive.h create mode 100644 include/JSystem/JKernel/JKRArchivePri.h create mode 100644 include/JSystem/JKernel/JKRArchivePub.h create mode 100644 include/JSystem/JKernel/JKRAssertHeap.h create mode 100644 include/JSystem/JKernel/JKRCompArchive.h create mode 100644 include/JSystem/JKernel/JKRCompression.h create mode 100644 include/JSystem/JKernel/JKRDecomp.h create mode 100644 include/JSystem/JKernel/JKRDisposer.h create mode 100644 include/JSystem/JKernel/JKRDvdAramRipper.h create mode 100644 include/JSystem/JKernel/JKRDvdArchive.h create mode 100644 include/JSystem/JKernel/JKRDvdFile.h create mode 100644 include/JSystem/JKernel/JKRDvdRipper.h create mode 100644 include/JSystem/JKernel/JKRExpHeap.h create mode 100644 include/JSystem/JKernel/JKRFile.h create mode 100644 include/JSystem/JKernel/JKRFileCache.h create mode 100644 include/JSystem/JKernel/JKRFileFinder.h create mode 100644 include/JSystem/JKernel/JKRFileLoader.h create mode 100644 include/JSystem/JKernel/JKRHeap.h create mode 100644 include/JSystem/JKernel/JKRMemArchive.h create mode 100644 include/JSystem/JKernel/JKRSolidHeap.h create mode 100644 include/JSystem/JKernel/JKRThread.h create mode 100644 include/JSystem/JKernel/SArc.h create mode 100644 include/JSystem/JParticle/JPATexture.h create mode 100644 include/JSystem/JSupport/JSUFileStream.h create mode 100644 include/JSystem/JSupport/JSUInputStream.h create mode 100644 include/JSystem/JSupport/JSUIosBase.h create mode 100644 include/JSystem/JSupport/JSUList.h create mode 100644 include/JSystem/JSupport/JSUMemoryStream.h create mode 100644 include/JSystem/JSupport/JSURandomInputStream.h create mode 100644 include/JSystem/JSupport/JSupport.h create mode 100644 include/JSystem/JUtility/JUTCacheFont.h create mode 100644 include/JSystem/JUtility/JUTConsole.h create mode 100644 include/JSystem/JUtility/JUTDbPrint.h create mode 100644 include/JSystem/JUtility/JUTDirectFile.h create mode 100644 include/JSystem/JUtility/JUTDirectPrint.h create mode 100644 include/JSystem/JUtility/JUTException.h create mode 100644 include/JSystem/JUtility/JUTFader.h create mode 100644 include/JSystem/JUtility/JUTFont.h create mode 100644 include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h create mode 100644 include/JSystem/JUtility/JUTGamePad.h create mode 100644 include/JSystem/JUtility/JUTGraphFifo.h create mode 100644 include/JSystem/JUtility/JUTNameTab.h create mode 100644 include/JSystem/JUtility/JUTPalette.h create mode 100644 include/JSystem/JUtility/JUTProcBar.h create mode 100644 include/JSystem/JUtility/JUTReport.h create mode 100644 include/JSystem/JUtility/JUTResFont.h create mode 100644 include/JSystem/JUtility/JUTResource.h create mode 100644 include/JSystem/JUtility/JUTTexture.h create mode 100644 include/JSystem/JUtility/JUTVideo.h create mode 100644 include/JSystem/JUtility/JUTXfb.h create mode 100644 include/JSystem/JUtility/TColor.h create mode 100644 include/SSystem/SComponent/c_data_tbl.h create mode 100644 include/SSystem/SComponent/c_m2d_g_box.h delete mode 100644 include/SSystem/SComponent/c_m3d_g_cps.h delete mode 100644 include/SSystem/SComponent/c_m3d_g_lin.h create mode 100644 include/d/d_resorce.h create mode 100644 include/dolphin/dvd/dvd.h create mode 100644 include/dolphin/dvd/dvdFatal.h create mode 100644 include/dolphin/dvd/dvderror.h create mode 100644 include/dolphin/dvd/dvdfs.h create mode 100644 include/dolphin/dvd/dvdidutils.h create mode 100644 include/dolphin/dvd/dvdlow.h create mode 100644 include/dolphin/dvd/dvdqueue.h create mode 100644 include/dolphin/dvd/fstload.h create mode 100644 include/dolphin/gx/GX.h create mode 100644 include/dolphin/gx/GXAttr.h create mode 100644 include/dolphin/gx/GXBump.h create mode 100644 include/dolphin/gx/GXDisplayList.h create mode 100644 include/dolphin/gx/GXDraw.h create mode 100644 include/dolphin/gx/GXEnum.h create mode 100644 include/dolphin/gx/GXFifo.h create mode 100644 include/dolphin/gx/GXFrameBuf.h create mode 100644 include/dolphin/gx/GXGeometry.h create mode 100644 include/dolphin/gx/GXInit.h create mode 100644 include/dolphin/gx/GXLight.h create mode 100644 include/dolphin/gx/GXMisc.h create mode 100644 include/dolphin/gx/GXPerf.h create mode 100644 include/dolphin/gx/GXPixel.h create mode 100644 include/dolphin/gx/GXStruct.h create mode 100644 include/dolphin/gx/GXTev.h create mode 100644 include/dolphin/gx/GXTexture.h create mode 100644 include/dolphin/gx/GXTransform.h create mode 100644 include/dolphin/os/OS.h create mode 100644 include/dolphin/os/OSAlarm.h create mode 100644 include/dolphin/os/OSAlloc.h create mode 100644 include/dolphin/os/OSArena.h create mode 100644 include/dolphin/os/OSAudioSystem.h create mode 100644 include/dolphin/os/OSCache.h create mode 100644 include/dolphin/os/OSContext.h create mode 100644 include/dolphin/os/OSError.h create mode 100644 include/dolphin/os/OSExec.h create mode 100644 include/dolphin/os/OSFont.h create mode 100644 include/dolphin/os/OSInterrupt.h create mode 100644 include/dolphin/os/OSLink.h create mode 100644 include/dolphin/os/OSMemory.h create mode 100644 include/dolphin/os/OSMessage.h create mode 100644 include/dolphin/os/OSMutex.h create mode 100644 include/dolphin/os/OSReboot.h create mode 100644 include/dolphin/os/OSReset.h create mode 100644 include/dolphin/os/OSResetSW.h create mode 100644 include/dolphin/os/OSRtc.h create mode 100644 include/dolphin/os/OSSync.h create mode 100644 include/dolphin/os/OSThread.h create mode 100644 include/dolphin/os/OSTime.h create mode 100644 include/dolphin/os/__ppc_eabi_init.h create mode 100644 include/dolphin/pad/Pad.h create mode 100644 include/dolphin/pad/Padclamp.h create mode 100644 include/dolphin/vi/vi.h create mode 100644 include/m_Do/m_Do_Reset.h create mode 100644 include/m_Do/m_Do_controller_pad.h create mode 100644 include/m_Do/m_Do_main.h delete mode 100644 src/JPALoader/JPATexture.cpp rename src/{JPALoader => JSystem/JParticle}/JPABaseShape.cpp (99%) rename src/{JPADraw => JSystem/JParticle}/JPADraw.cpp (98%) rename src/{JPADraw => JSystem/JParticle}/JPADrawSetupTev.cpp (85%) rename src/{JPADraw => JSystem/JParticle}/JPADrawVisitor.cpp (99%) rename src/{JPALoader => JSystem/JParticle}/JPADynamicsBlock.cpp (99%) rename src/{JPABase => JSystem/JParticle}/JPAEmitter.cpp (98%) rename src/{JPALoader => JSystem/JParticle}/JPAEmitterLoader.cpp (91%) rename src/{JPABase => JSystem/JParticle}/JPAEmitterManager.cpp (98%) rename src/{JPALoader => JSystem/JParticle}/JPAExTexShape.cpp (97%) rename src/{JPALoader => JSystem/JParticle}/JPAExtraShape.cpp (99%) rename src/{JPABase => JSystem/JParticle}/JPAField.cpp (99%) rename src/{JPALoader => JSystem/JParticle}/JPAFieldBlock.cpp (98%) rename src/{JPALoader => JSystem/JParticle}/JPAKeyBlock.cpp (95%) rename src/{JPABase => JSystem/JParticle}/JPAMath.cpp (97%) rename src/{JPABase => JSystem/JParticle}/JPAParticle.cpp (95%) rename src/{JPALoader => JSystem/JParticle}/JPAResourceManager.cpp (96%) rename src/{JPALoader => JSystem/JParticle}/JPASweepShape.cpp (99%) create mode 100644 src/JSystem/JParticle/JPATexture.cpp diff --git a/config/GZLE01/splits.txt b/config/GZLE01/splits.txt index 3697ae3..343fa78 100644 --- a/config/GZLE01/splits.txt +++ b/config/GZLE01/splits.txt @@ -1948,67 +1948,67 @@ JSystem/J3DU/J3DUDL.cpp: .text start:0x80256F80 end:0x80256F80 .text start:0x80256F80 end:0x80256F88 -JPALoader/JPABaseShape.cpp: +JSystem/JParticle/JSystem/JParticleShape.cpp: .text start:0x80256F88 end:0x80257508 .text start:0x80257508 end:0x80257988 .rodata start:0x80366568 end:0x803665F8 .data start:0x80395C38 end:0x80395F58 .sdata2 start:0x803FBDD0 end:0x803FBDE8 -JPALoader/JPAExtraShape.cpp: +JSystem/JParticle/JPAExtraShape.cpp: .text start:0x80257988 end:0x80257AA8 .text start:0x80257AA8 end:0x80257D4C .data start:0x80395F58 end:0x803960B0 .sdata2 start:0x803FBDE8 end:0x803FBDF0 -JPALoader/JPASweepShape.cpp: +JSystem/JParticle/JPASweepShape.cpp: .text start:0x80257D4C end:0x80257D70 .text start:0x80257D70 end:0x80257FD4 .data start:0x803960B0 end:0x803961D0 -JPALoader/JPAExTexShape.cpp: +JSystem/JParticle/JPAExTexShape.cpp: .text start:0x80257FD4 end:0x80257FF8 .text start:0x80257FF8 end:0x80258118 .data start:0x803961D0 end:0x80396238 -JPALoader/JPADynamicsBlock.cpp: +JSystem/JParticle/JPADynamicsBlock.cpp: .text start:0x80258118 end:0x8025813C .text start:0x8025813C end:0x80258398 .data start:0x80396238 end:0x80396340 -JPALoader/JPAFieldBlock.cpp: +JSystem/JParticle/JPAFieldBlock.cpp: .text start:0x80258398 end:0x802583BC .text start:0x802583BC end:0x8025855C .data start:0x80396340 end:0x803963E0 -JPALoader/JPAKeyBlock.cpp: +JSystem/JParticle/JPAKeyBlock.cpp: .text start:0x8025855C end:0x80258588 .text start:0x80258588 end:0x80258660 .data start:0x803963E0 end:0x80396418 -JPALoader/JPATexture.cpp: +JSystem/JParticle/JPATexture.cpp: .text start:0x80258660 end:0x80258BB4 .text start:0x80258BB4 end:0x80258CAC .rodata start:0x803665F8 end:0x80366618 .data start:0x80396418 end:0x80396448 .sdata2 start:0x803FBDF0 end:0x803FBDF8 -JPALoader/JPAResourceManager.cpp: +JSystem/JParticle/JPAResourceManager.cpp: .text start:0x80258CAC end:0x802590B4 .text start:0x802590B4 end:0x802590B4 .text start:0x802590B4 end:0x802590B4 .rodata start:0x80366618 end:0x803666E0 -JPALoader/JPAEmitterLoader.cpp: +JSystem/JParticle/JPAEmitterLoader.cpp: .text start:0x802590B4 end:0x8025991C .text start:0x8025991C end:0x8025991C .rodata start:0x803666E0 end:0x803668D8 -JPABase/JPAMath.cpp: +JSystem/JParticle/JPAMath.cpp: .text start:0x8025991C end:0x80259EE8 .sdata2 start:0x803FBDF8 end:0x803FBE10 -JPABase/JPAField.cpp: +JSystem/JParticle/JPAField.cpp: .text start:0x80259EE8 end:0x8025BB74 .text start:0x8025BB74 end:0x8025C128 .ctors start:0x80338790 end:0x80338794 @@ -2018,7 +2018,7 @@ JPABase/JPAField.cpp: .sbss start:0x803F73B8 end:0x803F73C0 .sdata2 start:0x803FBE10 end:0x803FBE30 -JPABase/JPAEmitter.cpp: +JSystem/JParticle/JPAEmitter.cpp: .text start:0x8025C128 end:0x8025DEB8 .text start:0x8025DEB8 end:0x8025DEB8 .text start:0x8025DEB8 end:0x8025DEF4 @@ -2027,11 +2027,11 @@ JPABase/JPAEmitter.cpp: .bss start:0x803E8490 end:0x803E85E8 .sdata2 start:0x803FBE30 end:0x803FBE60 -JPABase/JPAParticle.cpp: +JSystem/JParticle/JPAParticle.cpp: .text start:0x8025DEF4 end:0x8025EE44 .sdata2 start:0x803FBE60 end:0x803FBE88 -JPABase/JPAEmitterManager.cpp: +JSystem/JParticle/JPAEmitterManager.cpp: .text start:0x8025EE44 end:0x8025F68C .text start:0x8025F68C end:0x8025F73C .text start:0x8025F73C end:0x8025F848 @@ -2043,7 +2043,7 @@ JPABase/JPAEmitterManager.cpp: .data start:0x80396628 end:0x80396638 .sdata2 start:0x803FBE88 end:0x803FBE90 -JPADraw/JPADrawVisitor.cpp: +JSystem/JParticle/JPADrawVisitor.cpp: .text start:0x8025F960 end:0x802664AC .text start:0x802664AC end:0x802664AC .text start:0x802664AC end:0x80267F40 @@ -2052,7 +2052,7 @@ JPADraw/JPADrawVisitor.cpp: .sbss start:0x803F73C0 end:0x803F73C8 .sdata2 start:0x803FBE90 end:0x803FBEE0 -JPADraw/JPADraw.cpp: +JSystem/JParticle/JPADraw.cpp: .text start:0x80267F40 end:0x8026C6FC .text start:0x8026C6FC end:0x8026C700 .text start:0x8026C700 end:0x8026C700 @@ -2064,7 +2064,7 @@ JPADraw/JPADraw.cpp: .bss start:0x803E85E8 end:0x803E87F0 .sdata2 start:0x803FBEE0 end:0x803FBF20 -JPADraw/JPADrawSetupTev.cpp: +JSystem/JParticle/JPADrawSetupTev.cpp: .text start:0x8026D7B8 end:0x8026DBBC JSystem/JStage/JSGActor.cpp: diff --git a/config/GZLJ01/splits.txt b/config/GZLJ01/splits.txt index 60570db..0d2351b 100644 --- a/config/GZLJ01/splits.txt +++ b/config/GZLJ01/splits.txt @@ -1948,67 +1948,67 @@ JSystem/J3DU/J3DUDL.cpp: .text start:0x80254728 end:0x80254728 .text start:0x80254728 end:0x80254730 -JPALoader/JPABaseShape.cpp: +JSystem/JParticle/JPABaseShape.cpp: .text start:0x80254730 end:0x80254CB0 .text start:0x80254CB0 end:0x80255130 .rodata start:0x80359A08 end:0x80359A98 .data start:0x803892B8 end:0x803895D8 .sdata2 start:0x803EF2A8 end:0x803EF2C0 -JPALoader/JPAExtraShape.cpp: +JSystem/JParticle/JPAExtraShape.cpp: .text start:0x80255130 end:0x80255250 .text start:0x80255250 end:0x802554F4 .data start:0x803895D8 end:0x80389730 .sdata2 start:0x803EF2C0 end:0x803EF2C8 -JPALoader/JPASweepShape.cpp: +JSystem/JParticle/JPASweepShape.cpp: .text start:0x802554F4 end:0x80255518 .text start:0x80255518 end:0x8025577C .data start:0x80389730 end:0x80389850 -JPALoader/JPAExTexShape.cpp: +JSystem/JParticle/JPAExTexShape.cpp: .text start:0x8025577C end:0x802557A0 .text start:0x802557A0 end:0x802558C0 .data start:0x80389850 end:0x803898B8 -JPALoader/JPADynamicsBlock.cpp: +JSystem/JParticle/JPADynamicsBlock.cpp: .text start:0x802558C0 end:0x802558E4 .text start:0x802558E4 end:0x80255B40 .data start:0x803898B8 end:0x803899C0 -JPALoader/JPAFieldBlock.cpp: +JSystem/JParticle/JPAFieldBlock.cpp: .text start:0x80255B40 end:0x80255B64 .text start:0x80255B64 end:0x80255D04 .data start:0x803899C0 end:0x80389A60 -JPALoader/JPAKeyBlock.cpp: +JSystem/JParticle/JPAKeyBlock.cpp: .text start:0x80255D04 end:0x80255D30 .text start:0x80255D30 end:0x80255E08 .data start:0x80389A60 end:0x80389A98 -JPALoader/JPATexture.cpp: +JSystem/JParticle/JPATexture.cpp: .text start:0x80255E08 end:0x8025635C .text start:0x8025635C end:0x80256454 .rodata start:0x80359A98 end:0x80359AB8 .data start:0x80389A98 end:0x80389AC8 .sdata2 start:0x803EF2C8 end:0x803EF2D0 -JPALoader/JPAResourceManager.cpp: +JSystem/JParticle/JPAResourceManager.cpp: .text start:0x80256454 end:0x8025685C .text start:0x8025685C end:0x8025685C .text start:0x8025685C end:0x8025685C .rodata start:0x80359AB8 end:0x80359B80 -JPALoader/JPAEmitterLoader.cpp: +JSystem/JParticle/JPAEmitterLoader.cpp: .text start:0x8025685C end:0x802570C4 .text start:0x802570C4 end:0x802570C4 .rodata start:0x80359B80 end:0x80359D78 -JPABase/JPAMath.cpp: +JSystem/JParticle/JPAMath.cpp: .text start:0x802570C4 end:0x80257690 .sdata2 start:0x803EF2D0 end:0x803EF2E8 -JPABase/JPAField.cpp: +JSystem/JParticle/JPAField.cpp: .text start:0x80257690 end:0x8025931C .text start:0x8025931C end:0x802598D0 .ctors start:0x8033618C end:0x80336190 @@ -2018,7 +2018,7 @@ JPABase/JPAField.cpp: .sbss start:0x803EA858 end:0x803EA860 .sdata2 start:0x803EF2E8 end:0x803EF308 -JPABase/JPAEmitter.cpp: +JSystem/JParticle/JPAEmitter.cpp: .text start:0x802598D0 end:0x8025B660 .text start:0x8025B660 end:0x8025B660 .text start:0x8025B660 end:0x8025B69C @@ -2027,11 +2027,11 @@ JPABase/JPAEmitter.cpp: .bss start:0x803DB970 end:0x803DBAC8 .sdata2 start:0x803EF308 end:0x803EF338 -JPABase/JPAParticle.cpp: +JSystem/JParticle/JPAParticle.cpp: .text start:0x8025B69C end:0x8025C5EC .sdata2 start:0x803EF338 end:0x803EF360 -JPABase/JPAEmitterManager.cpp: +JSystem/JParticle/JPAEmitterManager.cpp: .text start:0x8025C5EC end:0x8025CE34 .text start:0x8025CE34 end:0x8025CEE4 .text start:0x8025CEE4 end:0x8025CFF0 @@ -2043,7 +2043,7 @@ JPABase/JPAEmitterManager.cpp: .data start:0x80389CA8 end:0x80389CB8 .sdata2 start:0x803EF360 end:0x803EF368 -JPADraw/JPADrawVisitor.cpp: +JSystem/JParticle/JPADrawVisitor.cpp: .text start:0x8025D108 end:0x80263C54 .text start:0x80263C54 end:0x80263C54 .text start:0x80263C54 end:0x802656E8 @@ -2052,7 +2052,7 @@ JPADraw/JPADrawVisitor.cpp: .sbss start:0x803EA860 end:0x803EA868 .sdata2 start:0x803EF368 end:0x803EF3B8 -JPADraw/JPADraw.cpp: +JSystem/JParticle/JPADraw.cpp: .text start:0x802656E8 end:0x80269EA4 .text start:0x80269EA4 end:0x80269EA8 .text start:0x80269EA8 end:0x80269EA8 @@ -2064,7 +2064,7 @@ JPADraw/JPADraw.cpp: .bss start:0x803DBAC8 end:0x803DBCD0 .sdata2 start:0x803EF3B8 end:0x803EF3F8 -JPADraw/JPADrawSetupTev.cpp: +JSystem/JParticle/JPADrawSetupTev.cpp: .text start:0x8026AF60 end:0x8026B364 JSystem/JStage/JSGActor.cpp: diff --git a/config/GZLP01/splits.txt b/config/GZLP01/splits.txt index c2715e2..128b602 100644 --- a/config/GZLP01/splits.txt +++ b/config/GZLP01/splits.txt @@ -1948,67 +1948,67 @@ JSystem/J3DU/J3DUDL.cpp: .text start:0x8025C120 end:0x8025C120 .text start:0x8025C120 end:0x8025C128 -JPALoader/JPABaseShape.cpp: +JSystem/JParticle/JPABaseShape.cpp: .text start:0x8025C128 end:0x8025C6A8 .text start:0x8025C6A8 end:0x8025CB28 .rodata start:0x8036D258 end:0x8036D2E8 .data start:0x8039C938 end:0x8039CC58 .sdata2 start:0x80403620 end:0x80403638 -JPALoader/JPAExtraShape.cpp: +JSystem/JParticle/JPAExtraShape.cpp: .text start:0x8025CB28 end:0x8025CC48 .text start:0x8025CC48 end:0x8025CEEC .data start:0x8039CC58 end:0x8039CDB0 .sdata2 start:0x80403638 end:0x80403640 -JPALoader/JPASweepShape.cpp: +JSystem/JParticle/JPASweepShape.cpp: .text start:0x8025CEEC end:0x8025CF10 .text start:0x8025CF10 end:0x8025D174 .data start:0x8039CDB0 end:0x8039CED0 -JPALoader/JPAExTexShape.cpp: +JSystem/JParticle/JPAExTexShape.cpp: .text start:0x8025D174 end:0x8025D198 .text start:0x8025D198 end:0x8025D2B8 .data start:0x8039CED0 end:0x8039CF38 -JPALoader/JPADynamicsBlock.cpp: +JSystem/JParticle/JPADynamicsBlock.cpp: .text start:0x8025D2B8 end:0x8025D2DC .text start:0x8025D2DC end:0x8025D538 .data start:0x8039CF38 end:0x8039D040 -JPALoader/JPAFieldBlock.cpp: +JSystem/JParticle/JPAFieldBlock.cpp: .text start:0x8025D538 end:0x8025D55C .text start:0x8025D55C end:0x8025D6FC .data start:0x8039D040 end:0x8039D0E0 -JPALoader/JPAKeyBlock.cpp: +JSystem/JParticle/JPAKeyBlock.cpp: .text start:0x8025D6FC end:0x8025D728 .text start:0x8025D728 end:0x8025D800 .data start:0x8039D0E0 end:0x8039D118 -JPALoader/JPATexture.cpp: +JSystem/JParticle/JPATexture.cpp: .text start:0x8025D800 end:0x8025DD54 .text start:0x8025DD54 end:0x8025DE4C .rodata start:0x8036D2E8 end:0x8036D308 .data start:0x8039D118 end:0x8039D148 .sdata2 start:0x80403640 end:0x80403648 -JPALoader/JPAResourceManager.cpp: +JSystem/JParticle/JPAResourceManager.cpp: .text start:0x8025DE4C end:0x8025E254 .text start:0x8025E254 end:0x8025E254 .text start:0x8025E254 end:0x8025E254 .rodata start:0x8036D308 end:0x8036D3D0 -JPALoader/JPAEmitterLoader.cpp: +JSystem/JParticle/JPAEmitterLoader.cpp: .text start:0x8025E254 end:0x8025EABC .text start:0x8025EABC end:0x8025EABC .rodata start:0x8036D3D0 end:0x8036D5C8 -JPABase/JPAMath.cpp: +JSystem/JParticle/JPAMath.cpp: .text start:0x8025EABC end:0x8025F088 .sdata2 start:0x80403648 end:0x80403660 -JPABase/JPAField.cpp: +JSystem/JParticle/JPAField.cpp: .text start:0x8025F088 end:0x80260D14 .text start:0x80260D14 end:0x802612C8 .ctors start:0x8033DCCC end:0x8033DCD0 @@ -2018,7 +2018,7 @@ JPABase/JPAField.cpp: .sbss start:0x803FEBD8 end:0x803FEBE0 .sdata2 start:0x80403660 end:0x80403680 -JPABase/JPAEmitter.cpp: +JSystem/JParticle/JPAEmitter.cpp: .text start:0x802612C8 end:0x80263058 .text start:0x80263058 end:0x80263058 .text start:0x80263058 end:0x80263094 @@ -2027,11 +2027,11 @@ JPABase/JPAEmitter.cpp: .bss start:0x803EFC90 end:0x803EFDE8 .sdata2 start:0x80403680 end:0x804036B0 -JPABase/JPAParticle.cpp: +JSystem/JParticle/JPAParticle.cpp: .text start:0x80263094 end:0x80263FE4 .sdata2 start:0x804036B0 end:0x804036D8 -JPABase/JPAEmitterManager.cpp: +JSystem/JParticle/JPAEmitterManager.cpp: .text start:0x80263FE4 end:0x8026482C .text start:0x8026482C end:0x802648DC .text start:0x802648DC end:0x802649E8 @@ -2043,7 +2043,7 @@ JPABase/JPAEmitterManager.cpp: .data start:0x8039D328 end:0x8039D338 .sdata2 start:0x804036D8 end:0x804036E0 -JPADraw/JPADrawVisitor.cpp: +JSystem/JParticle/JPADrawVisitor.cpp: .text start:0x80264B00 end:0x8026B64C .text start:0x8026B64C end:0x8026B64C .text start:0x8026B64C end:0x8026D0E0 @@ -2052,7 +2052,7 @@ JPADraw/JPADrawVisitor.cpp: .sbss start:0x803FEBE0 end:0x803FEBE8 .sdata2 start:0x804036E0 end:0x80403730 -JPADraw/JPADraw.cpp: +JSystem/JParticle/JPADraw.cpp: .text start:0x8026D0E0 end:0x8027189C .text start:0x8027189C end:0x802718A0 .text start:0x802718A0 end:0x802718A0 @@ -2064,7 +2064,7 @@ JPADraw/JPADraw.cpp: .bss start:0x803EFDE8 end:0x803EFFF0 .sdata2 start:0x80403730 end:0x80403770 -JPADraw/JPADrawSetupTev.cpp: +JSystem/JParticle/JPADrawSetupTev.cpp: .text start:0x80272958 end:0x80272D5C JSystem/JStage/JSGActor.cpp: diff --git a/configure.py b/configure.py index 1e63960..b5e0bac 100644 --- a/configure.py +++ b/configure.py @@ -162,10 +162,20 @@ LIBS = [ "cflags": CFLAGS_FRAMEWORK, "host": True, "objects": [ + # JSystem + NonMatching("JSystem/JKernel/JKRFile.cpp"), + NonMatching("JSystem/JSupport/JSUList.cpp"), + NonMatching("JSystem/JSupport/JSUInputStream.cpp"), + Matching ("JSystem/JSupport/JSUMemoryStream.cpp"), + NonMatching("JSystem/JSupport/JSUFileStream.cpp"), + NonMatching("JSystem/JUtility/JUTNameTab.cpp"), + NonMatching("JSystem/JUtility/JUTPalette.cpp"), + NonMatching("JSystem/JParticle/JPATexture.cpp"), + # SSystem NonMatching("SSystem/SStandard/s_basic.cpp"), - NonMatching("SSystem/SComponent/c_malloc.cpp"), - NonMatching("SSystem/SComponent/c_API.cpp"), + Matching ("SSystem/SComponent/c_malloc.cpp"), + Matching ("SSystem/SComponent/c_API.cpp"), Matching ("SSystem/SComponent/c_API_graphic.cpp"), Matching ("SSystem/SComponent/c_counter.cpp"), NonMatching("SSystem/SComponent/c_list.cpp"), @@ -180,8 +190,21 @@ LIBS = [ Matching ("SSystem/SComponent/c_tag_iter.cpp"), NonMatching("SSystem/SComponent/c_xyz.cpp"), NonMatching("SSystem/SComponent/c_sxyz.cpp"), + NonMatching("SSystem/SComponent/c_bg_s.cpp"), + Matching ("SSystem/SComponent/c_bg_s_chk.cpp"), + NonMatching("SSystem/SComponent/c_bg_s_gnd_chk.cpp"), + NonMatching("SSystem/SComponent/c_bg_s_lin_chk.cpp"), + NonMatching("SSystem/SComponent/c_bg_w.cpp"), + NonMatching("SSystem/SComponent/c_m2d.cpp"), + NonMatching("SSystem/SComponent/c_m2d_g_box.cpp"), + Matching ("SSystem/SComponent/c_m3d_g_aab.cpp"), + NonMatching("SSystem/SComponent/c_m3d_g_cyl.cpp"), + NonMatching("SSystem/SComponent/c_m3d_g_pla.cpp"), + NonMatching("SSystem/SComponent/c_m3d_g_sph.cpp"), + NonMatching("SSystem/SComponent/c_m3d_g_tri.cpp"), NonMatching("SSystem/SComponent/c_lib.cpp"), NonMatching("SSystem/SComponent/c_angle.cpp"), + NonMatching("SSystem/SComponent/c_data_tbl.cpp"), # framework NonMatching("f_ap/f_ap_game.cpp"), @@ -237,6 +260,9 @@ LIBS = [ NonMatching("f_pc/f_pc_fstcreate_req.cpp"), NonMatching("f_pc/f_pc_stdcreate_req.cpp"), + # machine + NonMatching("m_Do/m_Do_controller_pad.cpp"), + # dolzel ], }, diff --git a/include/JSystem/JKernel/JKRAram.h b/include/JSystem/JKernel/JKRAram.h new file mode 100644 index 0000000..039641f --- /dev/null +++ b/include/JSystem/JKernel/JKRAram.h @@ -0,0 +1,89 @@ +#ifndef JKRARAM_H +#define JKRARAM_H + +#include "JSystem/JKernel/JKRAramHeap.h" +#include "JSystem/JKernel/JKRDvdRipper.h" +#include "JSystem/JKernel/JKRThread.h" + +class JKRHeap; +class JKRAMCommand; +class JKRAramBlock; +class JKRAram : public JKRThread { +private: + JKRAram(u32, u32, long); + virtual ~JKRAram(); + + /* vt[03] */ void* run(void); /* override */ + +public: + u32 getAudioMemory() const { return mAudioMemoryPtr; } + u32 getAudioMemSize() const { return mAudioMemorySize; } + u32 getGraphMemory() const { return mGraphMemoryPtr; } + u32 getGraphMemSize() const { return mGraphMemorySize; } +//private: + /* 0x00 */ // vtable + /* 0x04 */ // JKRThread + /* 0x7C */ u32 mAudioMemoryPtr; + /* 0x80 */ u32 mAudioMemorySize; + /* 0x84 */ u32 mGraphMemoryPtr; + /* 0x88 */ u32 mGraphMemorySize; + /* 0x8C */ u32 mAramMemoryPtr; + /* 0x90 */ u32 mAramMemorySize; + /* 0x94 */ JKRAramHeap* mAramHeap; + /* 0x98 */ u32 mStackArray[3]; + +public: + static JKRAram* create(u32, u32, long, long, long); + static void checkOkAddress(u8*, u32, JKRAramBlock*, u32); + static void changeGroupIdIfNeed(u8*, int); + static JKRAramBlock* mainRamToAram(u8*, u32, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*); + static u8* aramToMainRam(u32, u8*, u32, JKRExpandSwitch, u32, JKRHeap*, int, u32*); + static void dump(void); + + static JKRAram* getManager() { return sAramObject; } + static JKRAramHeap* getAramHeap() { return getManager()->mAramHeap; } + static JSUList& getCommandList() { return sAramCommandList; } + + static u8 decideAramGroupId(int groupId) { + JKRAramHeap* heap; + u8 finalGroupId; + + if (groupId < 0) { + return getAramHeap()->getCurrentGroupID(); + } + + return (u8)groupId; + } + + static u32 getSZSBufferSize() { return sSZSBufferSize; } + static void setSZSBufferSize(u32 size) { sSZSBufferSize = size; } + + static OSMessageQueue sMessageQueue; + +private: + static JKRAram* sAramObject; + static u32 sSZSBufferSize; + static OSMessage sMessageBuffer[4]; + static JSUList sAramCommandList; +}; + +inline void* JKRAllocFromAram(u32 size, JKRAramHeap::EAllocMode allocMode) { + return JKRAram::getAramHeap()->alloc(size, allocMode); +} + +inline void JKRFreeToAram(JKRAramBlock* block) { + JKRAram::getAramHeap()->free(block); +} + +inline void JKRAramToMainRam(u32 p1, u8* p2, u32 p3, JKRExpandSwitch p4, u32 p5, JKRHeap* p6, + int p7, u32* p8) { + JKRAram::aramToMainRam(p1, p2, p3, p4, p5, p6, p7, p8); +} + +inline JKRAramBlock *JKRMainRamToAram(u8 *buf, u32 bufSize, u32 alignedSize, JKRExpandSwitch expandSwitch, u32 fileSize, JKRHeap *heap, int id, u32 *pSize) { + return JKRAram::mainRamToAram(buf, bufSize, alignedSize, expandSwitch, fileSize, heap, id, pSize); +} + +// void JKRDecompressFromAramToMainRam(u32, void*, u32, u32, u32, u32*); + +#endif /* JKRARAM_H */ diff --git a/include/JSystem/JKernel/JKRAramArchive.h b/include/JSystem/JKernel/JKRAramArchive.h new file mode 100644 index 0000000..4c638db --- /dev/null +++ b/include/JSystem/JKernel/JKRAramArchive.h @@ -0,0 +1,36 @@ +#ifndef JKRARAMARCHIVE_H +#define JKRARAMARCHIVE_H + +#include "JSystem/JKernel/JKRArchive.h" +#include "dolphin/types.h" + +class JKRAramBlock; +class JKRDvdFile; + +class JKRAramArchive : public JKRArchive { +public: + JKRAramArchive(long, JKRArchive::EMountDirection); + virtual ~JKRAramArchive(); + + bool open(long); + u32 getAramAddress_Entry(SDIFileEntry*); + u32 getAramAddress(char const*); + + /* vt[15] */ u32 getExpandedResSize(const void*) const; /* override */ + /* vt[16] */ void* fetchResource(SDIFileEntry*, u32*); /* override */ + /* vt[17] */ void* fetchResource(void*, u32, SDIFileEntry*, u32*); /* override */ + +public: + static u32 fetchResource_subroutine(u32, u32, u8*, u32, int); + static u32 fetchResource_subroutine(u32, u32, JKRHeap*, int, u8**); + +private: + /* 0x00 */ // vtable + /* 0x04 */ // JKRArchive + /* 0x5C */ JKRCompression mCompression; + /* 0x60 */ EMountDirection mMountDirection; + /* 0x64 */ JKRAramBlock* mBlock; + /* 0x68 */ JKRDvdFile* mDvdFile; +}; // Size = 0x6C + +#endif /* JKRARAMARCHIVE_H */ diff --git a/include/JSystem/JKernel/JKRAramBlock.h b/include/JSystem/JKernel/JKRAramBlock.h new file mode 100644 index 0000000..1505814 --- /dev/null +++ b/include/JSystem/JKernel/JKRAramBlock.h @@ -0,0 +1,36 @@ +#ifndef JKRARAMBLOCK_H +#define JKRARAMBLOCK_H + +#include "JSystem/JSupport/JSUList.h" + +class JKRAramHeap; +class JKRAramBlock { +public: + JKRAramBlock(u32, u32, u32, u8, bool); + virtual ~JKRAramBlock(); + + JKRAramBlock* allocHead(u32, u8, JKRAramHeap*); + JKRAramBlock* allocTail(u32, u8, JKRAramHeap*); + + u32 getAddress() const { return mAddress; } + + u32 getSize() const { return mSize; } + + u32 getFreeSize() const { return mFreeSize; } + + bool isTempMemory() const { return mIsTempMemory; } + + void newGroupID(u8 groupId) { mGroupId = groupId; } + +public: + /* 0x00 */ // vtable + /* 0x04 */ JSULink mBlockLink; + /* 0x14 */ u32 mAddress; + /* 0x18 */ u32 mSize; + /* 0x1C */ u32 mFreeSize; + /* 0x20 */ u8 mGroupId; + /* 0x21 */ u8 mIsTempMemory; + /* 0x22 */ u8 padding[2]; +}; + +#endif /* JKRARAMBLOCK_H */ diff --git a/include/JSystem/JKernel/JKRAramHeap.h b/include/JSystem/JKernel/JKRAramHeap.h new file mode 100644 index 0000000..6c27494 --- /dev/null +++ b/include/JSystem/JKernel/JKRAramHeap.h @@ -0,0 +1,54 @@ +#ifndef JKRARAMHEAP_H +#define JKRARAMHEAP_H + +#include "JSystem/JKernel/JKRAramBlock.h" +#include "JSystem/JKernel/JKRDisposer.h" +#include "dolphin/os/OSMutex.h" + +class JKRAramHeap : public JKRDisposer { +public: + enum EAllocMode { + HEAD = 0, + TAIL = 1, + }; + +public: + // TODO: fix type + static JSUList sAramList; + + JKRAramHeap(u32, u32); + virtual ~JKRAramHeap(); + + JKRAramBlock* alloc(u32, EAllocMode); + JKRAramBlock* allocFromHead(u32); + JKRAramBlock* allocFromTail(u32); + u32 getFreeSize(void); + u32 getTotalFreeSize(void); + // u32 getUsedSize(void); + void dump(void); + void free(JKRAramBlock *block) { + delete block; + } + + u8 getCurrentGroupID() const { return mGroupId; } + + JKRHeap* getMgrHeap() const { return mHeap; } + +private: + void lock() { OSLockMutex(&mMutex); } + + void unlock() { OSUnlockMutex(&mMutex); } + +public: + /* 0x00 */ // vtable + /* 0x04 */ // JKRDisposer + /* 0x18 */ OSMutex mMutex; + /* 0x30 */ JKRHeap* mHeap; + /* 0x34 */ u32 mHeadAddress; + /* 0x38 */ u32 mTailAddress; + /* 0x3C */ u32 mSize; + /* 0x40 */ u8 mGroupId; + /* 0x41 */ u8 padding_0x41[3]; +}; + +#endif /* JKRARAMHEAP_H */ diff --git a/include/JSystem/JKernel/JKRAramPiece.h b/include/JSystem/JKernel/JKRAramPiece.h new file mode 100644 index 0000000..e1d959b --- /dev/null +++ b/include/JSystem/JKernel/JKRAramPiece.h @@ -0,0 +1,73 @@ +#ifndef JKRARAMPIECE_H +#define JKRARAMPIECE_H + +#include "JSystem/JSupport/JSUList.h" +#include "dolphin/ar/arq.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSMutex.h" + +class JKRAramBlock; +class JKRDecompCommand; +class JKRAMCommand { +public: + typedef void (*AsyncCallback)(u32); + + JKRAMCommand(); + ~JKRAMCommand(); + +public: + /* 0x00 */ ARQRequest mRequest; + /* 0x20 */ JSULink mPieceLink; + /* 0x30 */ JSULink field_0x30; + + /* 0x40 */ s32 mTransferDirection; + /* 0x44 */ u32 mDataLength; + /* 0x48 */ u32 mSrc; + /* 0x4C */ u32 mDst; + /* 0x50 */ JKRAramBlock* mAramBlock; + /* 0x54 */ u32 field_0x54; + /* 0x58 */ AsyncCallback mCallback; + /* 0x5C */ OSMessageQueue* field_0x5C; + /* 0x60 */ s32 field_0x60; + /* 0x64 */ JKRDecompCommand* mDecompCommand; + /* 0x68 */ OSMessageQueue mMessageQueue; + /* 0x88 */ OSMessage mMessage; + /* 0x8C */ void* field_0x8C; + /* 0x90 */ void* field_0x90; + /* 0x94 */ void* field_0x94; +}; + +class JKRAramPiece { +public: + static OSMutex mMutex; + // TODO: fix type + static JSUList sAramPieceCommandList; + +public: + struct Message { + s32 field_0x00; + JKRAMCommand* command; + }; + +public: + static JKRAMCommand* prepareCommand(int, u32, u32, u32, JKRAramBlock*, + JKRAMCommand::AsyncCallback); + static void sendCommand(JKRAMCommand*); + + static JKRAMCommand* orderAsync(int, u32, u32, u32, JKRAramBlock*, JKRAMCommand::AsyncCallback); + static BOOL sync(JKRAMCommand*, int); + static BOOL orderSync(int, u32, u32, u32, JKRAramBlock*); + static void startDMA(JKRAMCommand*); + static void doneDMA(u32); + +private: + static void lock() { OSLockMutex(&mMutex); } + static void unlock() { OSUnlockMutex(&mMutex); } +}; + +inline BOOL JKRAramPcs(int direction, u32 source, u32 destination, u32 length, + JKRAramBlock* block) { + return JKRAramPiece::orderSync(direction, source, destination, length, block); +} + +#endif /* JKRARAMPIECE_H */ diff --git a/include/JSystem/JKernel/JKRAramStream.h b/include/JSystem/JKernel/JKRAramStream.h new file mode 100644 index 0000000..cc42bd6 --- /dev/null +++ b/include/JSystem/JKernel/JKRAramStream.h @@ -0,0 +1,68 @@ +#ifndef JKRARAMSTREAM_H +#define JKRARAMSTREAM_H + +#include "JSystem/JKernel/JKRThread.h" + +class JSUFileInputStream; + +class JKRAramStreamCommand { +public: + enum Type { + UNKNOWN = 0, + READ = 1, + WRITE = 2, + }; + + JKRAramStreamCommand(); + +public: + /* 0x00 */ Type mType; + /* 0x04 */ u32 mAddress; + /* 0x08 */ u32 mSize; + /* 0x0C */ u32 field_0x0c; + /* 0x10 */ JSUFileInputStream* mStream; + /* 0x14 */ u32 mOffset; + /* 0x18 */ u32* mReturnSize; + /* 0x1C */ u8* mTransferBuffer; + /* 0x20 */ u32 mTransferBufferSize; + /* 0x24 */ JKRHeap* mHeap; + /* 0x28 */ bool mAllocatedTransferBuffer; + /* 0x29 */ u8 padding_0x29[3]; + /* 0x2C */ u32 field_0x2c; + /* 0x30 */ OSMessageQueue mMessageQueue; + /* 0x50 */ OSMessage mMessage; + /* 0x54 */ u32 field_0x54; + /* 0x58 */ u32 field_0x58; +}; + +class JKRAramStream : public JKRThread { +private: + JKRAramStream(long); + virtual ~JKRAramStream(); + + /* vt[03] */ void* run(void); /* override */ + +public: + static JKRAramStream* create(long); + + static s32 readFromAram(void); + static s32 writeToAram(JKRAramStreamCommand*); + static JKRAramStreamCommand* write_StreamToAram_Async(JSUFileInputStream*, u32, u32, u32, u32*); + static JKRAramStreamCommand* sync(JKRAramStreamCommand*, BOOL); + static void setTransBuffer(u8*, u32, JKRHeap*); + +private: + static JKRAramStream* sAramStreamObject; + static OSMessage sMessageBuffer[4]; + static OSMessageQueue sMessageQueue; + + static u8* transBuffer; + static u32 transSize; + static JKRHeap* transHeap; +}; + +inline JKRAramStream* JKRCreateAramStreamManager(long priority) { + return JKRAramStream::create(priority); +} + +#endif /* JKRARAMSTREAM_H */ diff --git a/include/JSystem/JKernel/JKRArchive.h b/include/JSystem/JKernel/JKRArchive.h new file mode 100644 index 0000000..b1b6b13 --- /dev/null +++ b/include/JSystem/JKernel/JKRArchive.h @@ -0,0 +1,227 @@ +#ifndef JKRARCHIVE_H +#define JKRARCHIVE_H + +#include "JSystem/JKernel/JKRCompression.h" +#include "JSystem/JKernel/JKRFileLoader.h" +#include "global.h" + +class JKRHeap; + +struct SArcHeader { + /* 0x00 */ u32 signature; + /* 0x04 */ u32 file_length; + /* 0x08 */ u32 header_length; + /* 0x0C */ u32 file_data_offset; + /* 0x10 */ u32 file_data_length; + /* 0x14 */ u32 field_0x14; + /* 0x18 */ u32 field_0x18; + /* 0x1C */ u32 field_0x1c; +}; + +struct SArcDataInfo { + /* 0x00 */ u32 num_nodes; + /* 0x04 */ u32 node_offset; + /* 0x08 */ u32 num_file_entries; + /* 0x0C */ u32 file_entry_offset; + /* 0x10 */ u32 string_table_length; + /* 0x14 */ u32 string_table_offset; + /* 0x18 */ u16 next_free_file_id; + /* 0x1A */ bool sync_file_ids_and_indices; + /* 0x1B */ u8 field_1b[5]; +}; + +inline u32 read_big_endian_u32(void* ptr) { + u8* uptr = (u8*)ptr; + return ((u32)uptr[0] << 0x18) | ((u32)uptr[1] << 0x10) | ((u32)uptr[2] << 8) | (u32)uptr[3]; +} + +inline u16 read_big_endian_u16(void* ptr) { + u8* uptr = (u8*)ptr; + return ((u16)uptr[0] << 8) | ((u16)uptr[1]); +} + +inline u32 JKRDecompExpandSize(u8 * pBuf) { + return (pBuf[4] << 0x18) | (pBuf[5] << 0x10) | (pBuf[6] << 8) | pBuf[7]; +} + +extern u32 sCurrentDirID__10JKRArchive; // JKRArchive::sCurrentDirID + +class JKRArchive : public JKRFileLoader { +public: + struct SDirEntry { + u8 flags; + u8 padding; + u16 id; + const char* name; + }; + + struct SDIDirEntry { + u32 type; + u32 name_offset; + u16 field_0x8; + u16 num_entries; + u32 first_file_index; + }; + + struct SDIFileEntry { + u16 file_id; + u16 name_hash; + u32 type_flags_and_name_offset; + u32 data_offset; + u32 data_size; + void* data; + + u32 getNameOffset() const { return type_flags_and_name_offset & 0xFFFFFF; } + u16 getNameHash() const { return name_hash; } + u32 getFlags() const { return type_flags_and_name_offset >> 24; } + u32 getAttr() const { return getFlags(); } + u16 getFileID() const { return file_id; } + bool isDirectory() const { return (getFlags() & 0x02) != 0; } + bool isUnknownFlag1() const { return (getFlags() & 0x01) != 0; } + bool isCompressed() const { return (getFlags() & 0x04) != 0; } + // was needed for open__14JKRAramArchiveFl + u8 getCompressFlag() const { return (getFlags() & 0x04); } + bool isYAZ0Compressed() const { return (getFlags() & 0x80) != 0; } + u32 getSize() const { return data_size; } + }; + + enum EMountMode { + UNKNOWN_MOUNT_MODE = 0, + MOUNT_MEM = 1, + MOUNT_ARAM = 2, + MOUNT_DVD = 3, + MOUNT_COMP = 4, + }; + + enum EMountDirection { + UNKNOWN_MOUNT_DIRECTION = 0, + MOUNT_DIRECTION_HEAD = 1, + MOUNT_DIRECTION_TAIL = 2, + }; + + class CArcName { + public: + CArcName() {} + CArcName(char const* data) { this->store(data); } + CArcName(char const** data, char endChar) { *data = this->store(*data, endChar); } + + void store(char const* data); + const char* store(char const* data, char endChar); + + u16 getHash() const { return mHash; } + + const char* getString() const { return mData; } + + private: + u16 mHash; + u16 mLength; + char mData[256]; + }; + +protected: + JKRArchive(); + JKRArchive(long, EMountMode); + virtual ~JKRArchive(); + +public: + bool getDirEntry(SDirEntry*, u32) const; + void* getIdxResource(u32); + void* getResource(u16); + u32 readIdxResource(void*, u32, u32); + u32 readResource(void*, u32, u16); + u32 countResource(void) const; + u32 getFileAttribute(u32) const; + + SDIFileEntry* findNameResource(const char*) const; + bool isSameName(CArcName&, u32, u16) const; + SDIDirEntry* findResType(u32) const; + SDIDirEntry* findDirectory(const char*, u32) const; + SDIFileEntry* findTypeResource(u32, const char*) const; + SDIFileEntry* findFsResource(const char*, u32) const; + SDIFileEntry* findIdxResource(u32) const; + SDIFileEntry* findPtrResource(const void*) const; + SDIFileEntry* findIdResource(u16) const; + +public: + /* vt[04] */ virtual bool becomeCurrent(const char*); /* override */ + /* vt[05] */ virtual void* getResource(const char*); /* override */ + /* vt[06] */ virtual void* getResource(u32, const char*); /* override */ + /* vt[07] */ virtual u32 readResource(void*, u32, const char*); /* override */ + /* vt[08] */ virtual u32 readResource(void*, u32, u32, const char*); /* override */ + /* vt[09] */ virtual void removeResourceAll(void); /* override */ + /* vt[10] */ virtual bool removeResource(void*); /* override */ + /* vt[11] */ virtual bool detachResource(void*); /* override */ + /* vt[12] */ virtual u32 getResSize(const void*) const; /* override */ + /* vt[13] */ virtual u32 countFile(const char*) const; /* override */ + /* vt[14] */ virtual JKRFileFinder* getFirstFile(const char*) const; /* override */ + /* vt[15] */ virtual u32 getExpandedResSize(const void*) const; + /* vt[16] */ virtual void* fetchResource(SDIFileEntry*, u32*) = 0; + /* vt[17] */ virtual void* fetchResource(void*, u32, SDIFileEntry*, u32*) = 0; + /* vt[18] */ virtual void setExpandSize(SDIFileEntry*, u32); + /* vt[19] */ virtual u32 getExpandSize(SDIFileEntry*) const; + + u32 countFile() const { return mArcInfoBlock->num_file_entries; } + s32 countDirectory() const { return mArcInfoBlock->num_nodes; } + u8 getMountMode() const { return mMountMode; } + bool isFileEntry(u32 param_0) { + return getFileAttribute(param_0) & 1; + } + +public: + /* 0x00 */ // vtable + /* 0x04 */ // JKRFileLoader + /* 0x38 */ JKRHeap* mHeap; + /* 0x3C */ u8 mMountMode; + /* 0x3D */ u8 field_0x3d[3]; + /* 0x40 */ s32 mEntryNum; + /* 0x44 */ SArcDataInfo* mArcInfoBlock; + /* 0x48 */ SDIDirEntry* mNodes; + /* 0x4C */ SDIFileEntry* mFiles; + /* 0x50 */ s32* mExpandedSize; + /* 0x54 */ char* mStringTable; + +protected: + /* 0x58 */ u32 field_0x58; + +public: + static JKRArchive* check_mount_already(s32, JKRHeap*); + static JKRArchive* mount(const char*, EMountMode, JKRHeap*, EMountDirection); + static JKRArchive* mount(void*, JKRHeap*, EMountDirection); + static JKRArchive* mount(s32, EMountMode, JKRHeap*, EMountDirection); + static void* getGlbResource(u32, const char*, JKRArchive*); + + static JKRCompression convertAttrToCompressionType(u32 attr) { +#define JKRARCHIVE_ATTR_COMPRESSION 0x04 +#define JKRARCHIVE_ATTR_YAY0 0x80 + + JKRCompression compression; + if (FLAG_ON(attr, JKRARCHIVE_ATTR_COMPRESSION)) { + compression = COMPRESSION_NONE; + } else if (!FLAG_ON(attr, JKRARCHIVE_ATTR_YAY0)) { + compression = COMPRESSION_YAZ0; + } else { + compression = COMPRESSION_YAY0; + } + return compression; + } + + static u32 getCurrentDirID() { return sCurrentDirID; } + static void setCurrentDirID(u32 dirID) { sCurrentDirID = dirID; } + +private: + static u32 sCurrentDirID; +}; + +inline JKRCompression JKRConvertAttrToCompressionType(u32 attr) { + return JKRArchive::convertAttrToCompressionType(attr); +} + +inline void* JKRGetResource(u32 node, const char* path, JKRArchive* archive) { + return JKRArchive::getGlbResource(node, path, archive); +} + +inline void* JKRGetTypeResource(u32 tag, const char* name, JKRArchive* arc) { + return JKRArchive::getGlbResource(tag, name, arc); +} + +#endif \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRArchivePri.h b/include/JSystem/JKernel/JKRArchivePri.h new file mode 100644 index 0000000..a2cb652 --- /dev/null +++ b/include/JSystem/JKernel/JKRArchivePri.h @@ -0,0 +1,5 @@ +#ifndef JKRARCHIVEPRI_H +#define JKRARCHIVEPRI_H + + +#endif /* JKRARCHIVEPRI_H */ diff --git a/include/JSystem/JKernel/JKRArchivePub.h b/include/JSystem/JKernel/JKRArchivePub.h new file mode 100644 index 0000000..bd2bdfa --- /dev/null +++ b/include/JSystem/JKernel/JKRArchivePub.h @@ -0,0 +1,5 @@ +#ifndef JKRARCHIVEPUB_H +#define JKRARCHIVEPUB_H + + +#endif /* JKRARCHIVEPUB_H */ diff --git a/include/JSystem/JKernel/JKRAssertHeap.h b/include/JSystem/JKernel/JKRAssertHeap.h new file mode 100644 index 0000000..48a79d9 --- /dev/null +++ b/include/JSystem/JKernel/JKRAssertHeap.h @@ -0,0 +1,34 @@ +#ifndef JKRASSERTHEAP_H +#define JKRASSERTHEAP_H + +#include "JSystem/JKernel/JKRHeap.h" + +class JKRAssertHeap : public JKRHeap { +protected: + JKRAssertHeap(void*, unsigned long, JKRHeap*, bool); + virtual ~JKRAssertHeap(); + +public: + /* vt[04] */ virtual u32 getHeapType(void); /* override */ + /* vt[05] */ virtual bool check(void); /* override */ + /* vt[06] */ virtual bool dump_sort(void); /* override */ + /* vt[07] */ virtual bool dump(void); /* override */ + /* vt[08] */ virtual void do_destroy(void); /* override */ + /* vt[09] */ virtual void* do_alloc(u32, int); /* override */ + /* vt[10] */ virtual void do_free(void*); /* override */ + /* vt[11] */ virtual void do_freeAll(void); /* override */ + /* vt[12] */ virtual void do_freeTail(void); /* override */ + /* vt[13] */ virtual void do_fillFreeArea(void); /* override */ + /* vt[14] */ virtual s32 do_resize(void*, u32); /* override */ + /* vt[15] */ virtual s32 do_getSize(void*); /* override */ + /* vt[16] */ virtual s32 do_getFreeSize(void); /* override */ + /* vt[17] */ virtual void* do_getMaxFreeBlock(void); /* override */ + /* vt[18] */ virtual s32 do_getTotalFreeSize(void); /* override */ + /* vt[19] */ virtual s32 do_changeGroupID(u8 param_1); /* override */ + /* vt[20] */ virtual u8 do_getCurrentGroupId(void); /* override */ + +public: + static JKRAssertHeap* create(JKRHeap*); +}; + +#endif /* JKRASSERTHEAP_H */ diff --git a/include/JSystem/JKernel/JKRCompArchive.h b/include/JSystem/JKernel/JKRCompArchive.h new file mode 100644 index 0000000..98da632 --- /dev/null +++ b/include/JSystem/JKernel/JKRCompArchive.h @@ -0,0 +1,38 @@ +#ifndef JKRCOMPARCHIVE_H +#define JKRCOMPARCHIVE_H + +#include "JSystem/JKernel/JKRArchive.h" + +class JKRAramBlock; +class JKRDvdFile; + +class JKRCompArchive : public JKRArchive { +public: + JKRCompArchive(long, JKRArchive::EMountDirection); + virtual ~JKRCompArchive(); + + bool open(long); + + /* vt[09] */ void removeResourceAll(void); /* override */ + /* vt[10] */ bool removeResource(void*); /* override */ + + /* vt[15] */ u32 getExpandedResSize(const void*) const; /* override */ + /* vt[16] */ void* fetchResource(SDIFileEntry*, u32*); /* override */ + /* vt[17] */ void* fetchResource(void*, u32, SDIFileEntry*, u32*); /* override */ + +public: +private: + /* 0x00 */ // vtable + /* 0x04 */ // JKRArchive + /* 0x5C */ int mCompression; + /* 0x60 */ EMountDirection mMountDirection; + /* 0x64 */ int field_0x64; + /* 0x68 */ JKRAramBlock* mAramPart; + /* 0x6C */ int field_0x6c; + /* 0x70 */ JKRDvdFile* mDvdFile; + /* 0x74 */ u32 mSizeOfMemPart; + /* 0x78 */ u32 mSizeOfAramPart; + /* 0x7C */ int field_0x7c; +}; + +#endif /* JKRCOMPARCHIVE_H */ diff --git a/include/JSystem/JKernel/JKRCompression.h b/include/JSystem/JKernel/JKRCompression.h new file mode 100644 index 0000000..51a2fa3 --- /dev/null +++ b/include/JSystem/JKernel/JKRCompression.h @@ -0,0 +1,10 @@ +#ifndef JKRCOMPREESION_H_ +#define JKRCOMPREESION_H_ + +typedef int JKRCompression; +const JKRCompression COMPRESSION_NONE = 0; +const JKRCompression COMPRESSION_YAY0 = 1; +const JKRCompression COMPRESSION_YAZ0 = 2; +const JKRCompression COMPRESSION_ASR = 3; + +#endif \ No newline at end of file diff --git a/include/JSystem/JKernel/JKRDecomp.h b/include/JSystem/JKernel/JKRDecomp.h new file mode 100644 index 0000000..539695d --- /dev/null +++ b/include/JSystem/JKernel/JKRDecomp.h @@ -0,0 +1,72 @@ +#ifndef JKRDECOMP_H +#define JKRDECOMP_H + +#include "JSystem/JKernel/JKRCompression.h" +#include "JSystem/JKernel/JKRThread.h" + +class JKRAMCommand; +class JKRDecompCommand { +public: + typedef void (*AsyncCallback)(u32); + + JKRDecompCommand(); + ~JKRDecompCommand(); + +public: + /* 0x00 */ u32 field_0x0; + /* 0x04 */ u8* mSrcBuffer; + /* 0x08 */ u8* mDstBuffer; + /* 0x0C */ u32 mSrcLength; + /* 0x10 */ u32 mDstLength; + /* 0x14 */ AsyncCallback mCallback; + /* 0x18 */ JKRDecompCommand* mThis; + /* 0x1C */ OSMessageQueue* field_0x1c; + /* 0x20 */ s32 field_0x20; + /* 0x24 */ JKRAMCommand* mAMCommand; + /* 0x28 */ OSMessageQueue mMessageQueue; + /* 0x48 */ OSMessage mMessage; +}; + +#define JKRDECOMP_SYNC_BLOCKING 0 +#define JKRDECOMP_SYNC_NON_BLOCKING 1 + +class JKRDecomp : public JKRThread { +private: + JKRDecomp(long); + virtual ~JKRDecomp(); + + /* vt[03] */ virtual void* run(); /* override */ + +public: + static JKRDecomp* create(long); + static JKRDecompCommand* prepareCommand(u8*, u8*, u32, u32, JKRDecompCommand::AsyncCallback); + static void sendCommand(JKRDecompCommand*); + static bool sync(JKRDecompCommand*, int); + static JKRDecompCommand* orderAsync(u8*, u8*, u32, u32, JKRDecompCommand::AsyncCallback); + static bool orderSync(u8*, u8*, u32, u32); + static void decode(u8*, u8*, u32, u32); + static void decodeSZP(u8*, u8*, u32, u32); + static void decodeSZS(u8*, u8*, u32, u32); + static JKRCompression checkCompressed(u8*); + + static JKRDecomp* sDecompObject; + static OSMessage sMessageBuffer[8]; + static OSMessageQueue sMessageQueue; +}; + +inline void JKRDecompress(u8* srcBuffer, u8* dstBuffer, u32 srcLength, u32 dstLength) { + JKRDecomp::orderSync(srcBuffer, dstBuffer, srcLength, dstLength); +} + +inline JKRDecomp* JKRCreateDecompManager(long priority) { + return JKRDecomp::create(priority); +} + +inline JKRCompression JKRCheckCompressed_noASR(u8 *pBuf) { + JKRCompression compression = JKRDecomp::checkCompressed(pBuf); + if (compression == COMPRESSION_ASR) // ternary i had before was either incorrect, or was not a ternary at all + compression = COMPRESSION_NONE; + return compression; +} + +#endif /* JKRDECOMP_H */ diff --git a/include/JSystem/JKernel/JKRDisposer.h b/include/JSystem/JKernel/JKRDisposer.h new file mode 100644 index 0000000..b8a844f --- /dev/null +++ b/include/JSystem/JKernel/JKRDisposer.h @@ -0,0 +1,19 @@ +#ifndef JKRDISPOSER_H +#define JKRDISPOSER_H + +#include "JSystem/JSupport/JSUList.h" + +class JKRHeap; +class JKRDisposer { +public: + JKRDisposer(); + virtual ~JKRDisposer(); + +public: + /* 0x00 */ // vtable + /* 0x04 */ JKRHeap* mHeap; + /* 0x08 */ JSULink mLink; + /* 0x18 */ +}; + +#endif /* JKRDISPOSER_H */ diff --git a/include/JSystem/JKernel/JKRDvdAramRipper.h b/include/JSystem/JKernel/JKRDvdAramRipper.h new file mode 100644 index 0000000..201de6b --- /dev/null +++ b/include/JSystem/JKernel/JKRDvdAramRipper.h @@ -0,0 +1,56 @@ +#ifndef JKRDVDARAMRIPPER_H +#define JKRDVDARAMRIPPER_H + +#include "JSystem/JKernel/JKRDvdRipper.h" +#include "dolphin/types.h" + +class JKRAramBlock; +class JKRAramStreamCommand; + +class JKRADCommand { +public: + JKRADCommand(); + ~JKRADCommand(); + + /* 0x00 */ JSULink mLink; + /* 0x10 */ int field_0x10; + /* 0x14 */ int field_0x14; + /* 0x18 */ int field_0x18; + /* 0x1C */ int field_0x1c; + /* 0x20 */ int field_0x20; + /* 0x24 */ int field_0x24; + /* 0x28 */ JKRDvdFile* mDvdFile; + /* 0x2C */ u32 field_0x2c; + /* 0x30 */ JKRAramBlock* mBlock; + /* 0x34 */ int field_0x34; + /* 0x38 */ void (*field_0x38)(u32); + /* 0x3C */ u32 field_0x3c; + /* 0x40 */ u32 field_0x40; + /* 0x44 */ u32* field_0x44; + /* 0x48 */ int field_0x48; + /* 0x4C */ u8 field_0x4c; + /* 0x50 */ JKRAramStreamCommand* mStreamCommand; +}; + +class JKRDvdFile; +class JKRDvdAramRipper { +public: + static JKRAramBlock* loadToAram(long, u32, JKRExpandSwitch, u32, u32, u32*); + static JKRAramBlock* loadToAram(JKRDvdFile*, u32, JKRExpandSwitch, u32, u32, u32*); + static JKRADCommand* loadToAram_Async(JKRDvdFile*, u32, JKRExpandSwitch, void (*)(u32), u32, + u32, u32*); + static JKRADCommand* callCommand_Async(JKRADCommand*); + static bool syncAram(JKRADCommand*, int); + + static void setSZSBufferSize(u32 size) { sSZSBufferSize = size; } + + // TODO: fix type + static u8 sDvdAramAsyncList[12]; + static u32 sSZSBufferSize; +}; + +inline JKRAramBlock *JKRDvdToAram(s32 entrynum, u32 p2, JKRExpandSwitch expSwitch, u32 p4, u32 p5, u32 *p6) { + return JKRDvdAramRipper::loadToAram(entrynum, p2, expSwitch, p4, p5, p6); +} + +#endif /* JKRDVDARAMRIPPER_H */ diff --git a/include/JSystem/JKernel/JKRDvdArchive.h b/include/JSystem/JKernel/JKRDvdArchive.h new file mode 100644 index 0000000..e2e6b40 --- /dev/null +++ b/include/JSystem/JKernel/JKRDvdArchive.h @@ -0,0 +1,32 @@ +#ifndef JKRDVDARCHIVE_H +#define JKRDVDARCHIVE_H + +#include "JSystem/JKernel/JKRArchive.h" + +class JKRDvdFile; +class JKRDvdArchive : public JKRArchive { +public: + JKRDvdArchive(s32, JKRArchive::EMountDirection); + virtual ~JKRDvdArchive(); + + bool open(s32); + + /* vt[15] */ virtual u32 getExpandedResSize(const void*) const; /* override */ + /* vt[16] */ virtual void* fetchResource(SDIFileEntry*, u32*); /* override */ + /* vt[17] */ virtual void* fetchResource(void*, u32, SDIFileEntry*, u32*); /* override */ + +public: + static u32 fetchResource_subroutine(s32, u32, u32, u8*, u32, JKRCompression, JKRCompression); + static u32 fetchResource_subroutine(s32, u32, u32, JKRHeap*, JKRCompression, JKRCompression, + u8**); + +private: + /* 0x00 */ // vtable + /* 0x04 */ // JKRArchive + /* 0x5C */ JKRCompression mCompression; + /* 0x60 */ EMountDirection mMountDirection; + /* 0x64 */ s32 field_0x64; + /* 0x68 */ JKRDvdFile* mDvdFile; +}; + +#endif /* JKRDVDARCHIVE_H */ diff --git a/include/JSystem/JKernel/JKRDvdFile.h b/include/JSystem/JKernel/JKRDvdFile.h new file mode 100644 index 0000000..9fe03fd --- /dev/null +++ b/include/JSystem/JKernel/JKRDvdFile.h @@ -0,0 +1,63 @@ +#ifndef JKRDVDFILE_H +#define JKRDVDFILE_H + +#include "JSystem/JKernel/JKRFile.h" +#include "dolphin/dvd/dvd.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSMutex.h" + +struct OSThread; + +class JKRADCommand; +class JKRAramBlock; +class JSUFileInputStream; +class JKRDvdFile : public JKRFile { +public: + JKRDvdFile(); + JKRDvdFile(const char*); + JKRDvdFile(long); + virtual ~JKRDvdFile(); + + void initiate(void); + s32 sync(void); + + u32 getFileID() const { return mFileInfo.start_address; } + DVDFileInfo* getFileInfo() { return &mFileInfo; } + int getStatus() { return DVDGetCommandBlockStatus(&mFileInfo.block); } + +public: + /* vt[03] */ virtual bool open(const char*); /* override */ + /* vt[04] */ virtual void close(void); /* override */ + /* vt[05] */ virtual s32 readData(void*, s32, s32); /* override */ + /* vt[06] */ virtual s32 writeData(const void*, s32, s32); /* override */ + /* vt[07] */ virtual s32 getFileSize(void) const; /* override */ + /* vt[08] */ virtual bool open(s32); + +// private: + /* 0x00 */ // vtable + /* 0x04 */ // JKRFile + /* 0x1C */ OSMutex mMutex1; + /* 0x34 */ OSMutex mMutex2; + /* 0x4C */ JKRAramBlock* mBlock; + /* 0x50 */ OSThread* field_0x50; + /* 0x54 */ JSUFileInputStream* mFileStream; + /* 0x58 */ u32 field_0x58; + /* 0x5C */ DVDFileInfo mFileInfo; + /* 0x98 */ JKRDvdFile* mDvdFile; + /* 0x9C */ OSMessageQueue mMessageQueue1; + /* 0xBC */ OSMessage mMessage1; + /* 0xC0 */ OSMessageQueue mMessageQueue2; + /* 0xE0 */ OSMessage mMessage2; + /* 0xE4 */ JSULink mDvdLink; + /* 0xF4 */ OSThread* mOSThread; + +public: + static void doneProcess(long, DVDFileInfo*); + + static JSUList& getDvdList() { return sDvdList; } + +private: + static JSUList sDvdList; +}; + +#endif /* JKRDVDFILE_H */ diff --git a/include/JSystem/JKernel/JKRDvdRipper.h b/include/JSystem/JKernel/JKRDvdRipper.h new file mode 100644 index 0000000..d5991e6 --- /dev/null +++ b/include/JSystem/JKernel/JKRDvdRipper.h @@ -0,0 +1,65 @@ +#ifndef JKRDVDRIPPER_H +#define JKRDVDRIPPER_H + +#include "JSystem/JKernel/JKRCompression.h" +#include "JSystem/JSupport/JSUList.h" + +enum JKRExpandSwitch { + EXPAND_SWITCH_UNKNOWN0 = 0, + EXPAND_SWITCH_UNKNOWN1 = 1, + EXPAND_SWITCH_UNKNOWN2 = 2, +}; + +struct SYaz0Header { + u32 signature; + u32 length; +}; + +class JKRDMCommand { + JKRDMCommand(); + ~JKRDMCommand(); +}; + +class JKRHeap; +class JKRDvdFile; +class JKRDvdRipper { +public: + static JSUList sDvdAsyncList; + static u32 sSZSBufferSize; + + enum EAllocDirection { + UNKNOWN_EALLOC_DIRECTION = 0, + ALLOC_DIRECTION_FORWARD = 1, + ALLOC_DIRECTION_BACKWARD = 2, + }; + + static void setSZSBufferSize(u32 size) { sSZSBufferSize = size; } + + static void* loadToMainRAM(char const*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, + u32, JKRCompression*, u32*); + static void* loadToMainRAM(long, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, u32, + JKRCompression*, u32*); + static void* loadToMainRAM(JKRDvdFile*, u8*, JKRExpandSwitch, u32, JKRHeap*, EAllocDirection, + u32, JKRCompression*, u32*); + + static u8 isErrorRetry(void); + inline static u32 getSZSBufferSize() { return sSZSBufferSize; } +}; + +// void JKRDecompressFromDVD(JKRDvdFile*, void*, u32, u32, u32, u32, u32*); + +inline void* JKRDvdToMainRam(s32 entryNum, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, + JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection, + u32 offset, JKRCompression* compression, u32* returnSize) { + return JKRDvdRipper::loadToMainRAM(entryNum, dst, expandSwitch, dstLength, heap, allocDirection, + offset, compression, returnSize); +} + +inline void* JKRDvdToMainRam(const char* name, u8* dst, JKRExpandSwitch expandSwitch, u32 dstLength, + JKRHeap* heap, JKRDvdRipper::EAllocDirection allocDirection, + u32 offset, JKRCompression* compression, u32* returnSize) { + return JKRDvdRipper::loadToMainRAM(name, dst, expandSwitch, dstLength, heap, allocDirection, + offset, compression, returnSize); +} + +#endif /* JKRDVDRIPPER_H */ diff --git a/include/JSystem/JKernel/JKRExpHeap.h b/include/JSystem/JKernel/JKRExpHeap.h new file mode 100644 index 0000000..3d566c0 --- /dev/null +++ b/include/JSystem/JKernel/JKRExpHeap.h @@ -0,0 +1,113 @@ +#ifndef JKREXPHEAP_H +#define JKREXPHEAP_H + +#include "JSystem/JKernel/JKRHeap.h" + +class JKRExpHeap : public JKRHeap { +public: + enum EAllocMode { + ALLOC_MODE_1 = 1, + }; + + class CMemBlock { + friend class JKRExpHeap; + + public: + void initiate(CMemBlock* prev, CMemBlock* next, u32 size, u8 groupId, u8 alignment); + JKRExpHeap::CMemBlock* allocFore(u32 size, u8 groupId1, u8 alignment1, u8 groupId2, + u8 alignment2); + JKRExpHeap::CMemBlock* allocBack(u32 size, u8 groupId1, u8 alignment1, u8 groupId2, + u8 alignment2); + int free(JKRExpHeap* heap); + static CMemBlock* getHeapBlock(void* ptr); + + void newGroupId(u8 groupId) { mGroupId = groupId; } + bool isValid() const { return mMagic == 'HM'; } + bool _isTempMemBlock() const { return (mFlags & 0x80) ? true : false; } + int getAlignment() const { return mFlags & 0x7f; } + void* getContent() const { return (void*)(this + 1); } + CMemBlock* getPrevBlock() const { return mPrev; } + CMemBlock* getNextBlock() const { return mNext; } + u32 getSize() const { return size; } + u8 getGroupId() const { return mGroupId; } + static CMemBlock* getBlock(void* data) { return (CMemBlock*)((u32)data + -0x10); } + + private: + /* 0x0 */ u16 mMagic; + /* 0x2 */ u8 mFlags; // a|bbbbbbb a=temporary b=alignment + /* 0x3 */ u8 mGroupId; + /* 0x4 */ u32 size; + /* 0x8 */ CMemBlock* mPrev; + /* 0xC */ CMemBlock* mNext; + }; // Size: 0x10 + friend class CMemBlock; + +protected: + JKRExpHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag); + virtual ~JKRExpHeap(); + + void* allocFromHead(u32 size, int align); + void* allocFromHead(u32 size); + void* allocFromTail(u32 size, int align); + void* allocFromTail(u32 size); + void appendUsedList(CMemBlock* newblock); + void setFreeBlock(CMemBlock* block, CMemBlock* prev, CMemBlock* next); + void removeFreeBlock(CMemBlock* block); + void removeUsedBlock(CMemBlock* block); + void recycleFreeBlock(CMemBlock* block); + void joinTwoBlocks(CMemBlock* block); + +public: + s32 getUsedSize(u8 groupId) const; + s32 getTotalUsedSize(void) const; + + CMemBlock* getHeadUsedList() const { return mHeadUsedList; } + void setAllocationMode(EAllocMode mode) { + mAllocMode = mode; + } + +public: + /* vt[04] */ virtual u32 getHeapType(); /* override */ + /* vt[05] */ virtual bool check(); /* override */ + /* vt[06] */ virtual bool dump_sort(); /* override */ + /* vt[07] */ virtual bool dump(); /* override */ + /* vt[08] */ virtual void do_destroy(); /* override */ + /* vt[09] */ virtual void* do_alloc(u32 size, int alignment); /* override */ + /* vt[10] */ virtual void do_free(void* ptr); /* override */ + /* vt[11] */ virtual void do_freeAll(); /* override */ + /* vt[12] */ virtual void do_freeTail(); /* override */ + /* vt[13] */ virtual void do_fillFreeArea(); /* override */ + /* vt[14] */ virtual s32 do_resize(void* ptr, u32 size); /* override */ + /* vt[15] */ virtual s32 do_getSize(void* ptr); /* override */ + /* vt[16] */ virtual s32 do_getFreeSize(); /* override */ + /* vt[17] */ virtual void* do_getMaxFreeBlock(); /* override */ + /* vt[18] */ virtual s32 do_getTotalFreeSize(); /* override */ + /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID); /* override */ + /* vt[20] */ virtual u8 do_getCurrentGroupId(); /* override */ + /* vt[21] */ virtual u32 state_register(JKRHeap::TState* p, u32 id) const; /* override */ + /* vt[22] */ virtual bool state_compare(JKRHeap::TState const& r1, + JKRHeap::TState const& r2) const; /* override */ + + /* 0x6C */ u8 mAllocMode; + /* 0x6D */ u8 mCurrentGroupId; + /* 0x6E */ bool field_0x6e; + +private: + /* 0x70 */ void* field_0x70; + /* 0x74 */ u32 field_0x74; + /* 0x78 */ CMemBlock* mHeadFreeList; + /* 0x7C */ CMemBlock* mTailFreeList; + /* 0x80 */ CMemBlock* mHeadUsedList; + /* 0x84 */ CMemBlock* mTailUsedList; + +public: + static JKRExpHeap* createRoot(int maxHeaps, bool errorFlag); + static JKRExpHeap* create(u32 size, JKRHeap* parent, bool errorFlag); + static JKRExpHeap* create(void* ptr, u32 size, JKRHeap* parent, bool errorFlag); +}; + +inline JKRExpHeap* JKRCreateExpHeap(u32 size, JKRHeap* parent, bool errorFlag) { + return JKRExpHeap::create(size, parent, errorFlag); +} + +#endif /* JKREXPHEAP_H */ diff --git a/include/JSystem/JKernel/JKRFile.h b/include/JSystem/JKernel/JKRFile.h new file mode 100644 index 0000000..4e1be4d --- /dev/null +++ b/include/JSystem/JKernel/JKRFile.h @@ -0,0 +1,29 @@ +#ifndef JKRFILE_H +#define JKRFILE_H + +#include "JSystem/JKernel/JKRDisposer.h" + +class JKRFile : public JKRDisposer { +public: + JKRFile() : mIsAvailable(false) {} + virtual ~JKRFile() {} + + s32 read(void*, long, long); + + bool isAvailable() const { return mIsAvailable; } + +public: + /* vt[03] */ virtual bool open(const char*) = 0; + /* vt[04] */ virtual void close() = 0; + /* vt[05] */ virtual s32 readData(void*, s32, s32) = 0; + /* vt[06] */ virtual s32 writeData(const void*, s32, s32) = 0; + /* vt[07] */ virtual s32 getFileSize() const = 0; + +protected: + /* 0x00 */ // vtable + /* 0x04 */ // JKRDisposer + /* 0x18 */ bool mIsAvailable; + /* 0x19 */ u8 field_0x19[3]; +}; + +#endif /* JKRFILE_H */ diff --git a/include/JSystem/JKernel/JKRFileCache.h b/include/JSystem/JKernel/JKRFileCache.h new file mode 100644 index 0000000..b4b9830 --- /dev/null +++ b/include/JSystem/JKernel/JKRFileCache.h @@ -0,0 +1,66 @@ +#ifndef JKRFILECACHE_H +#define JKRFILECACHE_H + +#include "JSystem/JKernel/JKRFileLoader.h" + +class JKRHeap; +class JKRFileCache : public JKRFileLoader { +public: + class CCacheBlock { + public: + CCacheBlock(u32, u32, const void*); + ~CCacheBlock() {} + + public: + /* 0x00 */ JSULink mCacheBlockLink; + /* 0x10 */ u32 mReferenceCount; + /* 0x14 */ u32 mFileId; + /* 0x18 */ u32 mFileSize; + /* 0x1C */ void* mMemoryPtr; + }; + +protected: + JKRFileCache(const char*, const char*); + virtual ~JKRFileCache(); + + CCacheBlock* findCacheBlock(const void*) const; + CCacheBlock* findCacheBlock(u32) const; + bool findFile(char*, const char*) const; + char* getDvdPathName(const char*) const; + void convStrLower(char*) const; + +public: + /* vt[04] */ virtual bool becomeCurrent(const char*); /* override */ + /* vt[05] */ virtual void* getResource(const char*); /* override */ + /* vt[06] */ virtual void* getResource(u32, const char*); /* override */ + /* vt[07] */ virtual u32 readResource(void*, u32, const char*); /* override */ + /* vt[08] */ virtual u32 readResource(void*, u32, u32, const char*); /* override */ + /* vt[09] */ virtual void removeResourceAll(void); /* override */ + /* vt[10] */ virtual bool removeResource(void*); /* override */ + /* vt[11] */ virtual bool detachResource(void*); /* override */ + /* vt[12] */ virtual u32 getResSize(const void*) const; /* override */ + /* vt[13] */ virtual u32 countFile(const char*) const; /* override */ + /* vt[14] */ virtual JKRFileFinder* getFirstFile(const char*) const; /* override */ + /* vt[15] */ virtual void* getFsResource(const char*); + /* vt[16] */ virtual void* getNameResource(u32, const char*); + /* vt[17] */ virtual u32 readFsResource(void*, u32, const char*); + /* vt[18] */ virtual u32 readNameResource(void*, u32, u32, const char*); + +private: + /* 0x00 */ // vtable + /* 0x04 */ // JKRFileLoader + /* 0x38 */ JKRHeap* mParentHeap; + /* 0x3C */ JSUList mCacheBlockList; + /* 0x48 */ char* mRootPath; + /* 0x4C */ char* mCurrentPath; + /* 0x50 */ char* mVolumePath; + +public: + static JKRFileCache* mount(const char*, JKRHeap*, const char*); +}; + +inline JKRFileCache* JKRMountDvdDrive(const char* path, JKRHeap* heap, const char* param_2) { + return JKRFileCache::mount(path, heap, param_2); +} + +#endif /* JKRFILECACHE_H */ diff --git a/include/JSystem/JKernel/JKRFileFinder.h b/include/JSystem/JKernel/JKRFileFinder.h new file mode 100644 index 0000000..d417090 --- /dev/null +++ b/include/JSystem/JKernel/JKRFileFinder.h @@ -0,0 +1,72 @@ +#ifndef JKRFILEFINDER_H +#define JKRFILEFINDER_H + +#include "dolphin/dvd/dvd.h" + +struct JKRFileFinder_UnknownBase { + const char* mEntryName; + s32 mEntryFileIndex; + u16 mEntryId; + u16 mEntryTypeFlags; +}; + +class JKRFileFinder : public JKRFileFinder_UnknownBase { +public: + JKRFileFinder() { + mIsAvailable = false; + mIsFileOrDirectory = false; + } + inline virtual ~JKRFileFinder(); + + bool isAvailable() const { return mIsAvailable; } + bool isFile() const { return mIsFileOrDirectory; } + bool isDirectory() const { return mIsFileOrDirectory; } + +public: + /* vt[3] */ virtual bool findNextFile(void) = 0; + +protected: + /* 0x00 */ // JKRFileFinder_UnknownBase + /* 0x0C */ // vtable + /* 0x10 */ bool mIsAvailable; + /* 0x11 */ bool mIsFileOrDirectory; + /* 0x12 */ u8 field_0x12[2]; +}; + +class JKRArchive; +class JKRArcFinder : public JKRFileFinder { +public: + JKRArcFinder(JKRArchive*, s32, s32); + inline virtual ~JKRArcFinder(); + +public: + /* vt[3] */ virtual bool findNextFile(void); /* override */ + +private: + /* 0x00 */ // JKRFileFinder_UnknownBase + /* 0x0C */ // vtable + /* 0x10 */ // JKRFileFinder + /* 0x14 */ JKRArchive* mArchive; + /* 0x18 */ s32 mStartIndex; + /* 0x1C */ s32 mEndIndex; + /* 0x20 */ s32 mNextIndex; +}; + +class JKRDvdFinder : public JKRFileFinder { +public: + JKRDvdFinder(const char*); + virtual ~JKRDvdFinder(); + +public: + /* vt[3] */ virtual bool findNextFile(void); /* override */ + +private: + /* 0x00 */ // JKRFileFinder_UnknownBase + /* 0x0C */ // vtable + /* 0x10 */ // JKRFileFinder + /* 0x14 */ DVDDirectory mDvdDirectory; + /* 0x20 */ bool mDvdIsOpen; + /* 0x21 */ u8 field_0x21[3]; +}; + +#endif /* JKRFILEFINDER_H */ diff --git a/include/JSystem/JKernel/JKRFileLoader.h b/include/JSystem/JKernel/JKRFileLoader.h new file mode 100644 index 0000000..c02dedc --- /dev/null +++ b/include/JSystem/JKernel/JKRFileLoader.h @@ -0,0 +1,68 @@ +#ifndef JKRFILELOADER_H +#define JKRFILELOADER_H + +#include "JSystem/JKernel/JKRDisposer.h" +#include "dolphin/types.h" + +class JKRFileFinder; +class JKRFileLoader : public JKRDisposer { +public: + JKRFileLoader(void); + virtual ~JKRFileLoader(); + + bool isMounted() const { return this->mIsMounted; } + u32 getVolumeType() const { return this->mVolumeType; } + +public: + /* vt[03] */ virtual void unmount(void); + /* vt[04] */ virtual bool becomeCurrent(const char*) = 0; + /* vt[05] */ virtual void* getResource(const char*) = 0; + /* vt[06] */ virtual void* getResource(u32, const char*) = 0; + /* vt[07] */ virtual u32 readResource(void*, u32, const char*) = 0; + /* vt[08] */ virtual u32 readResource(void*, u32, u32, const char*) = 0; + /* vt[09] */ virtual void removeResourceAll(void) = 0; + /* vt[10] */ virtual bool removeResource(void*) = 0; + /* vt[11] */ virtual bool detachResource(void*) = 0; + /* vt[12] */ virtual u32 getResSize(const void*) const = 0; + /* vt[13] */ virtual u32 countFile(const char*) const = 0; + /* vt[14] */ virtual JKRFileFinder* getFirstFile(const char*) const = 0; + +protected: + /* 0x00 */ // vtable + /* 0x04 */ // JKRDisposer + /* 0x18 */ JSULink mFileLoaderLink; + /* 0x28 */ const char* mVolumeName; + /* 0x2C */ u32 mVolumeType; + /* 0x30 */ bool mIsMounted; + /* 0x31 */ u8 field_0x31[3]; + /* 0x34 */ u32 mMountCount; + +public: + static void* getGlbResource(const char*); + static void* getGlbResource(const char*, JKRFileLoader*); + static bool removeResource(void*, JKRFileLoader*); + static bool detachResource(void*, JKRFileLoader*); + static JKRFileLoader* findVolume(const char**); + static const char* fetchVolumeName(char*, long, const char*); + + static JKRFileLoader* getCurrentVolume() { return sCurrentVolume; } + static void setCurrentVolume(JKRFileLoader* fileLoader) { sCurrentVolume = fileLoader; } + static JSUList& getVolumeList() { return sVolumeList; } + + static JKRFileLoader* sCurrentVolume; + static JSUList sVolumeList; +}; + +inline bool JKRDetachResource(void* resource, JKRFileLoader* fileLoader) { + return JKRFileLoader::detachResource(resource, fileLoader); +} + +inline void* JKRGetNameResource(const char* name, JKRFileLoader* loader) { + return JKRFileLoader::getGlbResource(name, loader); +} + +inline void* JKRGetResource(const char* name) { + return JKRFileLoader::getGlbResource(name); +} + +#endif /* JKRFILELOADER_H */ diff --git a/include/JSystem/JKernel/JKRHeap.h b/include/JSystem/JKernel/JKRHeap.h new file mode 100644 index 0000000..8a60d4d --- /dev/null +++ b/include/JSystem/JKernel/JKRHeap.h @@ -0,0 +1,242 @@ +#ifndef JKRHEAP_H +#define JKRHEAP_H + +#include "JSystem/JKernel/JKRDisposer.h" +#include "dolphin/os/OSMutex.h" + +class JKRHeap; +typedef void (*JKRErrorHandler)(void*, u32, int); + +extern bool data_804508B0; + +class JKRHeap : public JKRDisposer { +public: + class TState { + public: + /* 0x00 */ u32 mUsedSize; + /* 0x04 */ u32 mCheckCode; + /* 0x08 */ u32 mBuf; + /* 0x0C */ u32 field_0xc; + /* 0x10 */ JKRHeap* mHeap; + /* 0x14 */ u32 mId; + + public: + u32 getUsedSize() const { return mUsedSize; } + u32 getCheckCode() const { return mCheckCode; } + JKRHeap* getHeap() const { return mHeap; } + u32 getId() const { return mId; } + }; + +public: + JKRHeap(void* data, u32 size, JKRHeap* parent, bool errorFlag); + virtual ~JKRHeap(); + + JKRHeap* becomeSystemHeap(); + JKRHeap* becomeCurrentHeap(); + void destroy(); + + void* alloc(u32 size, int alignment); + void free(void* ptr); + void freeAll(); + void freeTail(); + s32 resize(void* ptr, u32 size); + s32 getSize(void* ptr); + s32 getFreeSize(); + void* getMaxFreeBlock(); + s32 getTotalFreeSize(); + s32 changeGroupID(u8 newGroupId); + u32 getMaxAllocatableSize(int alignment); + + JKRHeap* find(void* ptr) const; + JKRHeap* findAllHeap(void* ptr) const; + + void dispose_subroutine(u32 start, u32 end); + bool dispose(void* ptr, u32 size); + void dispose(void* begin, void* end); + void dispose(); + + bool setErrorFlag(bool errorFlag); + bool isSubHeap(JKRHeap* heap) const; + + /* vt[03] */ virtual void callAllDisposer(); + /* vt[04] */ virtual u32 getHeapType() = 0; + /* vt[05] */ virtual bool check() = 0; + /* vt[06] */ virtual bool dump_sort(); + /* vt[07] */ virtual bool dump() = 0; + /* vt[08] */ virtual void do_destroy() = 0; + /* vt[09] */ virtual void* do_alloc(u32 size, int alignment) = 0; + /* vt[10] */ virtual void do_free(void* ptr) = 0; + /* vt[11] */ virtual void do_freeAll() = 0; + /* vt[12] */ virtual void do_freeTail() = 0; + /* vt[13] */ virtual void do_fillFreeArea() = 0; + /* vt[14] */ virtual s32 do_resize(void* ptr, u32 size) = 0; + /* vt[15] */ virtual s32 do_getSize(void* ptr) = 0; + /* vt[16] */ virtual s32 do_getFreeSize() = 0; + /* vt[17] */ virtual void* do_getMaxFreeBlock() = 0; + /* vt[18] */ virtual s32 do_getTotalFreeSize() = 0; + /* vt[19] */ virtual s32 do_changeGroupID(u8 newGroupID); + /* vt[20] */ virtual u8 do_getCurrentGroupId(); + /* vt[21] */ virtual u32 state_register(JKRHeap::TState* p, u32 id) const; + /* vt[22] */ virtual bool state_compare(JKRHeap::TState const& r1, JKRHeap::TState const& r2) const; + /* vt[23] */ virtual void state_dump(JKRHeap::TState const& p) const; + + void setDebugFill(bool debugFill) { mDebugFill = debugFill; } + bool getDebugFill() const { return mDebugFill; } + void* getStartAddr() const { return (void*)mStart; } + void* getEndAddr() const { return (void*)mEnd; } + u32 getSize() const { return mSize; } + bool getErrorFlag() const { return mErrorFlag; } + void callErrorHandler(JKRHeap* heap, u32 size, int alignment) { + if (mErrorHandler) { + (*mErrorHandler)(heap, size, alignment); + } + } + + JKRHeap* getParent() const { + JSUTree* parent = mChildTree.getParent(); + return parent->getObject(); + } + + JSUTree& getHeapTree() { return mChildTree; } + void appendDisposer(JKRDisposer* disposer) { mDisposerList.append(&disposer->mLink); } + void removeDisposer(JKRDisposer* disposer) { mDisposerList.remove(&disposer->mLink); } + void lock() { OSLockMutex(&mMutex); } + void unlock() { OSUnlockMutex(&mMutex); } + u32 getHeapSize() { return mSize; } + +protected: + /* 0x00 */ // vtable + /* 0x04 */ // JKRDisposer + /* 0x18 */ OSMutex mMutex; + /* 0x30 */ u8* mStart; + /* 0x34 */ u8* mEnd; + /* 0x38 */ u32 mSize; + /* 0x3C */ bool mDebugFill; + /* 0x3D */ bool mCheckMemoryFilled; + /* 0x3E */ u8 mAllocationMode; // EAllocMode? + /* 0x3F */ u8 mGroupId; + /* 0x40 */ JSUTree mChildTree; + /* 0x5C */ JSUList mDisposerList; + /* 0x68 */ bool mErrorFlag; + /* 0x69 */ bool mInitFlag; + /* 0x6A */ u8 padding_0x6a[2]; + +public: + static bool initArena(char** memory, u32* size, int maxHeaps); + static void* alloc(u32 size, int alignment, JKRHeap* heap); + static void free(void* ptr, JKRHeap* heap); + static s32 resize(void* ptr, u32 size, JKRHeap* heap); + static s32 getSize(void* ptr, JKRHeap* heap); + static JKRHeap* findFromRoot(void* ptr); + + static void copyMemory(void* dst, void* src, u32 size); + static void fillMemory(void* dst, u32 size, u8 value); // NOTE: never used + static bool checkMemoryFilled(void* src, u32 size, u8 value); + + static JKRErrorHandler setErrorHandler(JKRErrorHandler errorHandler); + + static void setDefaultDebugFill(bool status) { data_804508B0 = status; } + static void* getCodeStart(void) { return mCodeStart; } + static void* getCodeEnd(void) { return mCodeEnd; } + static void* getUserRamStart(void) { return mUserRamStart; } + static void* getUserRamEnd(void) { return mUserRamEnd; } + static u32 getMemorySize(void) { return mMemorySize; } + static JKRHeap* getRootHeap() { return sRootHeap; } +#if DEBUG + static JKRHeap* getRootHeap2() { return sRootHeap2; } +#endif + + static JKRHeap* getSystemHeap() { return sSystemHeap; } + static JKRHeap* getCurrentHeap() { return sCurrentHeap; } + static void setSystemHeap(JKRHeap* heap) { sSystemHeap = heap; } + static void setCurrentHeap(JKRHeap* heap) { sCurrentHeap = heap; } + + static void setState_u32ID_(TState* state, u32 id) { state->mId = id; } + static void setState_uUsedSize_(TState* state, u32 usedSize) { state->mUsedSize = usedSize; } + static void setState_u32CheckCode_(TState* state, u32 checkCode) { + state->mCheckCode = checkCode; + } + static void* getState_buf_(TState* state) { return &state->mBuf; } + static void* getState_(TState* state) { return getState_buf_(state); } + + static void* mCodeStart; + static void* mCodeEnd; + static void* mUserRamStart; + static void* mUserRamEnd; + static u32 mMemorySize; + + static JKRHeap* sRootHeap; +#if DEBUG + static JKRHeap* sRootHeap2; +#endif + + static JKRHeap* sSystemHeap; + static JKRHeap* sCurrentHeap; + + static JKRErrorHandler mErrorHandler; +}; + +void* operator new(u32 size); +void* operator new(u32 size, int alignment); +void* operator new(u32 size, JKRHeap* heap, int alignment); + +void* operator new[](u32 size); +void* operator new[](u32 size, int alignment); +void* operator new[](u32 size, JKRHeap* heap, int alignment); + +void operator delete(void* ptr); +void operator delete[](void* ptr); + +inline void* operator new(u32 size, void* ptr) { + return ptr; +} + +void JKRDefaultMemoryErrorRoutine(void* heap, u32 size, int alignment); + +inline void* JKRAllocFromHeap(JKRHeap* heap, u32 size, int alignment) { + return JKRHeap::alloc(size, alignment, heap); +} + +inline void* JKRAllocFromSysHeap(u32 size, int alignment) { + JKRHeap* systemHeap = JKRHeap::getSystemHeap(); + return systemHeap->alloc(size, alignment); +} + +inline void JKRFreeToHeap(JKRHeap* heap, void* ptr) { + JKRHeap::free(ptr, heap); +} + +inline void JKRFreeToSysHeap(void* ptr) { + JKRHeap* systemHeap = JKRHeap::getSystemHeap(); + systemHeap->free(ptr); +} + +inline void i_JKRFree(void* ptr) { + JKRHeap::free(ptr, NULL); +} + +inline JKRHeap* JKRGetSystemHeap() { + return JKRHeap::getSystemHeap(); +} + +inline JKRHeap* JKRGetCurrentHeap() { + return JKRHeap::getCurrentHeap(); +} + +inline u32 JKRGetMemBlockSize(JKRHeap* heap, void* block) { + return JKRHeap::getSize(block, heap); +} + +inline void* JKRAlloc(u32 size, int alignment) { + return JKRHeap::alloc(size, alignment, NULL); +} + +inline s32 JKRResizeMemBlock(JKRHeap* heap, void* ptr, u32 size) { + return JKRHeap::resize(ptr, size, heap); +} + +inline JKRHeap* JKRGetRootHeap() { + return JKRHeap::getRootHeap(); +} + +#endif /* JKRHEAP_H */ diff --git a/include/JSystem/JKernel/JKRMemArchive.h b/include/JSystem/JKernel/JKRMemArchive.h new file mode 100644 index 0000000..ba76ab1 --- /dev/null +++ b/include/JSystem/JKernel/JKRMemArchive.h @@ -0,0 +1,42 @@ +#ifndef JKRMEMARCHIVE_H +#define JKRMEMARCHIVE_H + +#include "JSystem/JKernel/JKRArchive.h" + +enum JKRMemBreakFlag { + JKRMEMBREAK_FLAG_UNKNOWN0 = 0, + JKRMEMBREAK_FLAG_UNKNOWN1 = 1, +}; + +class JKRMemArchive : public JKRArchive { +public: + JKRMemArchive(long, JKRArchive::EMountDirection); + JKRMemArchive(void*, u32, JKRMemBreakFlag); + virtual ~JKRMemArchive(); + + bool open(long, JKRArchive::EMountDirection); + bool open(void*, u32, JKRMemBreakFlag); + + /* vt[09] */ void removeResourceAll(void); /* override */ + /* vt[10] */ bool removeResource(void*); /* override */ + + /* vt[15] */ u32 getExpandedResSize(const void*) const; /* override */ + /* vt[16] */ void* fetchResource(SDIFileEntry*, u32*); /* override */ + /* vt[17] */ void* fetchResource(void*, u32, SDIFileEntry*, u32*); /* override */ + +public: + static u32 fetchResource_subroutine(u8*, u32, u8*, u32, JKRCompression); + SArcHeader* getArcHeader() { return mArcHeader; } + +private: + /* 0x00 */ // vtable + /* 0x04 */ // JKRArchive + /* 0x5C */ JKRCompression mCompression; + /* 0x60 */ EMountDirection mMountDirection; + /* 0x64 */ SArcHeader* mArcHeader; + /* 0x68 */ u8* mArchiveData; + /* 0x6C */ bool mIsOpen; + /* 0x6D */ u8 field_0x6d[3]; +}; + +#endif /* JKRMEMARCHIVE_H */ diff --git a/include/JSystem/JKernel/JKRSolidHeap.h b/include/JSystem/JKernel/JKRSolidHeap.h new file mode 100644 index 0000000..069b87e --- /dev/null +++ b/include/JSystem/JKernel/JKRSolidHeap.h @@ -0,0 +1,60 @@ +#ifndef JKRSOLIDHEAP_H +#define JKRSOLIDHEAP_H + +#include "JSystem/JKernel/JKRHeap.h" + +class JKRSolidHeap : public JKRHeap { +public: + struct Unknown { + u32 field_0x0; + u32 field_0x4; + u32 field_0x8; + void* field_0xc; + Unknown* mNext; + }; + +protected: + JKRSolidHeap(void*, u32, JKRHeap*, bool); + virtual ~JKRSolidHeap(); + + void* allocFromHead(u32, int); + void* allocFromTail(u32, int); + + static s32 getUsedSize(JKRSolidHeap* heap) { return heap->mSize - heap->getTotalFreeSize(); } + +public: + /* vt[04] */ virtual u32 getHeapType(void); /* override */ + /* vt[05] */ virtual bool check(void); /* override */ + + /* vt[07] */ virtual bool dump(void); /* override */ + /* vt[08] */ virtual void do_destroy(void); /* override */ + /* vt[09] */ virtual void* do_alloc(u32, int); /* override */ + /* vt[10] */ virtual void do_free(void*); /* override */ + /* vt[11] */ virtual void do_freeAll(void); /* override */ + /* vt[12] */ virtual void do_freeTail(void); /* override */ + /* vt[13] */ virtual void do_fillFreeArea(void); /* override */ + /* vt[14] */ virtual s32 do_resize(void*, u32); /* override */ + /* vt[15] */ virtual s32 do_getSize(void*); /* override */ + /* vt[16] */ virtual s32 do_getFreeSize(void); /* override */ + /* vt[17] */ virtual void* do_getMaxFreeBlock(void); /* override */ + /* vt[18] */ virtual s32 do_getTotalFreeSize(void); /* override */ + + /* vt[21] */ virtual u32 state_register(JKRHeap::TState*, u32) const; /* override */ + /* vt[22] */ virtual bool state_compare(JKRHeap::TState const&, + JKRHeap::TState const&) const; /* override */ + +private: + /* 0x00 */ // vtable + /* 0x04 */ // JKRHeap + /* 0x6C */ u32 mFreeSize; + /* 0x70 */ u8* mSolidHead; + /* 0x74 */ u8* mSolidTail; + /* 0x78 */ Unknown* field_0x78; + +public: + s32 adjustSize(void); + + static JKRSolidHeap* create(u32, JKRHeap*, bool); +}; + +#endif /* JKRSOLIDHEAP_H */ diff --git a/include/JSystem/JKernel/JKRThread.h b/include/JSystem/JKernel/JKRThread.h new file mode 100644 index 0000000..c2b89de --- /dev/null +++ b/include/JSystem/JKernel/JKRThread.h @@ -0,0 +1,164 @@ +#ifndef JKRTHREAD_H +#define JKRTHREAD_H + +#include "JSystem/JKernel/JKRHeap.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSTime.h" +#include "dolphin/types.h" + +struct JKRThreadName_ { + s32 id; + char* name; +}; + +class JUTConsole; +class JKRThread : JKRDisposer { +public: + class TLoad { + public: + TLoad() { + clear(); + mValid = false; + mThreadId = 0; + } + + bool isValid() const { return mValid; } + u32 getCost() const { return mCost; } + u32 getCount() const { return mSwitchCount; } + s32 getId() const { return mThreadId; } + + void setValid(bool valid) { mValid = valid; } + void setId(s32 id) { mThreadId = id; } + void setCurrentTime() { mLastTick = OSGetTick(); } + + void resetCost() { mCost = 0; } + void resetCount() { mSwitchCount = 0; } + + void incCount() { mSwitchCount++; } + void addCurrentCost() { mCost = mCost + (OSGetTick() - mLastTick); } + + void clear() { + resetCount(); + resetCost(); + mLastTick = 0; + } + + private: + /* 0x00 */ bool mValid; + /* 0x01 */ u8 padding_0x61[3]; + /* 0x04 */ u32 mCost; + /* 0x08 */ u32 mSwitchCount; + /* 0x0C */ OSTick mLastTick; + /* 0x10 */ s32 mThreadId; + }; + + JKRThread(u32 stack_size, int message_count, int param_3); + JKRThread(JKRHeap* heap, u32 stack_size, int message_count, int param_4); + JKRThread(OSThread* thread, int message_count); + virtual ~JKRThread(); + + /* vt[03] */ virtual void* run(); + + void setCommon_mesgQueue(JKRHeap* heap, int message_count); + void setCommon_heapSpecified(JKRHeap* heap, u32 stack_size, int param_3); + + OSThread* getThreadRecord() const { return mThreadRecord; } + void* getStack() const { return mStackMemory; } + TLoad* getLoadInfo() { return &mLoadInfo; } + JKRHeap* getCurrentHeap() const { return mCurrentHeap; } + s32 getCurrentHeapError() const { return mCurrentHeapError; } + + void setCurrentHeap(JKRHeap* heap) { + mCurrentHeap = heap ? heap : JKRHeap::getCurrentHeap(); + } + +protected: + void resume() { OSResumeThread(mThreadRecord); } + void sendMessage(OSMessage message) { + OSSendMessage(&mMessageQueue, message, OS_MESSAGE_NOBLOCK); + } + void sendMessageBlock(OSMessage message) { + OSSendMessage(&mMessageQueue, message, OS_MESSAGE_BLOCK); + } + OSMessage waitMessage() { + OSMessage message; + OSReceiveMessage(&mMessageQueue, &message, OS_MESSAGE_NOBLOCK); + return message; + } + OSMessage waitMessageBlock() { + OSMessage message; + OSReceiveMessage(&mMessageQueue, &message, OS_MESSAGE_BLOCK); + return message; + } + void jamMessageBlock(OSMessage message) { + OSJamMessage(&mMessageQueue, message, OS_MESSAGE_BLOCK); + } + +private: + /* 0x00 */ // vtable + /* 0x04 */ // JKRDisposer + /* 0x18 */ JSULink mThreadListLink; + /* 0x28 */ JKRHeap* mHeap; + /* 0x2C */ OSThread* mThreadRecord; + /* 0x30 */ OSMessageQueue mMessageQueue; + /* 0x50 */ OSMessage* mMessages; + /* 0x54 */ s32 mMessageCount; + /* 0x58 */ void* mStackMemory; + /* 0x5C */ u32 mStackSize; + /* 0x60 */ TLoad mLoadInfo; + /* 0x74 */ JKRHeap* mCurrentHeap; + /* 0x78 */ s32 mCurrentHeapError; + +public: + static void* start(void* param_1); + static JKRThread* searchThread(OSThread* thread); + static JSUList& getList() { return (JSUList&)sThreadList; } + + static JSUList sThreadList; + // static u8 sThreadList[12]; +}; + +typedef void (*JKRThreadSwitch_PreCallback)(OSThread* current, OSThread* next); +typedef void (*JKRThreadSwitch_PostCallback)(OSThread* current, OSThread* next); + +class JKRThreadSwitch { +public: + JKRThreadSwitch(JKRHeap*); + virtual void draw(JKRThreadName_* param_1, JUTConsole* param_2); + virtual void draw(JKRThreadName_* param_1); + virtual ~JKRThreadSwitch(); + + static JKRThreadSwitch* createManager(JKRHeap* heap); + + JKRThread* enter(JKRThread* param_1, int param_2); + static void callback(OSThread* param_1, OSThread* param_2); + + static JKRThreadSwitch* getManager() { return sManager; } + static u32 getTotalCount() { return sTotalCount; } + +private: + static JKRThreadSwitch* sManager; + static u32 sTotalCount; + static u32 sTotalStart; + static JKRThreadSwitch_PreCallback mUserPreCallback; + static JKRThreadSwitch_PostCallback mUserPostCallback; + +private: + /* 0x00 */ // vtable + /* 0x04 */ JKRHeap* mHeap; + /* 0x08 */ bool mSetNextHeap; + /* 0x09 */ u8 field_0x9[3]; + /* 0x0C */ u32 field_0xC; + /* 0x10 */ u32 field_0x10; + /* 0x14 */ u8 field_0x14[4]; + /* 0x18 */ s64 field_0x18; + /* 0x20 */ u32 field_0x20; + /* 0x24 */ u32 field_0x24; +}; + +struct JKRTask { + static JSUList sTaskList; + static u8 sEndMesgQueue[32]; +}; + +#endif /* JKRTHREAD_H */ diff --git a/include/JSystem/JKernel/SArc.h b/include/JSystem/JKernel/SArc.h new file mode 100644 index 0000000..e69de29 diff --git a/include/JSystem/JParticle/JPATexture.h b/include/JSystem/JParticle/JPATexture.h new file mode 100644 index 0000000..33e9ed2 --- /dev/null +++ b/include/JSystem/JParticle/JPATexture.h @@ -0,0 +1,46 @@ +#ifndef JPATEXTURE_H +#define JPATEXTURE_H + +#include "JSystem/JUtility/JUTTexture.h" +#include "dolphin/gx/GX.h" +#include "dolphin/types.h" + +class JKRHeap; + +struct JPATextureData { + // Probably magic / size / flags up top here, but they're unused. + /* 0x00 */ char field_0x00[0x0C]; + /* 0x0C */ char mName[0x14]; + /* 0x20 */ ResTIMG mResTIMG; +}; + +class JPATexture { +public: + virtual ~JPATexture(); + virtual const char* getName() const; + virtual void load(GXTexMapID); + virtual JUTTexture* getJUTTexture(); + + JUTTexture mTexture; +}; + +class JPATextureArc : public JPATexture { +public: + JPATextureArc(u8 const*); + virtual ~JPATextureArc(); + + const char* getName() const { return mpData->mName; } + void load(GXTexMapID texMapID) { mTexture.load(texMapID); } + JUTTexture* getJUTTexture() { return &mTexture; } + +public: + const JPATextureData* mpData; +}; + +struct JPADefaultTexture { + void initialize(JKRHeap *); + u8 * imgBuf; + GXTexObj mTexObj; +}; + +#endif /* JPATEXTURE_H */ diff --git a/include/JSystem/JSupport/JSUFileStream.h b/include/JSystem/JSupport/JSUFileStream.h new file mode 100644 index 0000000..5fd0fbc --- /dev/null +++ b/include/JSystem/JSupport/JSUFileStream.h @@ -0,0 +1,24 @@ +#ifndef JSUFILESTREAM_H +#define JSUFILESTREAM_H + +#include "JSystem/JSupport/JSURandomInputStream.h" + +class JKRFile; + +class JSUFileInputStream : public JSURandomInputStream { +public: + virtual ~JSUFileInputStream() {} + + // TODO: fix return values + /* 802DC638 */ JSUFileInputStream(JKRFile*); + /* 802DC67C */ u32 readData(void*, s32); + /* 802DC74C */ s32 seekPos(s32, JSUStreamSeekFrom); + /* 802DC82C */ s32 getLength() const; + /* 802DC85C */ s32 getPosition() const; + +private: + /* 0x08 */ JKRFile* mFile; + /* 0x0C */ s32 mPosition; +}; // Size = 0x10 + +#endif /* JSUFILESTREAM_H */ diff --git a/include/JSystem/JSupport/JSUInputStream.h b/include/JSystem/JSupport/JSUInputStream.h new file mode 100644 index 0000000..d0aa9ce --- /dev/null +++ b/include/JSystem/JSupport/JSUInputStream.h @@ -0,0 +1,77 @@ +#ifndef JSUINPUTSTREAM_H +#define JSUINPUTSTREAM_H + +#include "JSystem/JSupport/JSUIosBase.h" + +enum JSUStreamSeekFrom { + JSUStreamSeekFrom_SET = 0, // absolute + JSUStreamSeekFrom_CUR = 1, // relative + JSUStreamSeekFrom_END = 2, // relative to end +}; + +class JSUInputStream : public JSUIosBase { +public: + JSUInputStream() {} + virtual ~JSUInputStream(); + + /* vt[3] */ virtual s32 getAvailable() const = 0; + /* vt[4] */ virtual s32 skip(s32); + /* vt[5] */ virtual u32 readData(void*, s32) = 0; + + u32 readU32() { + u32 val; + this->read(&val, sizeof(val)); + return val; + } + + u32 read32b() { + u32 val; + this->read(&val, sizeof(val)); + return val; + } + + s32 readS32() { + s32 val; + this->read(&val, sizeof(val)); + return val; + } + + s16 readS16() { + s16 val; + this->read(&val, sizeof(val)); + return val; + } + + u16 readU16() { + u16 val; + this->read(&val, sizeof(val)); + return val; + } + + u8 readU8() { + u8 val; + this->read(&val, sizeof(val)); + return val; + } + + u8 read8b() { + u8 val; + this->read(&val, sizeof(val)); + return val; + } + + u16 read16b() { + u16 val; + this->read(&val, sizeof(val)); + return val; + } + + // TODO: return value probably wrong + /* 802DC298 */ s32 read(void*, s32); +}; // Size = 0x8 + +// move? +template +T* JSUConvertOffsetToPtr(const void*, const void*); + +#endif /* JSUINPUTSTREAM_H */ diff --git a/include/JSystem/JSupport/JSUIosBase.h b/include/JSystem/JSupport/JSUIosBase.h new file mode 100644 index 0000000..c44a81e --- /dev/null +++ b/include/JSystem/JSupport/JSUIosBase.h @@ -0,0 +1,24 @@ +#ifndef JSUIOSBASE_H_ +#define JSUIOSBASE_H_ + +#include "dolphin/types.h" + +enum EIoState { + IOS_STATE_1 = 1, +}; + +class JSUIosBase { +public: + JSUIosBase() { mState = false; } + + virtual ~JSUIosBase() {} + + bool isGood() const { return mState == 0; } + void clrState(EIoState state) { mState &= ~state; } + void setState(EIoState state) { mState |= state; } + +private: + u8 mState; +}; // Size = 0x8 + +#endif diff --git a/include/JSystem/JSupport/JSUList.h b/include/JSystem/JSupport/JSUList.h new file mode 100644 index 0000000..6adb0bc --- /dev/null +++ b/include/JSystem/JSupport/JSUList.h @@ -0,0 +1,223 @@ +#ifndef JSULIST_H +#define JSULIST_H + +#include "dolphin/types.h" + +template +class JSUList; + +// +// Link +// + +class JSUPtrList; +class JSUPtrLink { +public: + JSUPtrLink(void* object); + ~JSUPtrLink(); + + void* getObjectPtr() const { return mObject; } + + JSUPtrList* getList() const { return mList; } + + JSUPtrLink* getNext() const { return mNext; } + + JSUPtrLink* getPrev() const { return mPrev; } + +public: + void* mObject; + JSUPtrList* mList; + JSUPtrLink* mPrev; + JSUPtrLink* mNext; +}; + +template +class JSULink : public JSUPtrLink { +public: + JSULink(T* object) : JSUPtrLink((void*)object) {} + + T* getObject() const { return (T*)getObjectPtr(); } + + JSUList* getSupervisor() const { return (JSUList*)this->getList(); } + + JSULink* getNext() const { return (JSULink*)this->JSUPtrLink::getNext(); } + + JSULink* getPrev() const { return (JSULink*)this->JSUPtrLink::getPrev(); } +}; + +// +// List +// + +class JSUPtrList { +public: + JSUPtrList() { this->initiate(); } + JSUPtrList(bool init); + ~JSUPtrList(); + + void initiate(); + void setFirst(JSUPtrLink* first); + bool append(JSUPtrLink* ptr); + bool prepend(JSUPtrLink* ptr); + bool insert(JSUPtrLink* before, JSUPtrLink* ptr); + bool remove(JSUPtrLink* ptr); + JSUPtrLink* getNthLink(u32 i) const; + + JSUPtrLink* getFirstLink() const { return mHead; } + + JSUPtrLink* getLastLink() const { return mTail; } + + u32 getNumLinks() const { return mLength; } + +private: + JSUPtrLink* mHead; + JSUPtrLink* mTail; + u32 mLength; +}; + +template +class JSUList : public JSUPtrList { +public: + JSUList() : JSUPtrList() {} + JSUList(bool init) : JSUPtrList(init) {} + + ~JSUList() {} + + bool append(JSULink* link) { return this->JSUPtrList::append((JSUPtrLink*)link); } + + bool prepend(JSULink* link) { return this->JSUPtrList::prepend((JSUPtrLink*)link); } + + bool insert(JSULink* before, JSULink* link) { + return this->JSUPtrList::insert((JSUPtrLink*)before, (JSUPtrLink*)link); + } + + bool remove(JSULink* link) { return this->JSUPtrList::remove((JSUPtrLink*)link); } + + JSULink* getFirst() const { return (JSULink*)getFirstLink(); } + + JSULink* getLast() const { return (JSULink*)getLastLink(); } + + JSULink* getEnd() const { return NULL; } + + u32 getNumLinks() const { return this->JSUPtrList::getNumLinks(); } +}; + +template +class JSUListIterator { +public: + JSUListIterator() : mLink(NULL) {} + JSUListIterator(JSULink* link) : mLink(link) {} + JSUListIterator(JSUList* list) : mLink(list->getFirst()) {} + + JSUListIterator& operator=(JSULink* link) { + this->mLink = link; + return *this; + } + + T* getObject() { return this->mLink->getObject(); } + + bool operator==(JSULink const* other) const { return this->mLink == other; } + bool operator!=(JSULink const* other) const { return this->mLink != other; } + bool operator==(JSUListIterator const& other) const { return this->mLink == other.mLink; } + bool operator!=(JSUListIterator const& other) const { return this->mLink != other.mLink; } + + JSUListIterator operator++(int) { + JSUListIterator prev = *this; + this->mLink = this->mLink->getNext(); + return prev; + } + + JSUListIterator& operator++() { + this->mLink = this->mLink->getNext(); + return *this; + } + + JSUListIterator operator--(int) { + JSUListIterator prev = *this; + this->mLink = this->mLink->getPrev(); + return prev; + } + + JSUListIterator& operator--() { + this->mLink = this->mLink->getPrev(); + return *this; + } + + T& operator*() { return *this->getObject(); } + + T* operator->() { return this->getObject(); } + +// private: + JSULink* mLink; +}; + +// +// Tree +// + +template +class JSUTree : public JSUList, public JSULink { +public: + JSUTree(T* owner) : JSUList(), JSULink(owner) {} + ~JSUTree() {} + + bool appendChild(JSUTree* child) { return this->append(child); } + + bool removeChild(JSUTree* child) { return this->remove(child); } + + bool insertChild(JSUTree* before, JSUTree* child) { return this->insert(before, child); } + + JSUTree* getEndChild() const { return NULL; } + + JSUTree* getFirstChild() const { return (JSUTree*)this->getFirst(); } + + JSUTree* getLastChild() const { return (JSUTree*)this->getLast(); } + + JSUTree* getNextChild() const { return (JSUTree*)this->getNext(); } + + JSUTree* getPrevChild() const { return (JSUTree*)this->getPrev(); } + + u32 getNumChildren() const { return this->getNumLinks(); } + + T* getObject() const { return (T*)this->getObjectPtr(); } + + JSUTree* getParent() const { return (JSUTree*)this->getList(); } +}; + +template +class JSUTreeIterator { +public: + JSUTreeIterator() : mTree(NULL) {} + JSUTreeIterator(JSUTree* tree) : mTree(tree) {} + + JSUTreeIterator& operator=(JSUTree* tree) { + this->mTree = tree; + return *this; + } + + T* getObject() { return this->mTree->getObject(); } + + bool operator==(JSUTree* other) { return this->mTree == other; } + + bool operator!=(JSUTree* other) { return this->mTree != other; } + + JSUTreeIterator operator++(int) { + JSUTreeIterator prev = *this; + this->mTree = this->mTree->getNextChild(); + return prev; + } + + JSUTreeIterator& operator++() { + this->mTree = this->mTree->getNextChild(); + return *this; + } + + T& operator*() { return *this->getObject(); } + + T* operator->() { return this->getObject(); } + +private: + JSUTree* mTree; +}; + +#endif /* JSULIST_H */ diff --git a/include/JSystem/JSupport/JSUMemoryStream.h b/include/JSystem/JSupport/JSUMemoryStream.h new file mode 100644 index 0000000..fe1eb57 --- /dev/null +++ b/include/JSystem/JSupport/JSUMemoryStream.h @@ -0,0 +1,23 @@ +#ifndef JSUMEMORYSTREAM_H +#define JSUMEMORYSTREAM_H + +#include "JSystem/JSupport/JSURandomInputStream.h" + +class JSUMemoryInputStream : public JSURandomInputStream { +public: + JSUMemoryInputStream(const void* res, u32 size) { setBuffer(res, size); } + + /* 802552B8 */ virtual ~JSUMemoryInputStream() {} + /* 802DC520 */ void setBuffer(void const*, s32); + /* 802DC534 */ u32 readData(void*, s32); + /* 802DC5AC */ s32 seekPos(s32, JSUStreamSeekFrom); + /* 802DC628 */ s32 getLength() const; + /* 802DC630 */ s32 getPosition() const; + +private: + /* 0x08 */ const void* mBuffer; + /* 0x0C */ s32 mLength; + /* 0x10 */ s32 mPosition; +}; // Size = 0x14 + +#endif /* JSUMEMORYSTREAM_H */ diff --git a/include/JSystem/JSupport/JSURandomInputStream.h b/include/JSystem/JSupport/JSURandomInputStream.h new file mode 100644 index 0000000..4541db5 --- /dev/null +++ b/include/JSystem/JSupport/JSURandomInputStream.h @@ -0,0 +1,24 @@ +#ifndef JSURANDOMINPUTSTREAM_H_ +#define JSURANDOMINPUTSTREAM_H_ + +#include "JSystem/JSupport/JSUInputStream.h" + +class JSURandomInputStream : public JSUInputStream { +public: + JSURandomInputStream() {} + virtual ~JSURandomInputStream() {} + + /* vt[3] */ virtual s32 getAvailable() const; /* override */ + /* vt[4] */ virtual s32 skip(s32); /* override */ + /* vt[5] */ virtual u32 readData(void*, s32) = 0; + /* vt[6] */ virtual s32 getLength() const = 0; + /* vt[7] */ virtual s32 getPosition() const = 0; + /* vt[8] */ virtual s32 seekPos(s32, JSUStreamSeekFrom) = 0; + + // TODO: fix return types + /* 802DC370 */ s32 align(s32); + /* 802DC458 */ s32 peek(void*, s32); + /* 802DC4DC */ s32 seek(s32, JSUStreamSeekFrom); +}; // Size = 0x8 + +#endif diff --git a/include/JSystem/JSupport/JSupport.h b/include/JSystem/JSupport/JSupport.h new file mode 100644 index 0000000..0e46c55 --- /dev/null +++ b/include/JSystem/JSupport/JSupport.h @@ -0,0 +1,27 @@ +#ifndef JSUPPORT_H +#define JSUPPORT_H + + +template +T* JSUConvertOffsetToPtr(const void* ptr, const void* offset) { + if (offset == NULL) { + return NULL; + } else { + return (T*)((s32)ptr + (s32)offset); + } +} + +inline u8 JSULoNibble(u8 param_0) { return param_0 & 0x0f; } +inline u8 JSUHiNibble(u8 param_0) {return param_0 >> 4; } + +inline u8 JSULoByte(u16 in) { + return in & 0xff; +} + +inline u8 JSUHiByte(u16 in) { + return in >> 8; +} + +inline u16 JSULoHalf(u32 param_0) {return param_0; } + +#endif diff --git a/include/JSystem/JUtility/JUTAssert.h b/include/JSystem/JUtility/JUTAssert.h index c49b5c2..78563dd 100644 --- a/include/JSystem/JUtility/JUTAssert.h +++ b/include/JSystem/JUtility/JUTAssert.h @@ -2,8 +2,7 @@ #define JUTASSERT_H #include "dolphin/types.h" - -extern void OSPanic(const char * file, s32 line, const char * fmt, ...); +#include "dolphin/os/OS.h" #define JUT_ASSERT(FILE, LINE, COND) \ if (!COND) { \ @@ -17,7 +16,7 @@ extern void OSPanic(const char * file, s32 line, const char * fmt, ...); namespace JUTAssertion { u32 getSDevice(); - void showAssert(u32 device, const char * file, s32 line, const char * assertion); + void showAssert(u32 device, const char * file, int line, const char * assertion); void create(); u32 flush_subroutine(); void flushMessage(); diff --git a/include/JSystem/JUtility/JUTCacheFont.h b/include/JSystem/JUtility/JUTCacheFont.h new file mode 100644 index 0000000..4d39bae --- /dev/null +++ b/include/JSystem/JUtility/JUTCacheFont.h @@ -0,0 +1,80 @@ +#ifndef JUTCACHEFONT_H +#define JUTCACHEFONT_H + +#include "JSystem/JUtility/JUTResFont.h" +#include "global.h" + +class JKRAramBlock; + +class JUTCacheFont : public JUTResFont { +public: + struct TGlyphCacheInfo { + /* 0x0 */ TGlyphCacheInfo* mPrev; + /* 0x4 */ TGlyphCacheInfo* mNext; + }; + + struct TCachePage { + /* 0x00 */ u8 field_0x0[8]; + /* 0x08 */ s16 field_0x8; + /* 0x0A */ u16 field_0xa; + /* 0x0C */ u8 field_0xc[4]; + /* 0x10 */ u8* field_0x10; + /* 0x14 */ u16 field_0x14; + /* 0x16 */ u16 field_0x16; + /* 0x18 */ u16 field_0x18; + /* 0x1A */ u16 field_0x1a; + /* 0x1C */ u16 field_0x1c; + /* 0x1E */ u16 field_0x1e; + }; // Size: 0x20 + + enum EPagingType { + PAGE_TYPE_0, + PAGE_TYPE_1, + }; + + /* 802DD188 */ JUTCacheFont(ResFONT const*, u32, JKRHeap*); + /* 802DD29C */ void deleteMemBlocks_CacheFont(); + /* 802DD320 */ void initialize_state(); + /* 802DD35C */ int getMemorySize(ResFONT const*, u16*, u32*, u16*, u32*, u16*, u32*, u32*); + /* 802DD4EC */ int initiate(ResFONT const*, void*, u32, JKRHeap*); + /* 802DD54C */ bool internal_initiate(ResFONT const*, void*, u32, JKRHeap*); + /* 802DD650 */ bool allocArea(void*, u32, JKRHeap*); + /* 802DD804 */ bool allocArray(JKRHeap*); + /* 802DDB0C */ void determineBlankPage(); + /* 802DDBBC */ void getGlyphFromAram(JUTCacheFont::TGlyphCacheInfo*, JUTCacheFont::TCachePage*, + int*, int*); + /* 802DDD98 */ void loadCache_char_subroutine(int*, bool); + /* 802DDEE0 */ void invalidiateAllCache(); + /* 802DDF68 */ void unlink(JUTCacheFont::TGlyphCacheInfo*); + /* 802DDFAC */ void prepend(JUTCacheFont::TGlyphCacheInfo*); + + /* 802DD208 */ virtual ~JUTCacheFont(); + /* 802DDCE4 */ virtual void loadImage(int, _GXTexMapID); + /* 802DD8EC */ virtual void setBlock(); + + void setPagingType(EPagingType type) { mPagingType = type; } + + static u32 calcCacheSize(u32 param_0, int param_1) { return (ALIGN_NEXT(param_0, 0x20) + 0x40) * param_1; } + +private: + /* 0x70 */ u32 mTotalWidSize; + /* 0x74 */ u32 mTotalGlySize; + /* 0x78 */ u32 mTotalMapSize; + /* 0x7C */ void* field_0x7c; + /* 0x80 */ void* field_0x80; + /* 0x84 */ void* field_0x84; + /* 0x88 */ u32 mMaxSheetSize; + /* 0x8C */ EPagingType mPagingType; + /* 0x90 */ void* mCacheBuffer; + /* 0x94 */ int field_0x94; + /* 0x98 */ u32 mCachePage; + /* 0x9C */ TGlyphCacheInfo* field_0x9c; + /* 0xA0 */ TGlyphCacheInfo* field_0xa0; + /* 0xA4 */ void* field_0xa4; + /* 0xA8 */ u32 field_0xa8; + /* 0xAC */ JKRAramBlock* field_0xac; + /* 0xB0 */ u8 field_0xb0; + /* 0xB4 */ int field_0xb4; +}; // Size: 0xB8 + +#endif /* JUTCACHEFONT_H */ diff --git a/include/JSystem/JUtility/JUTConsole.h b/include/JSystem/JUtility/JUTConsole.h new file mode 100644 index 0000000..6b15404 --- /dev/null +++ b/include/JSystem/JUtility/JUTConsole.h @@ -0,0 +1,153 @@ +#ifndef JUTCONSOLE_H +#define JUTCONSOLE_H + +#include "JSystem/JGadget/linklist.h" +#include "JSystem/JKernel/JKRDisposer.h" +#include "JSystem/JUtility/JUTFont.h" +#include "Runtime.PPCEABI.H/__va_arg.h" +#include "dolphin/types.h" + +class JUTConsole : public JKRDisposer { +public: + enum EConsoleType { + CONSOLE_TYPE_0 = 0, + CONSOLE_TYPE_1 = 1, + CONSOLE_TYPE_2 = 2, + }; + + enum OutputFlag { + /* 0x0 */ OUTPUT_NONE, + /* 0x1 */ OUTPUT_OSREPORT, + /* 0x2 */ OUTPUT_CONSOLE, + /* 0x3 */ OUTPUT_OSR_AND_CONSOLE, + }; + + /* 802E73E4 */ static JUTConsole* create(unsigned int, void*, u32); + /* 802E7354 */ static JUTConsole* create(unsigned int, unsigned int, JKRHeap*); + /* 802E746C */ JUTConsole(unsigned int, unsigned int, bool); + /* 802E75CC */ static size_t getObjectSizeFromBufferSize(unsigned int, unsigned int); + /* 802E75DC */ static size_t getLineFromObjectSize(u32, unsigned int); + /* 802E75EC */ void clear(); + /* 802E7648 */ void doDraw(JUTConsole::EConsoleType) const; + /* 802E7BB8 */ void print_f(char const*, ...); + /* 802E7C38 */ void print(char const*); + /* 802E7F7C */ void dumpToTerminal(unsigned int); + /* 802E80A8 */ void scroll(int); + /* 802E8184 */ int getUsedLine() const; + /* 802E81A8 */ int getLineOffset() const; + + /* 802E755C */ virtual ~JUTConsole(); + + void setOutput(unsigned int output) { mOutput = output; } + void setPosition(int x, int y) { + mPositionX = x; + mPositionY = y; + } + void setFontSize(f32 x, f32 y) { + mFontSizeX = x; + mFontSizeY = y; + } + void setHeight(u32 height) { + mHeight = height; + if (mHeight > mMaxLines) { + mHeight = mMaxLines; + } + } + + void setFont(JUTFont* p_font) { + mFont = p_font; + setFontSize(p_font->getWidth(), p_font->getHeight()); + } + + u32 getOutput() const { return mOutput; } + int getPositionY() const { return mPositionY; } + int getPositionX() const { return mPositionX; } + u32 getHeight() const { return mHeight; } + + bool isVisible() const { return mVisible; } + void setVisible(bool visible) { mVisible = visible; } + + void setLineAttr(int param_0, u8 param_1) { mBuf[(field_0x20 + 2) * param_0] = param_1; } + u8* getLinePtr(int param_0) const { return &mBuf[(field_0x20 + 2) * param_0] + 1; } + int diffIndex(int param_0, int param_1) const { + int diff = param_1 - param_0; + if (diff >= 0) { + return diff; + } + return diff += mMaxLines; + } + + int nextIndex(int param_0) const { + int index = param_0 + 1; + if (mMaxLines <= index) { + index = 0; + } + + return index; + } + + void scrollToLastLine() { scroll(mMaxLines); } + void scrollToFirstLine() { scroll(-mMaxLines); } + +private: + /* 0x18 */ JGadget::TLinkListNode mListNode; + +private: + /* 0x20 */ u32 field_0x20; + /* 0x24 */ u32 mMaxLines; + /* 0x28 */ u8* mBuf; + /* 0x2C */ bool field_0x2c; + /* 0x30 */ int field_0x30; + /* 0x34 */ int field_0x34; + /* 0x38 */ int field_0x38; + /* 0x3C */ int field_0x3c; + /* 0x40 */ int mPositionX; + /* 0x44 */ int mPositionY; + /* 0x48 */ u32 mHeight; + /* 0x4C */ JUTFont* mFont; + /* 0x50 */ f32 mFontSizeX; + /* 0x54 */ f32 mFontSizeY; + /* 0x58 */ int mOutput; + /* 0x5C */ JUtility::TColor field_0x5c; + /* 0x60 */ JUtility::TColor field_0x60; + /* 0x64 */ int field_0x64; + /* 0x68 */ bool mVisible; + /* 0x69 */ bool field_0x69; + /* 0x6A */ bool field_0x6a; + /* 0x6B */ bool field_0x6b; +}; // Size: 0x6C + +class JUTConsoleManager { +public: + /* 802E81CC */ JUTConsoleManager(); + /* 802E81F4 */ static JUTConsoleManager* createManager(JKRHeap*); + /* 802E8240 */ void appendConsole(JUTConsole*); + /* 802E82B0 */ void removeConsole(JUTConsole*); + /* 802E8384 */ void draw() const; + /* 802E8450 */ void drawDirect(bool) const; + /* 802E84C4 */ void setDirectConsole(JUTConsole*); + + JUTConsole* getDirectConsole() const { return mDirectConsole; } + + static JUTConsoleManager* getManager() { return sManager; } + + static JUTConsoleManager* sManager; + +private: + /* 0x00 */ JGadget::TLinkList mLinkList; + /* 0x0C */ JUTConsole* mActiveConsole; + /* 0x10 */ JUTConsole* mDirectConsole; +}; // Size: 0x14 + +extern "C" void JUTConsole_print_f_va_(JUTConsole*, const char*, va_list); +extern "C" void JUTSetReportConsole(JUTConsole*); +extern "C" JUTConsole* JUTGetReportConsole(); +extern "C" void JUTSetWarningConsole(JUTConsole*); +extern "C" JUTConsole* JUTGetWarningConsole(); +extern "C" void JUTReportConsole_f_va(const char*, va_list); +extern "C" void JUTReportConsole_f(const char*, ...); +extern "C" void JUTWarningConsole(const char* message); +extern "C" void JUTWarningConsole_f(const char* message, ...); +extern "C" void JUTReportConsole(const char* message); + +#endif /* JUTCONSOLE_H */ diff --git a/include/JSystem/JUtility/JUTDbPrint.h b/include/JSystem/JUtility/JUTDbPrint.h new file mode 100644 index 0000000..d4b6830 --- /dev/null +++ b/include/JSystem/JUtility/JUTDbPrint.h @@ -0,0 +1,43 @@ +#ifndef JUTDBPRINT_H +#define JUTDBPRINT_H + +#include "JSystem/JUtility/JUTFont.h" + +class JKRHeap; + +// TODO: fix struct +struct unk_print { + /* 0x00 */ unk_print* mNext; + /* 0x04 */ s16 unk_0x04; + /* 0x06 */ s16 unk_0x06; + /* 0x08 */ s16 unk_0x08; + /* 0x0A */ s16 unk_0x0A; + /* 0x0C */ char unk_0x0C[0]; +}; + +class JUTDbPrint { +public: + /* 802E0148 */ JUTDbPrint(JUTFont*, JKRHeap*); + /* 802E0190 */ static JUTDbPrint* start(JUTFont*, JKRHeap*); + /* 802E0204 */ JUTFont* changeFont(JUTFont*); + /* 802E021C */ void enter(int, int, int, char const*, int); + /* 802E02DC */ void flush(int, int, int, int); + /* 802E02A4 */ void flush(); + /* 802E0440 */ void drawString(int, int, int, u8 const*); + + static JUTDbPrint* getManager() { return sDebugPrint; } + + void setVisible(bool visible) { mVisible = visible; } + JUTFont* getFont() const { return mFont; } + + static JUTDbPrint* sDebugPrint; + +private: + /* 0x00 */ unk_print* mFirst; + /* 0x04 */ JUTFont* mFont; + /* 0x08 */ JUtility::TColor mColor; + /* 0x0C */ bool mVisible; + /* 0x10 */ JKRHeap* mHeap; +}; + +#endif /* JUTDBPRINT_H */ diff --git a/include/JSystem/JUtility/JUTDirectFile.h b/include/JSystem/JUtility/JUTDirectFile.h new file mode 100644 index 0000000..583e7c8 --- /dev/null +++ b/include/JSystem/JUtility/JUTDirectFile.h @@ -0,0 +1,25 @@ +#ifndef JUTDIRECTFILE_H +#define JUTDIRECTFILE_H + +#include "dolphin/dvd/dvd.h" + +#define JUTDF_BUFSIZE (0x800) + +struct JUTDirectFile { + /* 802E8730 */ int fetch32byte(); + /* 802E87F8 */ JUTDirectFile(); + /* 802E881C */ ~JUTDirectFile(); + /* 802E8860 */ bool fopen(char const*); + /* 802E88FC */ void fclose(); + /* 802E8958 */ int fgets(void*, int); + + /* 0x000 */ u8 mBuffer[0x820]; + /* 0x820 */ u8* mSectorStart; + /* 0x824 */ u32 mToRead; + /* 0x828 */ u32 mLength; + /* 0x82C */ u32 mPos; + /* 0x830 */ bool mIsOpen; + /* 0x834 */ DVDFileInfo mFileInfo; +}; + +#endif /* JUTDIRECTFILE_H */ diff --git a/include/JSystem/JUtility/JUTDirectPrint.h b/include/JSystem/JUtility/JUTDirectPrint.h new file mode 100644 index 0000000..bc17dab --- /dev/null +++ b/include/JSystem/JUtility/JUTDirectPrint.h @@ -0,0 +1,57 @@ +#ifndef JUTDIRECTPRINT_H +#define JUTDIRECTPRINT_H + +#include "JSystem/JUtility/TColor.h" +#include "Runtime.PPCEABI.H/__va_arg.h" + +class JUTDirectPrint { +private: + /* 802E41E8 */ JUTDirectPrint(); + +public: + /* 802E4288 */ void erase(int, int, int, int); + /* 802E431C */ void drawChar(int, int, int); + /* 802E456C */ void changeFrameBuffer(void*, u16, u16); + /* -------- */ void print(u16, u16, char const*, ...); + /* 802E45A4 */ void printSub(u16, u16, char const*, va_list, bool); + /* 802E46D8 */ void drawString(u16, u16, char*); + /* 802E4708 */ void drawString_f(u16, u16, char const*, ...); + /* 802E47C8 */ void setCharColor(u8, u8, u8); + /* 802E4798 */ void setCharColor(JUtility::TColor); + + /* 802E4240 */ static JUTDirectPrint* start(); + + bool isActive() const { return field_0x00 != 0; } + JUtility::TColor getCharColor() const { return mCharColor; } + + static JUTDirectPrint* getManager() { return sDirectPrint; } + +private: + static u8 sAsciiTable[128]; + static u32 sFontData[64]; + static u32 sFontData2[77]; + static JUTDirectPrint* sDirectPrint; + static u8 sDirectPrint_padding[4 /* padding */]; + +private: + /* 0x00 */ void* field_0x00; + /* 0x04 */ u16 mFrameBufferWidth; + /* 0x06 */ u16 mFrameBufferHeight; + /* 0x08 */ u16 mStride; + /* 0x0A */ u16 field_0x0A; + /* 0x0C */ size_t mFrameBufferSize; + /* 0x10 */ u8 field_0x10[4]; + /* 0x14 */ u16* mFrameBuffer; + /* 0x18 */ JUtility::TColor mCharColor; + /* 0x1C */ u16 mCharColor_Y; + /* 0x1E */ u16 mCharColor_Cb; + /* 0x20 */ u16 mCharColor_Cb2; + /* 0x22 */ u16 mCharColor_Cb4; + /* 0x24 */ u16 mCharColor_Cr; + /* 0x26 */ u16 mCharColor_Cr2; + /* 0x28 */ u16 mCharColor_Cr4; + /* 0x2A */ u16 field_0x2A; + /* 0x2C */ +}; + +#endif /* JUTDIRECTPRINT_H */ diff --git a/include/JSystem/JUtility/JUTException.h b/include/JSystem/JUtility/JUTException.h new file mode 100644 index 0000000..99da12c --- /dev/null +++ b/include/JSystem/JUtility/JUTException.h @@ -0,0 +1,141 @@ +#ifndef JUTEXCEPTION_H +#define JUTEXCEPTION_H + +#include "JSystem/JKernel/JKRThread.h" +#include "JSystem/JUtility/JUTGamePad.h" +#include "Runtime.PPCEABI.H/__va_arg.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/os/OSError.h" +#include "dolphin/types.h" +#include "global.h" + +typedef struct _GXRenderModeObj GXRenderModeObj; +typedef struct OSContext OSContext; +class JUTDirectPrint; + +class JUTExternalFB { +public: + /* 802E40CC */ JUTExternalFB(_GXRenderModeObj*, GXGamma, void*, u32); + +private: + /* 0x00 */ _GXRenderModeObj* mRenderMode; + /* 0x04 */ u32 mSize; + /* 0x08 */ u32 field_0x08; + /* 0x0C */ u16 field_0x0C; + /* 0x0E */ u16 mGamma; + /* 0x10 */ bool field_0x10; + /* 0x11 */ u8 field_[3]; +}; + +STATIC_ASSERT(sizeof(JUTExternalFB) == 0x14); + +#define JUT_PRINT_GPR 1 +#define JUT_PRINT_GPR_MAP 2 +#define JUT_PRINT_SRR0_MAP 4 +#define JUT_PRINT_FLOAT 8 +#define JUT_PRINT_STACK 16 + +class JUTException : public JKRThread { +public: + enum EInfoPage { + EINFO_PAGE_GPR = 1, + EINFO_PAGE_FLOAT = 2, + EINFO_PAGE_STACK = 3, + EINFO_PAGE_GPR_MAP = 4, + EINFO_PAGE_SSR0_MAP = 5, + }; + + class JUTExMapFile { + public: + JUTExMapFile(char* path) : mLink(this) { mPath = path; } + + public: + /* 0x00 */ char* mPath; + /* 0x04 */ JSULink mLink; + /* 0x14 */ + }; + + /* 802E1D5C */ JUTException(JUTDirectPrint*); + /* 802E40EC */ virtual ~JUTException(); + + /* 802E22C4 */ void showFloatSub(int, f32); + /* 802E2454 */ void showFloat(OSContext*); + /* 802E26B0 */ void showStack(OSContext*); + /* 802E27B0 */ void showMainInfo(u16, OSContext*, u32, u32); + /* 802E2A84 */ void showGPR(OSContext*); + /* 802E2B44 */ bool showMapInfo_subroutine(u32, bool); + /* 802E2CA0 */ void showGPRMap(OSContext*); + /* 802E2DAC */ void showSRR0Map(OSContext*); + /* 802E2E70 */ void printDebugInfo(JUTException::EInfoPage, OSError, OSContext*, u32, u32); + /* 802E2F18 */ bool isEnablePad() const; + /* 802E2F54 */ bool readPad(u32*, u32*); + /* 802E34C0 */ void printContext(u16, OSContext*, u32, u32); + /* 802E3A08 */ void createFB(); + + /* 802E1EA8 */ /* vt[03] */ virtual void* run(); + + /* 802E1E40 */ static JUTException* create(JUTDirectPrint*); + /* 802E1FCC */ static void errorHandler(OSError, OSContext*, u32, u32); + /* 802E20C0 */ static void panic_f_va(char const*, int, char const*, va_list); + /* 802E21FC */ static void panic_f(char const*, int, char const*, ...); + /* 802E227C */ static void setFPException(u32); + /* 802E2578 */ static bool searchPartialModule(u32, u32*, u32*, u32*, u32*); + /* 802E3AEC */ static OSErrorHandler setPreUserCallback(OSErrorHandler); + /* 802E3AFC */ static OSErrorHandler setPostUserCallback(OSErrorHandler); + /* 802E3B0C */ static void appendMapFile(char const*); + /* 802E3BA0 */ static bool queryMapAddress(char*, u32, s32, u32*, u32*, char*, u32, bool, bool); + /* 802E3C90 */ static bool queryMapAddress_single(char*, u32, s32, u32*, u32*, char*, u32, bool, + bool); + /* 802E3FEC */ static void createConsole(void*, u32); + /* 802E3980 */ static void waitTime(s32); + + static JUTException* getManager() { return sErrorManager; } + static JUTConsole* getConsole() { return sConsole; } + + JUTExternalFB* getFrameMemory() const { return mFrameMemory; } + + void setTraceSuppress(u32 param_0) { mTraceSuppress = param_0; } + void setGamePad(JUTGamePad* gamePad) { + mGamePad = gamePad; + mGamePadPort = JUTGamePad::Port_Unknown; + } + + static void setMapFile(const char* map) { + appendMapFile(map); + } + +private: + static OSMessageQueue sMessageQueue; + static const char* sCpuExpName[17]; + static JSUList sMapFileList; + static u8 sMessageBuffer[4 + 4 /* padding */]; + static JUTException* sErrorManager; + static OSErrorHandler sPreUserCallback; + static OSErrorHandler sPostUserCallback; + static void* sConsoleBuffer; + static u32 sConsoleBufferSize; + static JUTConsole* sConsole; + static u32 msr; + static u32 fpscr; + +private: + /* 0x7C */ JUTExternalFB* mFrameMemory; + /* 0x80 */ JUTDirectPrint* mDirectPrint; + /* 0x84 */ JUTGamePad* mGamePad; + /* 0x88 */ JUTGamePad::EPadPort mGamePadPort; + /* 0x8C */ s32 mPrintWaitTime0; + /* 0x90 */ s32 mPrintWaitTime1; + /* 0x94 */ u32 mTraceSuppress; + /* 0x98 */ u32 field_0x98; + /* 0x9C */ u32 mPrintFlags; + /* 0xA0 */ u32 mStackPointer; +}; + +STATIC_ASSERT(sizeof(JUTException) == 0xA4); + +struct JUTWarn { + JUTWarn& operator<<(const char*) { return *this; } + JUTWarn& operator<<(long) { return *this; } +}; + +#endif /* JUTEXCEPTION_H */ diff --git a/include/JSystem/JUtility/JUTFader.h b/include/JSystem/JUtility/JUTFader.h new file mode 100644 index 0000000..3ee0a6a --- /dev/null +++ b/include/JSystem/JUtility/JUTFader.h @@ -0,0 +1,35 @@ +#ifndef JUTFADER_H +#define JUTFADER_H + +#include "JSystem/JGeometry.h" +#include "JSystem/JUtility/TColor.h" + +class JUTFader { +public: + enum EStatus { + UNKSTATUS_M1 = -1, + UNKSTATUS_0 = 0, + }; + + /* 802E5530 */ JUTFader(int, int, int, int, JUtility::TColor); + /* 802E55DC */ void control(); + /* 802E57D0 */ void setStatus(JUTFader::EStatus, int); + + /* 802E5840 */ virtual ~JUTFader(); + /* 802E576C */ virtual bool startFadeIn(int); + /* 802E579C */ virtual bool startFadeOut(int); + /* 802E56DC */ virtual void draw(); + + s32 getStatus() const { return mStatus; } + void setColor(JUtility::TColor& color) { mColor.set(color); } + + /* 0x04 */ s32 mStatus; + /* 0x08 */ u16 field_0x8; + /* 0x0A */ u16 field_0xa; + /* 0x0C */ JUtility::TColor mColor; + /* 0x10 */ JGeometry::TBox2 mBox; + /* 0x20 */ int mEStatus; + /* 0x24 */ u32 field_0x24; +}; + +#endif /* JUTFADER_H */ diff --git a/include/JSystem/JUtility/JUTFont.h b/include/JSystem/JUtility/JUTFont.h new file mode 100644 index 0000000..b6cd3d9 --- /dev/null +++ b/include/JSystem/JUtility/JUTFont.h @@ -0,0 +1,128 @@ +#ifndef JUTFONT_H +#define JUTFONT_H + +#include "JSystem/JUtility/TColor.h" +#include "MSL_C/string.h" + +struct ResFONT { + struct INF1 { + /* 0x00 */ u32 magic; + /* 0x04 */ u32 size; + /* 0x08 */ u16 fontType; + /* 0x0A */ u16 ascent; + /* 0x0C */ u16 descent; + /* 0x0E */ u16 width; + /* 0x10 */ u16 leading; + /* 0x12 */ u16 defaultCode; + }; + + struct WID1 { + /* 0x00 */ u32 magic; + /* 0x04 */ u32 size; + /* 0x08 */ u16 startCode; + /* 0x0A */ u16 endCode; + /* 0x0C */ u8 mChunkNum[4]; + }; + + struct MAP1 { + /* 0x00 */ u32 magic; + /* 0x04 */ u32 size; + /* 0x08 */ u16 mappingMethod; + /* 0x0A */ u16 startCode; + /* 0x0C */ u16 endCode; + /* 0x0E */ u16 numEntries; + /* 0x10 */ u16 mLeading; + }; + + struct GLY1 { + /* 0x00 */ u32 magic; + /* 0x04 */ u32 size; + /* 0x08 */ u16 startCode; + /* 0x0A */ u16 endCode; + /* 0x0C */ u16 cellWidth; + /* 0x0E */ u16 cellHeight; + /* 0x10 */ u32 textureSize; + /* 0x14 */ u16 textureFormat; + /* 0x16 */ u16 numRows; + /* 0x18 */ u16 numColumns; + /* 0x1A */ u16 textureWidth; + /* 0x1C */ u16 textureHeight; + /* 0x1E */ u16 padding; + /* 0x20 */ u8 data[]; + }; + + /* 0x00 */ u64 magic; + /* 0x08 */ u32 filesize; + /* 0x0C */ u32 numBlocks; + /* 0x10 */ u8 padding[0x10]; + /* 0x20 */ u8 data[]; +}; + +class JUTFont { +public: + JUTFont(); + virtual ~JUTFont() {} + + struct TWidth { + u8 field_0x0; + u8 field_0x1; + }; + + /* 0x0C */ virtual void setGX() = 0; + /* 0x10 */ virtual void setGX(JUtility::TColor col1, JUtility::TColor col2); + /* 0x14 */ virtual f32 drawChar_scale(f32 a1, f32 a2, f32 a3, f32 a4, int a5, bool a6) = 0; + /* 0x18 */ virtual int getLeading() const = 0; + /* 0x1C */ virtual s32 getAscent() const = 0; + /* 0x20 */ virtual s32 getDescent() const = 0; + /* 0x24 */ virtual s32 getHeight() const = 0; + /* 0x28 */ virtual s32 getWidth() const = 0; + /* 0x2C */ virtual void getWidthEntry(int i_no, TWidth* width) const = 0; + /* 0x30 */ virtual int getCellWidth() const; + /* 0x34 */ virtual s32 getCellHeight() const; + /* 0x38 */ virtual int getFontType() const = 0; + /* 0x3C */ virtual ResFONT* getResFont() const = 0; + /* 0x40 */ virtual bool isLeadByte(int a1) const = 0; + + static bool isLeadByte_1Byte(int b); + static bool isLeadByte_2Byte(int b); + static bool isLeadByte_ShiftJIS(int b); + + void initialize_state(); + void setCharColor(JUtility::TColor col1); + void setGradColor(JUtility::TColor col1, JUtility::TColor col2); + f32 drawString_size_scale(f32 posX, f32 posY, f32 width, f32 height, const char* str, u32 usz, + bool visible); + + void drawString(int posX, int posY, const char* str, bool visible) { + drawString_size(posX, posY, str, strlen(str), visible); + } + + void drawString_size(int posX, int posY, const char* str, u32 len, bool visible) { + drawString_size_scale(posX, posY, getWidth(), getHeight(), str, len, visible); + } + + void drawString_scale(f32 posX, f32 posY, f32 width, f32 height, const char* str, + bool visible) { + drawString_size_scale(posX, posY, width, height, str, strlen(str), visible); + } + + int getWidth(int i_no) const { + TWidth width; + getWidthEntry(i_no, &width); + return width.field_0x1; + } + + bool isValid() const { return mValid; } + bool isFixed() const { return mFixed; } + int getFixedWidth() const { return mFixedWidth; } + + /* 0x04 */ bool mValid; + /* 0x05 */ bool mFixed; + /* 0x08 */ int mFixedWidth; + /* 0x0C */ JUtility::TColor mColor1; + /* 0x10 */ JUtility::TColor mColor2; + /* 0x14 */ JUtility::TColor mColor3; + /* 0x18 */ JUtility::TColor mColor4; +}; + +#endif /* JUTFONT_H */ diff --git a/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h b/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h new file mode 100644 index 0000000..98ee9ff --- /dev/null +++ b/include/JSystem/JUtility/JUTFontData_Ascfont_fix12.h @@ -0,0 +1,6 @@ +#ifndef JUTFONTDATA_ASCFONT_FIX12_H +#define JUTFONTDATA_ASCFONT_FIX12_H + +#include "dolphin/types.h" + +#endif /* JUTFONTDATA_ASCFONT_FIX12_H */ diff --git a/include/JSystem/JUtility/JUTGamePad.h b/include/JSystem/JUtility/JUTGamePad.h new file mode 100644 index 0000000..5e32621 --- /dev/null +++ b/include/JSystem/JUtility/JUTGamePad.h @@ -0,0 +1,283 @@ +#ifndef JUTGAMEPAD_H +#define JUTGAMEPAD_H + +#include "JSystem/JKernel/JKRDisposer.h" +#include "dolphin/os/OSTime.h" +#include "dolphin/pad/Pad.h" +#include "dolphin/types.h" + +typedef void (*callbackFn)(int, void*); + +namespace CButton { +enum { + DPAD_LEFT = 0x0001, + DPAD_RIGHT = 0x0002, + DPAD_DOWN = 0x0004, + DPAD_UP = 0x0008, + Z = 0x0010, + R = 0x0020, + L = 0x0040, + A = 0x0100, + B = 0x0200, + X = 0x0400, + Y = 0x0800, + START = 0x1000, +}; +} + +extern bool sResetSwitchPushing__Q210JUTGamePad13C3ButtonReset; + +struct JUTGamePadRecordBase { + virtual void unk0() {} + virtual void unk1(PADStatus* pad) {} + virtual void unk2() {} + + /* 0x4 */ bool mActive; +}; + +struct JUTGamePad : public JKRDisposer { +public: + enum EStickMode { + STICK_MODE_1 = 1, + }; + enum EWhichStick { + WS_MAIN_STICK, + WS_SUB_STICK, + }; + enum EPadPort { + Port_Unknown = -1, + Port_1, + Port_2, + Port_3, + Port_4, + }; + + JUTGamePad(JUTGamePad::EPadPort port); + virtual ~JUTGamePad(); + + void initList(); + static s32 init(); + void clear(); + static u32 read(); + void assign(); + void checkResetCallback(OSTime unk); + void update(); + void stopPatternedRumble() { mRumble.stopPatternedRumble(mPortNum); } + static void checkResetSwitch(); + static void clearForReset(); + static JUTGamePad* getGamePad(int pad_index); + static bool recalibrate(u32 pad_mask); + + static void setAnalogMode(u32 mode) { + sAnalogMode = mode; + PADSetAnalogMode(mode); + } + + static void clearResetOccurred() { C3ButtonReset::sResetOccurred = false; } + + static void setResetCallback(callbackFn callback, void* param_0) { + C3ButtonReset::sCallback = callback; + C3ButtonReset::sCallbackArg = param_0; + } + + u32 getButton() const { return mButton.mButton; } + + u32 getTrigger() const { return mButton.mTrigger; } + + f32 getMainStickX() const { return mMainStick.mPosX; } + + f32 getMainStickY() const { return mMainStick.mPosY; } + + f32 getMainStickValue() const { return mMainStick.mValue; } + + s16 getMainStickAngle() const { return mMainStick.mAngle; } + + f32 getSubStickX() const { return mSubStick.mPosX; } + + f32 getSubStickY() const { return mSubStick.mPosY; } + + f32 getSubStickValue() const { return mSubStick.mValue; } + + s16 getSubStickAngle() const { return mSubStick.mAngle; } + + u8 getAnalogA() const { return mButton.mAnalogA; } + + u8 getAnalogB() const { return mButton.mAnalogB; } + + u8 getAnalogL() const { return mButton.mAnalogL; } + + u8 getAnalogR() const { return mButton.mAnalogR; } + + s8 getErrorStatus() const { return mErrorStatus; } + + s16 getPortNum() const { return mPortNum; } + + JUTGamePadRecordBase* getPadReplay() const { return mPadReplay; } + + JUTGamePadRecordBase* getPadRecord() const { return mPadRecord; } + + u32 testTrigger(u32 button) const { return mButton.mTrigger & button; } + + bool isPushing3ButtonReset() const { + bool isPushingReset = false; + + if (mPortNum != -1 && mButtonReset.mReset != false) { + isPushingReset = true; + } + return isPushingReset; + } + + inline void stopMotorWave() { mRumble.stopPatternedRumbleAtThePeriod(); } + void stopMotor() { mRumble.stopMotor(mPortNum, false); } + void stopMotorHard() { mRumble.stopMotorHard(mPortNum); } + + static s8 getPortStatus(u32 port) { return mPadStatus[port].error; } + + struct CButton { + CButton() { clear(); } + void clear(); + void update(PADStatus const*, u32 unk); + void setRepeat(u32 unk0, u32 unk1, u32 unk2); + + /* 0x00 */ u32 mButton; + /* 0x04 */ u32 mTrigger; // Pressed Buttons + /* 0x08 */ u32 mRelease; // Released Buttons + /* 0x0C */ u8 mAnalogA; + /* 0x0D */ u8 mAnalogB; + /* 0x0E */ u8 mAnalogL; + /* 0x0F */ u8 mAnalogR; + /* 0x10 */ f32 mAnalogLf; + /* 0x14 */ f32 mAnalogRf; + /* 0x18 */ u32 mRepeat; + /* 0x1C */ u32 field_0x1c; + /* 0x20 */ u32 field_0x20; + /* 0x24 */ u32 field_0x24; + /* 0x28 */ u32 field_0x28; + /* 0x2C */ u32 field_0x2c; + }; // Size: 0x30 + + struct C3ButtonReset { + C3ButtonReset() { mReset = false; } + + static u32 sResetPattern; + static u32 sResetMaskPattern; + static callbackFn sCallback; + static void* sCallbackArg; + static OSTime sThreshold; + static s32 sResetOccurredPort; + static bool sResetOccurred; + static bool sResetSwitchPushing; + + /* 0x0 */ bool mReset; + }; // Size: 0x4 + + struct CStick { + static f32 sPressPoint; + static f32 sReleasePoint; + + CStick() { clear(); } + void clear(); + void clear(JUTGamePad* pad); + u32 update(s8 unk0, s8 unk1, JUTGamePad::EStickMode mode, JUTGamePad::EWhichStick stick, + u32 unk2); + u32 getButton(u32 unk); + + /* 0x0 */ f32 mPosX; + /* 0x4 */ f32 mPosY; + /* 0x8 */ f32 mValue; + /* 0xC */ s16 mAngle; + /* 0xE */ s8 field_0xe; + /* 0xF */ s8 field_0xf; + }; // Size: 0x10 + + void stopMotorWaveHard() { mRumble.stopPatternedRumble(mPortNum); } + + struct CRumble { + CRumble(JUTGamePad* pad) { clear(pad); } + + static PADMask sChannelMask[4]; + static bool mStatus[4]; + static PADMask mEnabled; + + enum ERumble { + VAL_0 = 0, + VAL_1 = 1, + VAL_2 = 2, + }; + + void clear(); + void clear(JUTGamePad* pad); + static void startMotor(int channel); + static void stopMotor(int channel, bool stop); + void update(s16 unk0); + void triggerPatternedRumble(u32 unk0); + void startPatternedRumble(void* unk0, ERumble rumble, u32 unk1); + void stopPatternedRumble(s16 pad_port); + void stopPatternedRumbleAtThePeriod(); + static void setEnabled(u32 pad_mask); + + void stopMotorHard(int portNo) { stopMotor(portNo, true); } + + static bool isEnabled(u32 mask) { return mEnabled & mask; } + static bool isEnabledPort(int port) { return isEnabled(sChannelMask[port]); } + + /* 0x00 */ u32 field_0x0; + /* 0x04 */ u32 field_0x4; + /* 0x08 */ u8* field_0x8; + /* 0x0C */ u32 field_0xc; + /* 0x10 */ u8* field_0x10; + }; // Size: 0x14 + + void startMotorWave(void* param_2, CRumble::ERumble rumble, u32 param_4) { + mRumble.startPatternedRumble(param_2, rumble, param_4); + } + + /* 0x18 */ CButton mButton; + /* 0x48 */ CStick mMainStick; + /* 0x58 */ CStick mSubStick; + /* 0x68 */ CRumble mRumble; + /* 0x7C */ s16 mPortNum; + /* 0x7E */ s8 mErrorStatus; + /* 0x80 */ JSULink mLink; + /* 0x90 */ JUTGamePadRecordBase* mPadRecord; + /* 0x94 */ JUTGamePadRecordBase* mPadReplay; + /* 0x98 */ C3ButtonReset mButtonReset; + /* 0x9C */ u8 field_0x9c[4]; + /* 0xA0 */ OSTime mResetTime; + /* 0xA8 */ u8 field_0xa8; + + static JSUList mPadList; + static bool mListInitialized; + static PADStatus mPadStatus[4]; + static CButton mPadButton[4]; + static CStick mPadMStick[4]; + static CStick mPadSStick[4]; + static EStickMode sStickMode; + static u32 sClampMode; + static u8 mPadAssign[4]; + static u32 sSuppressPadReset; + static s32 sAnalogMode; + static u32 sRumbleSupported; +}; + +struct JUTGamePadLongPress { + static JSUList sPatternList; + void checkCallback(int port, u32 timer); + + u32 getMaskPattern() const { return mMaskPattern; } + u32 getPattern() const { return mPattern; } + + /* 0x00 */ u8 field_0x0[0x10]; + /* 0x10 */ bool mValid; + /* 0x11 */ bool field_0x11; + /* 0x14 */ u32 mPattern; + /* 0x18 */ u32 mMaskPattern; + /* 0x1C */ u32 field_0x1c; + /* 0x20 */ bool field_0x20[4]; + /* 0x28 */ OSTime mTimer[4]; + /* 0x48 */ bool field_0x48[4]; + /* 0x4C */ void (*mCallback)(s32, JUTGamePadLongPress*, s32); + /* 0x50 */ s32 field_0x50; +}; + +#endif /* JUTGAMEPAD_H */ diff --git a/include/JSystem/JUtility/JUTGraphFifo.h b/include/JSystem/JUtility/JUTGraphFifo.h new file mode 100644 index 0000000..6304ec0 --- /dev/null +++ b/include/JSystem/JUtility/JUTGraphFifo.h @@ -0,0 +1,36 @@ +#ifndef JUTGRAPHFIFO_H +#define JUTGRAPHFIFO_H + +#include "dolphin/gx/GX.h" + +class JUTGraphFifo { +public: + /* 802DEB58 */ JUTGraphFifo(u32); + + /* 802DEC34 */ virtual ~JUTGraphFifo(); + + void getGpStatus() { + GXGetGPStatus((GXBool*)&mGpStatus[0], (GXBool*)&mGpStatus[1], (GXBool*)&mGpStatus[2], + (GXBool*)&mGpStatus[3], (GXBool*)&mGpStatus[4]); + } + + bool isGPActive() { + getGpStatus(); + return mGpStatus[2] == false; + } + + void save() { GXSaveCPUFifo(this->mFifo); } + + static JUTGraphFifo* sCurrentFifo; + static bool mGpStatus[5]; + +private: + /* 0x04 */ GXFifoObj* mFifo; + /* 0x08 */ void* mBase; + /* 0x0C */ u32 mSize; + /* 0x10 */ u8 field_0x10[0xC]; +}; + +inline void JUTCreateFifo(u32 bufSize) { new JUTGraphFifo(bufSize); } + +#endif /* JUTGRAPHFIFO_H */ diff --git a/include/JSystem/JUtility/JUTNameTab.h b/include/JSystem/JUtility/JUTNameTab.h new file mode 100644 index 0000000..d6c17bd --- /dev/null +++ b/include/JSystem/JUtility/JUTNameTab.h @@ -0,0 +1,37 @@ +#ifndef JUTNAMETAB_H +#define JUTNAMETAB_H + +#include "dolphin/types.h" + +struct ResNTAB { + u16 mEntryNum; + u16 mPad0; + struct Entry { + u16 mKeyCode; + u16 mOffs; + } mEntries[1]; + + inline const char* getName(u32 index) const { + return ((const char*)mEntries) + mEntries[index].mOffs - 4; + } +}; + +class JUTNameTab { +public: + JUTNameTab(); + JUTNameTab(const ResNTAB* pNameTable); + virtual ~JUTNameTab() {}; + + void setResource(const ResNTAB* pNameTable); + s32 getIndex(char const*) const; + const char* getName(u16 index) const; + u16 calcKeyCode(char const* pName) const; + const ResNTAB* getResNameTable() const { return mNameTable; } + +private: + /* 0x4 */ const ResNTAB* mNameTable; + /* 0x8 */ const char* mpStrData; + /* 0xC */ u16 mNameNum; +}; + +#endif /* JUTNAMETAB_H */ diff --git a/include/JSystem/JUtility/JUTPalette.h b/include/JSystem/JUtility/JUTPalette.h new file mode 100644 index 0000000..4a3d297 --- /dev/null +++ b/include/JSystem/JUtility/JUTPalette.h @@ -0,0 +1,44 @@ +#ifndef JUTPALETTE_H +#define JUTPALETTE_H + +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" + +enum JUTTransparency { UNK0, UNK1 }; + +struct ResTLUT { + u8 format; + u8 transparency; + u16 numColors; +}; + +class JUTPalette { +public: + JUTPalette(_GXTlut p1, _GXTlutFmt p2, JUTTransparency p3, u16 p4, void* p5) { + this->storeTLUT(p1, p2, p3, p4, p5); + } + + JUTPalette(GXTlut tlutNo, ResTLUT* p_tlutRes) { + storeTLUT(tlutNo, p_tlutRes); + } + + /* 802DE890 */ void storeTLUT(_GXTlut, ResTLUT*); + /* 802DE91C */ void storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, u16, void*); + /* 802DE95C */ bool load(); + + u8 getTlutName() const { return mTlutName; } + u8 getFormat() const { return mFormat; } + u8 getTransparency() const { return mTransparency; } + u16 getNumColors() const { return mNumColors; } + ResTLUT* getColorTable() const { return mColorTable; } + +private: + /* 0x00 */ _GXTlutObj mTlutObj; + /* 0x0C */ u8 mTlutName; + /* 0x0D */ u8 mFormat; + /* 0x10 */ ResTLUT* mColorTable; + /* 0x14 */ u16 mNumColors; + /* 0x16 */ u8 mTransparency; +}; + +#endif /* JUTPALETTE_H */ diff --git a/include/JSystem/JUtility/JUTProcBar.h b/include/JSystem/JUtility/JUTProcBar.h new file mode 100644 index 0000000..5fb899e --- /dev/null +++ b/include/JSystem/JUtility/JUTProcBar.h @@ -0,0 +1,103 @@ +#ifndef JUTPROCBAR_H +#define JUTPROCBAR_H + +#include "JSystem/JUtility/TColor.h" +#include "dolphin/os/OSTime.h" + +class JKRHeap; + +class JUTProcBar { +public: + class CTime { + public: + /* 802E7340 */ CTime(); + + void start(u8 param_0, u8 param_1, u8 param_2) { + mR = param_0; + mG = param_1; + mB = param_2; + mTick = OSGetTick(); + } + + void end() { + mCost = ((OSGetTick() - mTick) * 8) / ((*(u32*)0x800000F8 / 4) / 125000); + if (mCost == 0) { + mCost = 1; + } + } + + void accumePeek() { + if (++field_0xc >= 0x10 || mCost >= field_0x8) { + field_0x8 = mCost; + field_0xc = 0; + } + } + + int calcBarSize(int p1, int p2) { return mCost * p1 / p2; } + + /* 0x00 */ u32 mTick; + /* 0x04 */ u32 mCost; + /* 0x08 */ u32 field_0x8; + /* 0x0C */ u32 field_0xc; + /* 0x10 */ u8 mR; + /* 0x11 */ u8 mG; + /* 0x12 */ u8 mB; + }; + + class CParamSet { + public: + /* 0x00 */ int mBarWidth; + /* 0x04 */ int mPosX; + /* 0x08 */ int mPosY; + /* 0x0C */ int mWidth; + /* 0x10 */ int mUserPosition; + }; + + /* 802E5888 */ JUTProcBar(); + /* 802E599C */ ~JUTProcBar(); + /* 802E59E0 */ static JUTProcBar* create(); + /* 802E5A28 */ static void destroy(); + /* 802E5A60 */ static void clear(); + /* 802E5B30 */ void bar_subroutine(int, int, int, int, int, int, int, JUtility::TColor, + JUtility::TColor); + /* 802E5CC4 */ void adjustMeterLength(u32, f32*, f32, f32, int*); + /* 802E5E08 */ void draw(); + /* 802E5E3C */ void drawProcessBar(); + /* 802E6FA0 */ void drawHeapBar(); + + void cpuStart() { mCpu.start(255, 129, 30); } + void cpuEnd() { mCpu.end(); } + void gpWaitStart() { mGpWait.start(255, 129, 30); } + void gpWaitEnd() { mGpWait.end(); } + void gpStart() { mGp.start(255, 129, 30); } + void gpEnd() { mGp.end(); } + void wholeLoopStart() { mWholeLoop.start(255, 129, 30); } + void wholeLoopEnd() { mWholeLoop.end(); } + void idleStart() { mIdle.start(255, 129, 30); } + void idleEnd() { mIdle.end(); } + void setCostFrame(int frame) { mCostFrame = frame; } + void setVisible(bool visible) { mVisible = visible; } + void setVisibleHeapBar(bool visible) { mHeapBarVisible = visible; } + + static JUTProcBar* getManager() { return sManager; } + + static JUTProcBar* sManager; + +private: + /* 0x000 */ CTime mIdle; + /* 0x014 */ CTime mGp; + /* 0x028 */ CTime mCpu; + /* 0x03C */ CTime mGpWait; + /* 0x050 */ CTime mWholeLoop; + /* 0x064 */ CTime mUsers[8]; + /* 0x104 */ int mCostFrame; + /* 0x108 */ int field_0x108; + /* 0x10C */ bool mVisible; + /* 0x110 */ int field_0x110; + /* 0x114 */ CParamSet mParams; + /* 0x128 */ int field_0x128; + /* 0x12C */ JKRHeap* mWatchHeap; + /* 0x130 */ bool mHeapBarVisible; +}; + +#endif /* JUTPROCBAR_H */ diff --git a/include/JSystem/JUtility/JUTReport.h b/include/JSystem/JUtility/JUTReport.h new file mode 100644 index 0000000..f38f317 --- /dev/null +++ b/include/JSystem/JUtility/JUTReport.h @@ -0,0 +1,7 @@ +#ifndef JSYSTEM_JUTILITY_JUTREPORT_H +#define JSYSTEM_JUTILITY_JUTREPORT_H + +void JUTReport(int x_pos, int y_pos, const char* str, ...); +void JUTReport(int x_pos, int y_pos, int, const char* str, ...); + +#endif \ No newline at end of file diff --git a/include/JSystem/JUtility/JUTResFont.h b/include/JSystem/JUtility/JUTResFont.h new file mode 100644 index 0000000..4e5a057 --- /dev/null +++ b/include/JSystem/JUtility/JUTResFont.h @@ -0,0 +1,74 @@ +#ifndef JUTRESFONT_H +#define JUTRESFONT_H + +#include "JSystem/JUtility/JUTFont.h" +#include "dolphin/gx/GXEnum.h" + +class JKRHeap; + +typedef bool (*IsLeadByte_func)(int); + +struct BlockHeader { + const BlockHeader* getNext() const { return reinterpret_cast(reinterpret_cast(this) + size); } + u32 magic; + u32 size; +}; + +class JUTResFont : public JUTFont { +public: + /* 802DF000 */ virtual ~JUTResFont(); + /* 802DF48C */ virtual void setGX(); + /* 802DF584 */ virtual void setGX(JUtility::TColor, JUtility::TColor); + /* 802DF7C4 */ virtual f32 drawChar_scale(f32, f32, f32, f32, int, bool); + /* 802DDFEC */ virtual int getLeading() const; + /* 802DE004 */ virtual s32 getAscent() const; + /* 802DE010 */ virtual s32 getDescent() const; + /* 802DE01C */ virtual s32 getHeight() const; + /* 802DDFF8 */ virtual s32 getWidth() const; + /* 802DFC64 */ virtual void getWidthEntry(int, JUTFont::TWidth*) const; + /* 802DFD0C */ virtual int getCellWidth() const; + /* 802DFD58 */ virtual s32 getCellHeight() const; + /* 802DDFE0 */ virtual int getFontType() const; + /* 802DDFD8 */ virtual ResFONT* getResFont() const; + /* 802DFDA4 */ virtual bool isLeadByte(int) const; + /* 802DFF60 */ virtual void loadImage(int, _GXTexMapID); + /* 802DF344 */ virtual void setBlock(); + + /* 802DEF94 */ JUTResFont(ResFONT const*, JKRHeap*); + /* 802DEF48 */ JUTResFont(); + /* 802DF08C */ void deleteMemBlocks_ResFont(); + /* 802DF0B0 */ void initialize_state(); + /* 802DF0DC */ bool initiate(ResFONT const*, JKRHeap*); + /* 802DF13C */ bool protected_initiate(ResFONT const*, JKRHeap*); + /* 802DF248 */ void countBlock(); + /* 802DFBE8 */ void loadFont(int, _GXTexMapID, JUTFont::TWidth*); + /* 802DFDD8 */ int getFontCode(int) const; + /* 802E00C4 */ int convertSjis(int, u16*) const; + + inline void delete_and_initialize() { + deleteMemBlocks_ResFont(); + initialize_state(); + } + + static IsLeadByte_func const saoAboutEncoding_[3]; + + // some types uncertain, may need to be fixed + /* 0x1C */ int mWidth; + /* 0x20 */ int mHeight; + /* 0x24 */ _GXTexObj field_0x24; + /* 0x44 */ int field_0x44; + /* 0x48 */ const ResFONT* mResFont; + /* 0x4C */ ResFONT::INF1* mInf1Ptr; + /* 0x50 */ void** mMemBlocks; + /* 0x54 */ ResFONT::WID1** mpWidthBlocks; + /* 0x58 */ ResFONT::GLY1** mpGlyphBlocks; + /* 0x5C */ ResFONT::MAP1** mpMapBlocks; + /* 0x60 */ u16 mWid1BlockNum; + /* 0x62 */ u16 mGly1BlockNum; + /* 0x64 */ u16 mMap1BlockNum; + /* 0x66 */ u16 field_0x66; + /* 0x68 */ u16 mMaxCode; + /* 0x6C */ IsLeadByte_func* mIsLeadByte; +}; + +#endif /* JUTRESFONT_H */ diff --git a/include/JSystem/JUtility/JUTResource.h b/include/JSystem/JUtility/JUTResource.h new file mode 100644 index 0000000..8a6b312 --- /dev/null +++ b/include/JSystem/JUtility/JUTResource.h @@ -0,0 +1,30 @@ +#ifndef JUTRESOURCE_H +#define JUTRESOURCE_H + +#include "dolphin/types.h" + +class JKRArchive; +class JSUInputStream; + +class JUTResReference { +private: + /* 0x001 */ u8 mType; + /* 0x002 */ u8 mNameLength; + /* 0x003 */ char mName[0x100]; + +public: + enum ResType { + RESTYPE_Null = 0, + RESTYPE_Unk1 = 1, + RESTYPE_Unk2 = 2, + RESTYPE_Unk3 = 3, + RESTYPE_Unk4 = 4, + }; + JUTResReference() { mType = 0; } + /* 802DE078 */ void* getResource(JSUInputStream*, u32, JKRArchive*); + /* 802DE120 */ void* getResource(void const*, u32, JKRArchive*); + /* 802DE1BC */ void* getResource(u32, JKRArchive*); +}; +// only rough size known due to getPointer__7J2DPaneFP20JSURandomInputStreamUlP10JKRArchive + +#endif /* JUTRESOURCE_H */ diff --git a/include/JSystem/JUtility/JUTTexture.h b/include/JSystem/JUtility/JUTTexture.h new file mode 100644 index 0000000..f55f321 --- /dev/null +++ b/include/JSystem/JUtility/JUTTexture.h @@ -0,0 +1,106 @@ +#ifndef JUTTEXTURE_H +#define JUTTEXTURE_H + +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" + +class JUTPalette; + +/* + * Acts as the header to image data. Usually texture data immediately follows it, + * so any pointer arithmetic to go past the end of this structure is so that a + * variable sized allocated buffer can be accessed. + */ +struct ResTIMG { + /* 0x00 */ u8 format; + /* 0x01 */ u8 alphaEnabled; + /* 0x02 */ u16 width; + /* 0x04 */ u16 height; + /* 0x06 */ u8 wrapS; + /* 0x07 */ u8 wrapT; + /* 0x08 */ u8 indexTexture; + /* 0x09 */ u8 colorFormat; + /* 0x0A */ u16 numColors; + /* 0x0C */ u32 paletteOffset; + /* 0x10 */ u8 mipmapEnabled; + /* 0x11 */ u8 doEdgeLOD; + /* 0x12 */ u8 biasClamp; + /* 0x13 */ u8 maxAnisotropy; + /* 0x14 */ u8 minFilter; + /* 0x15 */ u8 magFilter; + /* 0x16 */ s8 minLOD; + /* 0x17 */ s8 maxLOD; + /* 0x18 */ u8 mipmapCount; + /* 0x19 */ u8 unknown; + /* 0x1A */ s16 LODBias; + /* 0x1C */ u32 imageOffset; +}; // Size: 0x20 + +class JUTTexture { +public: + JUTTexture() { + setCaptureFlag(false); + mEmbPalette = NULL; + mTexInfo = NULL; + } + + JUTTexture(const ResTIMG* p_timg, u8 param_1) { + mEmbPalette = NULL; + storeTIMG(p_timg, param_1); + setCaptureFlag(false); + } + + ~JUTTexture(); + void storeTIMG(ResTIMG const*, JUTPalette*, _GXTlut); + void storeTIMG(ResTIMG const*, u8); + void storeTIMG(ResTIMG const*, JUTPalette*); + void attachPalette(JUTPalette*); + void init(); + void initTexObj(_GXTlut); + void initTexObj(); + void load(_GXTexMapID); + + const ResTIMG* getTexInfo() const { return mTexInfo; } + u8 getFormat() const { return mTexInfo->format; } + s32 getTransparency() { return mTexInfo->alphaEnabled; } + s32 getWidth() const { return mTexInfo->width; } + s32 getHeight() const { return mTexInfo->height; } + void setCaptureFlag(bool flag) { mFlags &= 2 | flag; } + u8 getCaptureFlag() const { return mFlags & 1; } + u8 getEmbPaletteDelFlag() const { return mFlags & 2; } + void setEmbPaletteDelFlag(bool flag) { mFlags = (mFlags & 1) | (flag << 1);} + u8 getTlutName() const { return mTlutName; } + bool operator==(const JUTTexture& other) { + return mTexInfo == other.mTexInfo + && field_0x2c == other.field_0x2c + && mWrapS == other.mWrapS + && mWrapT == other.mWrapT + && mMinFilter == other.mMinFilter + && mMagFilter == other.mMagFilter + && mMinLOD == other.mMinLOD + && mMinLOD == other.mMinLOD + && mLODBias == other.mLODBias; + } + bool operator!=(const JUTTexture& other) { + return !operator==(other); + } + +private: + /* 0x00 */ GXTexObj mTexObj; + /* 0x20 */ const ResTIMG* mTexInfo; + /* 0x24 */ void* mTexData; + /* 0x28 */ JUTPalette* mEmbPalette; + /* 0x2C */ JUTPalette* field_0x2c; + /* 0x30 */ u8 mWrapS; + /* 0x31 */ u8 mWrapT; + /* 0x32 */ u8 mMinFilter; + /* 0x33 */ u8 mMagFilter; + /* 0x34 */ u16 mMinLOD; + /* 0x36 */ u16 mMaxLOD; + /* 0x38 */ s16 mLODBias; + /* 0x3A */ u8 mTlutName; + /* 0x3B */ u8 mFlags; + /* 0x3C */ void* field_0x3c; +}; + +#endif /* JUTTEXTURE_H */ diff --git a/include/JSystem/JUtility/JUTVideo.h b/include/JSystem/JUtility/JUTVideo.h new file mode 100644 index 0000000..1cf622b --- /dev/null +++ b/include/JSystem/JUtility/JUTVideo.h @@ -0,0 +1,74 @@ +#ifndef JUTVIDEO_H +#define JUTVIDEO_H + +#include "dolphin/gx/GXStruct.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSTime.h" +#include "dolphin/vi/vi.h" + +typedef u8 (*Pattern)[2]; + +class JUTVideo { +public: + typedef void (*Callback)(u32); + + JUTVideo(GXRenderModeObj const*); + virtual ~JUTVideo(); + + // TODO: return types not confirmed + /* 802E4C54 */ static JUTVideo* createManager(GXRenderModeObj const*); + /* 802E4CAC */ static void destroyManager(); + /* 802E5088 */ static void drawDoneStart(); + /* 802E50B0 */ static void dummyNoDrawWait(); + /* 802E5198 */ void setRenderMode(GXRenderModeObj const*); + /* 802E5210 */ void waitRetraceIfNeed(); + + /* 802E4E50 */ static void preRetraceProc(u32); + /* 802E5144 */ static void postRetraceProc(u32); + /* 802E50BC */ static void drawDoneCallback(); + + u16 getFbWidth() const { return mRenderObj->fb_width; } + u16 getEfbHeight() const { return mRenderObj->efb_height; } + void getBounds(u16& width, u16& height) const { + width = (u16)getFbWidth(); + height = (u16)getEfbHeight(); + } + u16 getXfbHeight() const { return mRenderObj->xfb_height; } + u32 isAntiAliasing() const { return mRenderObj->antialiasing; } + Pattern getSamplePattern() const { return mRenderObj->sample_pattern; } + u8* getVFilter() const { return mRenderObj->vfilter; } + OSMessageQueue* getMessageQueue() { return &mMessageQueue; } + + static JUTVideo* getManager() { return sManager; } + static OSTick getVideoInterval() { return sVideoInterval; } + static OSTick getVideoLastTick() { return sVideoLastTick; } + + GXRenderModeObj* getRenderMode() const { return mRenderObj; } + +private: + static JUTVideo* sManager; + static OSTick sVideoLastTick; + static OSTick sVideoInterval; + +private: + /* 0x04 */ _GXRenderModeObj* mRenderObj; + /* 0x08 */ u32 field_0x8; + /* 0x0C */ u32 mRetraceCount; + /* 0x10 */ u32 field_0x10; + /* 0x14 */ u32 field_0x14; + /* 0x18 */ u32 field_0x18; + /* 0x1C */ VIRetraceCallback mPreRetraceCallback; + /* 0x20 */ VIRetraceCallback mPostRetraceCallback; + /* 0x24 */ Callback mPreCallback; + /* 0x28 */ Callback mPostCallback; + /* 0x2C */ bool mSetBlack; + /* 0x30 */ s32 mSetBlackFrameCount; + /* 0x34 */ OSMessage mMessage; + /* 0x38 */ OSMessageQueue mMessageQueue; +}; + +inline JUTVideo* JUTGetVideoManager() { + return JUTVideo::getManager(); +} + +#endif /* JUTVIDEO_H */ diff --git a/include/JSystem/JUtility/JUTXfb.h b/include/JSystem/JUtility/JUTXfb.h new file mode 100644 index 0000000..682529e --- /dev/null +++ b/include/JSystem/JUtility/JUTXfb.h @@ -0,0 +1,71 @@ +#ifndef JUTXFB_H +#define JUTXFB_H + +#include "JSystem/JUtility/JUTVideo.h" + +typedef struct _GXRenderModeObj GXRenderModeObj; +class JKRHeap; + +class JUTXfb { +public: + enum EXfbNumber { // TODO: placeholder + UNK_0 = 0, + UNK_1 = 1, + UNK_2 = 2, + UNK_3 = 3, + }; + + /* 802E5214 */ void clearIndex(); + /* 802E5228 */ void common_init(int); + /* 802E5260 */ JUTXfb(_GXRenderModeObj const*, JKRHeap*, JUTXfb::EXfbNumber); + /* 802E5308 */ ~JUTXfb(); + /* 802E5378 */ void delXfb(int); + /* 802E53B8 */ static JUTXfb* createManager(JKRHeap*, JUTXfb::EXfbNumber); + /* 802E5424 */ static void destroyManager(); + /* 802E5454 */ void initiate(u16, u16, JKRHeap*, JUTXfb::EXfbNumber); + + s32 getBufferNum() const { return mBufferNum; } + s16 getDrawnXfbIndex() const { return mDrawnXfbIndex; } + s16 getDrawingXfbIndex() const { return mDrawingXfbIndex; } + s16 getDisplayingXfbIndex() const { return mDisplayingXfbIndex; } + s32 getSDrawingFlag() const { return mSDrawingFlag; } + + void* getDrawnXfb() const { + if (mDrawnXfbIndex >= 0) + return mBuffer[mDrawnXfbIndex]; + return NULL; + } + + void* getDrawingXfb() const { + if (mDrawingXfbIndex >= 0) + return mBuffer[mDrawingXfbIndex]; + return NULL; + } + + void* getDisplayingXfb() const { + if (mDisplayingXfbIndex >= 0) + return mBuffer[mDisplayingXfbIndex]; + return NULL; + } + + void setDisplayingXfbIndex(s16 index) { mDisplayingXfbIndex = index; } + void setSDrawingFlag(s32 flag) { mSDrawingFlag = flag; } + void setDrawnXfbIndex(s16 index) { mDrawnXfbIndex = index; } + void setDrawingXfbIndex(s16 index) { mDrawingXfbIndex = index; } + + static JUTXfb* getManager() { return sManager; } + +private: + static JUTXfb* sManager; + +private: + /* 0x00 */ void* mBuffer[3]; + /* 0x0C */ bool mXfbAllocated[3]; + /* 0x10 */ s32 mBufferNum; + /* 0x14 */ s16 mDrawingXfbIndex; + /* 0x16 */ s16 mDrawnXfbIndex; + /* 0x18 */ s16 mDisplayingXfbIndex; + /* 0x1C */ s32 mSDrawingFlag; +}; + +#endif /* JUTXFB_H */ diff --git a/include/JSystem/JUtility/TColor.h b/include/JSystem/JUtility/TColor.h new file mode 100644 index 0000000..6550a48 --- /dev/null +++ b/include/JSystem/JUtility/TColor.h @@ -0,0 +1,34 @@ +#ifndef TCOLOR_H +#define TCOLOR_H + +#include "dolphin/gx/GXStruct.h" + +namespace JUtility { +struct TColor : public GXColor { + TColor(u8 r, u8 g, u8 b, u8 a) { set(r, g, b, a); } + TColor() { set(0xffffffff); } + TColor(u32 u32Color) { set(u32Color); } + TColor(GXColor color) { set(color); } + + // TColor(const TColor& other) { set(other.toUInt32()); } + TColor& operator=(const TColor& other) { + ((GXColor*)this)->operator=(other); + return *this; + } + + operator u32() const { return toUInt32(); } + u32 toUInt32() const { return *(u32*)&r; } + + void set(u8 cR, u8 cG, u8 cB, u8 cA) { + r = cR; + g = cG; + b = cB; + a = cA; + } + + void set(u32 u32Color) { *(u32*)&r = u32Color; } + void set(GXColor gxColor) { *(GXColor*)&r = gxColor; } +}; +} // namespace JUtility + +#endif \ No newline at end of file diff --git a/include/SSystem/SComponent/c_API.h b/include/SSystem/SComponent/c_API.h index ab8ad9f..a369cfe 100644 --- a/include/SSystem/SComponent/c_API.h +++ b/include/SSystem/SComponent/c_API.h @@ -3,6 +3,17 @@ typedef void (*cAPIGph_Mthd)(void); -extern cAPIGph_Mthd g_cAPI_Interface[6]; +struct cAPIGph__Iface +{ + void * mpGInfo; + cAPIGph_Mthd mpCreate; + cAPIGph_Mthd mpBeforeOfDraw; + cAPIGph_Mthd mpAfterOfDraw; + cAPIGph_Mthd mpPainter; + cAPIGph_Mthd mpBlankingOn; + cAPIGph_Mthd mpBlankingOff; +}; + +extern cAPIGph__Iface g_cAPI_Interface; #endif /* C_API_H */ diff --git a/include/SSystem/SComponent/c_API_controller_pad.h b/include/SSystem/SComponent/c_API_controller_pad.h index a8476b8..21e1368 100644 --- a/include/SSystem/SComponent/c_API_controller_pad.h +++ b/include/SSystem/SComponent/c_API_controller_pad.h @@ -21,18 +21,17 @@ struct interface_of_controller_pad { /* 0x28 */ f32 mTriggerLeft; /* 0x2C */ f32 mTriggerRight; /* 0x30 */ u32 mButtonFlags; - /* 0x34 */ u32 mPressedButtonFlags; - /* 0x38 */ s8 mGamepadErrorFlags; - /* 0x39 */ u8 mHoldLockL; - /* 0x3A */ u8 mTrigLockL; - /* 0x3B */ u8 mHoldLockR; - /* 0x3C */ u8 mTrigLockR; - /* 0x3D */ u8 field_0x3d; - /* 0x3E */ u8 field_0x3e; - /* 0x3F */ u8 field_0x3f; + /* 0x34 */ s8 mGamepadErrorFlags; + /* 0x35 */ u8 mHoldLockL; + /* 0x36 */ u8 mTrigLockL; + /* 0x37 */ u8 mHoldLockR; + /* 0x38 */ u8 mTrigLockR; + /* 0x39 */ u8 field_0x3d; + /* 0x3A */ u8 field_0x3e; + /* 0x3B */ u8 field_0x3f; }; void cAPICPad_recalibrate(void); u32 cAPICPad_ANY_BUTTON(u32 param_0); -#endif \ No newline at end of file +#endif diff --git a/include/SSystem/SComponent/c_bg_s_lin_chk.h b/include/SSystem/SComponent/c_bg_s_lin_chk.h index a295adf..f1ff9f8 100644 --- a/include/SSystem/SComponent/c_bg_s_lin_chk.h +++ b/include/SSystem/SComponent/c_bg_s_lin_chk.h @@ -20,7 +20,7 @@ public: public: cBgS_LinChk(); void ct(); - void Set2(const cXyz*, const cXyz*, unsigned int); + void Set2(cXyz*, cXyz*, unsigned int); void PreCalc(); void GetCross(); diff --git a/include/SSystem/SComponent/c_data_tbl.h b/include/SSystem/SComponent/c_data_tbl.h new file mode 100644 index 0000000..f231db1 --- /dev/null +++ b/include/SSystem/SComponent/c_data_tbl.h @@ -0,0 +1,51 @@ +#ifndef C_DATA_TBL +#define C_DATA_TBL + +#include "dolphin/types.h" + +struct cDT_NamePTbl { + cDT_NamePTbl(); + virtual ~cDT_NamePTbl(); + int GetIndex(const char *pName, int start) const; + void Set(u32 count, char** pNames); + + u32 mCount; + char ** mpNames; +}; + +struct cDT_DataSrc { + u32 mRowNum; + u32 mColNum; + u8 *mpData; + + cDT_DataSrc(); + virtual ~cDT_DataSrc(); + u8 GetInf(int row, int col) const; + void Set(u32 rowNum, u32 colNum, u8* pData); +}; + +struct cDT_Format : public cDT_NamePTbl { + cDT_Format(); + ~cDT_Format(); +}; + +struct cDT_Name : public cDT_NamePTbl { + cDT_Name(); + ~cDT_Name(); +}; + +struct cDT { +public: + cDT(); + ~cDT(); + + u8 GetInf(int row, int col) const; + void Set(u32 fmtNum, char **pFmt, u32 nameNum, char **pName, u8* pData); + +private: + cDT_Format mFmt; + cDT_Name mName; + cDT_DataSrc mSrc; +}; + +#endif /* C_DATA_TBL */ diff --git a/include/SSystem/SComponent/c_m2d_g_box.h b/include/SSystem/SComponent/c_m2d_g_box.h new file mode 100644 index 0000000..1a0bbda --- /dev/null +++ b/include/SSystem/SComponent/c_m2d_g_box.h @@ -0,0 +1,14 @@ +#ifndef C_M2D_G_BOX_H +#define C_M2D_G_BOX_H + +#include "SSystem/SComponent/c_xyz.h" + +class cM2dGBox { +public: + cXy mP0, mP1; + + void Set(cXy& pA, cXy& pB); + f32 GetLen(const cXy& pXy) const; +}; + +#endif diff --git a/include/SSystem/SComponent/c_m3d_g_aab.h b/include/SSystem/SComponent/c_m3d_g_aab.h index 2e60d72..a374c77 100644 --- a/include/SSystem/SComponent/c_m3d_g_aab.h +++ b/include/SSystem/SComponent/c_m3d_g_aab.h @@ -2,7 +2,6 @@ #define C_M3D_G_AAB_H #include "SSystem/SComponent/c_xyz.h" -#include "SSystem/SComponent/c_m3d_g_lin.h" #include "SSystem/SComponent/c_m3d.h" #include "global.h" @@ -15,17 +14,9 @@ public: /* 0x18 vtable */ virtual ~cM3dGAab() {} - void Set(const cXyz*, const cXyz*); - bool CrossY(const cXyz*) const; - bool UnderPlaneYUnder(f32) const; - bool TopPlaneYUnder(f32) const; - void ClearForMinMax(void); void SetMinMax(const cXyz&); - void SetMinMax(const cM3dGAab&); void SetMin(const cXyz&); void SetMax(const cXyz&); - void CalcCenter(cXyz*) const; - void PlusR(f32); const cXyz* GetMaxP(void) const { return &mMax; } const cXyz* GetMinP(void) const { return &mMin; } const f32 GetMaxX(void) const { return mMax.x; } @@ -34,9 +25,6 @@ public: const f32 GetMinX(void) const { return mMin.x; } const f32 GetMinY(void) const { return mMin.y; } const f32 GetMinZ(void) const { return mMin.z; } - bool Cross(const cM3dGLin *param_1) { - return cM3d_Cross_MinMaxBoxLine(GetMinP(), GetMaxP(), (Vec*)¶m_1->GetStartP(), (Vec*)¶m_1->GetEndP()); - } bool Cross(const cM3dGAab *param_1) { return cM3d_Cross_AabAab(this, param_1); } diff --git a/include/SSystem/SComponent/c_m3d_g_cps.h b/include/SSystem/SComponent/c_m3d_g_cps.h deleted file mode 100644 index 40d6e6a..0000000 --- a/include/SSystem/SComponent/c_m3d_g_cps.h +++ /dev/null @@ -1,34 +0,0 @@ -#ifndef C_M3D_G_CPS_H -#define C_M3D_G_CPS_H - -#include "SSystem/SComponent/c_m3d.h" -#include "SSystem/SComponent/c_m3d_g_lin.h" -#include "global.h" - -struct cM3dGCpsS { - /* 0x00 */ Vec mStart; - /* 0x0C */ Vec mEnd; - /* 0x18 */ f32 mRadius; -}; // Size: 0x1C - -class cM3dGCps : public cM3dGLin { -public: - /* 0x1C */ f32 mRadius; - - cM3dGCps(void); - virtual ~cM3dGCps(void); - void Set(const cXyz&, const cXyz&, f32); - void Set(const cM3dGCpsS&); - void SetCps(const cM3dGCps&); - bool Cross(cM3dGCps const* other, cXyz* xyz) const { - return cM3d_Cross_CpsCps(*this, *other, xyz); - } - bool Cross(cM3dGCyl const* cyl, cXyz* xyz) const { return cM3d_Cross_CpsCyl(*this, *cyl, xyz); } - bool Cross(cM3dGSph const* sph, cXyz* xyz) const { return cM3d_Cross_CpsSph(*this, *sph, xyz); } - void SetR(f32 r) { mRadius = r; } - -}; // Size = 0x20 - -STATIC_ASSERT(0x20 == sizeof(cM3dGCps)); - -#endif /* C_M3D_G_CPS_H */ diff --git a/include/SSystem/SComponent/c_m3d_g_cyl.h b/include/SSystem/SComponent/c_m3d_g_cyl.h index 0d10973..ab37e24 100644 --- a/include/SSystem/SComponent/c_m3d_g_cyl.h +++ b/include/SSystem/SComponent/c_m3d_g_cyl.h @@ -1,7 +1,6 @@ #ifndef C_M3D_G_CYL_H #define C_M3D_G_CYL_H -#include "SSystem/SComponent/c_m3d.h" #include "SSystem/SComponent/c_xyz.h" #include "global.h" @@ -11,6 +10,7 @@ struct cM3dGCylS { /* 0x0C */ f32 mRadius; /* 0x10 */ f32 mHeight; }; // Size = 0x14 + class cM3dGSph; class cM3dGCyl { @@ -22,23 +22,17 @@ public: cM3dGCyl() {} cM3dGCyl(const cXyz*, f32, f32); virtual ~cM3dGCyl() {} - void Set(const cM3dGCylS&); - void Set(const cXyz&, f32, f32); void SetC(const cXyz& pos); void SetH(f32 h); void SetR(f32 r); bool cross(const cM3dGSph*, cXyz*) const; bool cross(const cM3dGCyl*, cXyz*) const; - void calcMinMax(cXyz*, cXyz*); + bool cross(const cM3dGSph*, f32*) const; + bool cross(const cM3dGCyl*, f32*) const; const cXyz* GetCP(void) const { return &mCenter; } f32 GetR(void) const { return mRadius; } f32 GetH(void) const { return mHeight; } cXyz& GetC() { return mCenter; } - - bool Cross(const cM3dGCps* cps, cXyz* xyz) const { return cM3d_Cross_CpsCyl(*cps, *this, xyz); } - bool Cross(const cM3dGTri& tri, cXyz* xyz) const { return cM3d_Cross_CylTri(this, &tri, xyz); } - bool Cross(const cM3dGCyl* other, f32* f) const { return cM3d_Cross_CylCyl(this, other, f); } - bool Cross(const cM3dGSph* sph, f32* f) const { return cM3d_Cross_CylSph(this, sph, f); } }; // Size = 0x18 STATIC_ASSERT(0x18 == sizeof(cM3dGCyl)); diff --git a/include/SSystem/SComponent/c_m3d_g_lin.h b/include/SSystem/SComponent/c_m3d_g_lin.h deleted file mode 100644 index 096ad4c..0000000 --- a/include/SSystem/SComponent/c_m3d_g_lin.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef C_M3D_G_LIN_H -#define C_M3D_G_LIN_H - -#include "SSystem/SComponent/c_xyz.h" -#include "global.h" - -// Line -class cM3dGLin { - // private: -public: - /* 0x00 */ cXyz mStart; - /* 0x0C */ cXyz mEnd; - /* 0x18 vtable */ - - cM3dGLin() {} - cM3dGLin(const cXyz&, const cXyz&); - virtual ~cM3dGLin() {} - void SetStartEnd(const cXyz&, const cXyz&); - void SetStartEnd(const Vec&, const Vec&); - void CalcPos(Vec*, f32) const; - void CalcVec(Vec* pOut) const { VECSubtract(&this->mEnd, &this->mStart, pOut); } - void SetEnd(const cXyz&); - const cXyz& GetStartP(void) const { return mStart; } - cXyz& GetStartP(void) { return mStart; } - const cXyz& GetEndP(void) const { return mEnd; } - cXyz& GetEndP(void) { return mEnd; } - cXyz& GetEnd() { return mEnd; } -}; // Size = 0x1C - -STATIC_ASSERT(0x1C == sizeof(cM3dGLin)); - -#endif /* C_M3D_G_LIN_H */ diff --git a/include/SSystem/SComponent/c_m3d_g_pla.h b/include/SSystem/SComponent/c_m3d_g_pla.h index 2eeb39c..97e3887 100644 --- a/include/SSystem/SComponent/c_m3d_g_pla.h +++ b/include/SSystem/SComponent/c_m3d_g_pla.h @@ -1,8 +1,7 @@ -#ifndef C_M3C_G_PLA_H_ -#define C_M3C_G_PLA_H_ +#ifndef C_M3D_G_PLA_H_ +#define C_M3D_G_PLA_H_ #include "SSystem/SComponent/c_xyz.h" -#include "SSystem/SComponent/c_m3d.h" // Plane with a normal class cM3dGPla { @@ -12,27 +11,10 @@ public: /* 0x10 vtable */ cM3dGPla() {} - cM3dGPla(const cXyz*, f32); - bool crossInfLin(const cXyz&, const cXyz&, cXyz&) const; + void CalcAngleXz(short* pAngleX, short* pAngleY) const; void SetupNP0(const Vec&, const Vec&); - void SetupNP(const Vec&, const Vec&); - bool getCrossY(const cXyz&, f32*) const; - bool getCrossYLessD(const Vec&, f32*) const; - void Set(const cM3dGPla*); - void GetNP(); - + virtual ~cM3dGPla() {} - - f32 getPlaneFunc(const Vec* pPoint) const { return mD + VECDotProduct(&mNormal, pPoint); } - const cXyz& GetNP() const { return mNormal; } - const cXyz* i_GetNP() const { return &mNormal; } - f32 GetD() const { return mD; } - void SetupFrom3Vtx(const Vec* v1, const Vec* v2, const Vec* v3) { - cM3d_CalcPla(v1, v2, v3, &mNormal, &mD); - } - f32 getCrossY_NonIsZero(const cXyz *param_1) { - return ((-mNormal.x * param_1->x - mNormal.z * param_1->z) - mD) / mNormal.y; - } }; -#endif \ No newline at end of file +#endif diff --git a/include/SSystem/SComponent/c_m3d_g_sph.h b/include/SSystem/SComponent/c_m3d_g_sph.h index 217dcef..50073b5 100644 --- a/include/SSystem/SComponent/c_m3d_g_sph.h +++ b/include/SSystem/SComponent/c_m3d_g_sph.h @@ -22,25 +22,16 @@ public: cM3dGSph() {} virtual ~cM3dGSph() {} void SetC(const cXyz&); - void Set(const cXyz&, f32); - void Set(const cM3dGSphS&); void SetR(f32); bool cross(const cM3dGSph*, cXyz*) const; bool cross(const cM3dGCyl*, cXyz*) const; - inline bool cross(const cM3dGTri *param_1) const { - return cM3d_Cross_SphTri(this, param_1); - } - void GetMinMaxCube(cXyz&, cXyz&) const; + bool cross(const cM3dGSph*, f32*) const; const cXyz& GetC(void) const { return mCenter; } const cXyz* GetCP() const { return &mCenter; } const f32 GetR(void) const { return mRadius; } f32 GetCX(void) const { return mCenter.x; } f32 GetCY(void) const { return mCenter.y; } f32 GetCZ(void) const { return mCenter.z; } - - bool Cross(const cM3dGSph* other, f32* f) const { return cM3d_Cross_SphSph(this, other, f); } - bool Cross(const cM3dGCps* cps, cXyz* xyz) const { return cM3d_Cross_CpsSph(*cps, *this, xyz); } - bool Cross(const cM3dGCyl* cyl, f32* f) const { return cM3d_Cross_CylSph(cyl, this, f); } }; // Size = 0x14 STATIC_ASSERT(0x14 == sizeof(cM3dGSph)); @@ -50,4 +41,4 @@ extern "C" { void Set__8cM3dGSphFRC4cXyzf(void); } -#endif \ No newline at end of file +#endif diff --git a/include/SSystem/SComponent/c_m3d_g_tri.h b/include/SSystem/SComponent/c_m3d_g_tri.h index f940500..686a172 100644 --- a/include/SSystem/SComponent/c_m3d_g_tri.h +++ b/include/SSystem/SComponent/c_m3d_g_tri.h @@ -20,21 +20,8 @@ public: Vec mB; Vec mC; - cM3dGTri() {} - virtual ~cM3dGTri() {} + cM3dGTri(const Vec *pA, const Vec *pB, const Vec *pC); bool cross(const cM3dGCyl*, Vec*) const; - void setPos(const Vec*, const Vec*, const Vec*); - void setBg(const Vec*, const Vec*, const Vec*, const cM3dGPla*); - void set(const Vec*, const Vec*, const Vec*, const Vec*); - bool Cross(cM3dGCps const& cps, cXyz* xyz) const { return cM3d_Cross_CpsTri(cps, *this, xyz); } - bool Cross(cM3dGCyl const& cyl, cXyz* xyz) const { return this->cross(&cyl, xyz); } - bool Cross(cM3dGSph const& sph, cXyz* xyz) const { return cM3d_Cross_SphTri(&sph, this, xyz); } - bool Cross(cM3dGTri const& other, cXyz* xyz) const { - return cM3d_Cross_TriTri(*this, other, xyz); - } - bool cross(const cM3dGLin* lin, Vec* xyz, bool param_2, bool param_3) const { - return cM3d_Cross_LinTri(lin, this, xyz, param_2, param_3); - } }; -#endif \ No newline at end of file +#endif diff --git a/include/SSystem/SComponent/c_xyz.h b/include/SSystem/SComponent/c_xyz.h index d9287b4..e3e6469 100644 --- a/include/SSystem/SComponent/c_xyz.h +++ b/include/SSystem/SComponent/c_xyz.h @@ -4,6 +4,11 @@ #include "MSL_C/math.h" #include "dolphin/mtx/vec.h" +struct cXy { + f32 x; + f32 y; +}; + struct cXyz : Vec { static const cXyz Zero; static const cXyz BaseX; diff --git a/include/d/d_resorce.h b/include/d/d_resorce.h new file mode 100644 index 0000000..43bde56 --- /dev/null +++ b/include/d/d_resorce.h @@ -0,0 +1,115 @@ +#ifndef D_D_RESORCE_H +#define D_D_RESORCE_H + +#include "m_Do/m_Do_dvd_thread.h" +#include "m_Do/m_Do_ext.h" + +class JKRArchive; +class JKRHeap; +class JKRSolidHeap; + +class dRes_info_c { +public: + dRes_info_c(); + ~dRes_info_c(); + int set(char const*, char const*, u8, JKRHeap*); + int loadResource(); + void deleteArchiveRes(); + int setRes(JKRArchive*, JKRHeap*); + int setRes(); + static void dump_long(dRes_info_c*, int); + static void dump(dRes_info_c*, int); + + void* getRes(u32 resIdx) { return *(mRes + resIdx); } + int getCount() { return mCount; } + char* getArchiveName() { return mArchiveName; } + mDoDvdThd_mountArchive_c* getDMCommand() { return mDMCommand; } + JKRArchive* getArchive() { return mArchive; } + void incCount() { mCount++; } + u16 decCount() { + return --mCount; + } + +private: + /* 0x00 */ char mArchiveName[14]; + /* 0x0E */ u16 mCount; + /* 0x10 */ mDoDvdThd_mountArchive_c* mpDMCommand; + /* 0x14 */ JKRArchive* mpArchive; + /* 0x18 */ JKRHeap* mpParentHeap; + /* 0x1C */ JKRSolidHeap* mpDataHeap; + /* 0x20 */ void** mpRes; +}; // Size: 0x24 + +STATIC_ASSERT(sizeof(dRes_info_c) == 0x24); + +class dRes_control_c { +public: + dRes_control_c() {} + ~dRes_control_c(); + static int setRes(char const*, dRes_info_c*, int, char const*, u8, JKRHeap*); + static int syncRes(char const*, dRes_info_c*, int); + static int deleteRes(char const*, dRes_info_c*, int); + static void* getRes(char const*, char const*, dRes_info_c*, int); + static dRes_info_c* getResInfo(char const*, dRes_info_c*, int); + static dRes_info_c* newResInfo(dRes_info_c*, int); + static dRes_info_c* getResInfoLoaded(char const*, dRes_info_c*, int); + static void* getRes(char const*, s32, dRes_info_c*, int); + static void* getIDRes(char const*, u16, dRes_info_c*, int); + static int syncAllRes(dRes_info_c*, int); + int setObjectRes(char const*, void*, u32, JKRHeap*); + int setStageRes(char const*, JKRHeap*); + void dump(); + int getObjectResName2Index(char const*, char const*); + + int setObjectRes(const char* name, u8 param_1, JKRHeap* heap) { + return setRes(name, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo), "/res/Object/", param_1, + heap); + } + + void* getObjectRes(const char* arcName, const char* resName) { + return getRes(arcName, resName, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); + } + + void* getObjectRes(const char* arcName, s32 param_1) { + return getRes(arcName, param_1, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); + } + + void* getObjectIDRes(const char* arcName, u16 id) { + return getIDRes(arcName, id, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); + } + + int syncObjectRes(const char* name) { + return syncRes(name, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); + } + + int syncStageRes(const char* name) { + return syncRes(name, &mStageInfo[0], ARRAY_SIZE(mStageInfo)); + } + + int syncAllObjectRes() { return syncAllRes(&mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); } + + int deleteObjectRes(const char* name) { + return deleteRes(name, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); + } + + int deleteStageRes(const char* name) { + return deleteRes(name, &mStageInfo[0], ARRAY_SIZE(mStageInfo)); + } + + void* getStageRes(const char* arcName, const char* resName) { + return getRes(arcName, resName, &mStageInfo[0], ARRAY_SIZE(mStageInfo)); + } + + dRes_info_c* getObjectResInfo(const char* arcName) { + return getResInfo(arcName, &mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); + } + + dRes_info_c* getStageResInfo(const char* arcName) { + return getResInfo(arcName, &mStageInfo[0], ARRAY_SIZE(mStageInfo)); + } + + /* 0x0000 */ dRes_info_c mObjectInfo[0x80]; + /* 0x1200 */ dRes_info_c mStageInfo[0x40]; +}; // Size: 0x1B00 + +#endif /* D_D_RESORCE_H */ diff --git a/include/dolphin/dvd/dvd.h b/include/dolphin/dvd/dvd.h new file mode 100644 index 0000000..3c55da4 --- /dev/null +++ b/include/dolphin/dvd/dvd.h @@ -0,0 +1,146 @@ +#ifndef DVD_H +#define DVD_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum DVDState { + DVD_STATE_END = 0x0, + DVD_STATE_BUSY = 0x1, + DVD_STATE_WAITING = 0x2, + DVD_STATE_COVER_CLOSED = 0x3, + DVD_STATE_NO_DISK = 0x4, + DVD_STATE_COVER_OPEN = 0x5, + DVD_STATE_WRONG_DISK = 0x6, + DVD_STATE_MOTOR_STOPPED = 0x7, + DVD_STATE_IGNORED = 0x8, + DVD_STATE_CANCELED = 0xa, // lmao they skipped 9 + DVD_STATE_RETRY = 0xb, + DVD_STATE_FATAL_ERROR = -1, +} DVDState; + + +typedef enum DVDResult { + DVD_RESULT_GOOD = 0, + DVD_RESULT_FATAL_ERROR = -1, + DVD_RESULT_IGNORED = -2, + DVD_RESULT_CANCELED = -3, +} DVDResult; + +typedef struct DVDDirectory { + /* 0x0 */ u32 entry_number; + /* 0x4 */ u32 location; + /* 0x8 */ u32 next; +} DVDDirectory; + +typedef struct DVDDirectoryEntry { + /* 0x0 */ u32 entry_number; + /* 0x4 */ BOOL is_directory; + /* 0x8 */ char* name; +} DVDDirectoryEntry; + +typedef struct DVDDiskID { + /* 0x00 */ char game_name[4]; + /* 0x04 */ char company[2]; + /* 0x06 */ u8 disk_number; + /* 0x07 */ u8 game_version; + /* 0x08 */ u8 is_streaming; + /* 0x09 */ u8 streaming_buffer_size; + /* 0x0A */ u8 padding[22]; +} DVDDiskID; + +struct DVDFileInfo; +struct DVDCommandBlock; +typedef void (*DVDCBCallback)(s32 result, struct DVDCommandBlock* block); +typedef void (*DVDCallback)(s32 result, struct DVDFileInfo* info); + +typedef struct DVDCommandBlock { + /* 0x00 */ struct DVDCommandBlock* next; + /* 0x04 */ struct DVDCommandBlock* prev; + /* 0x08 */ u32 command; + /* 0x0C */ s32 state; + /* 0x10 */ u32 offset; + /* 0x14 */ u32 length; + /* 0x18 */ void* buffer; + /* 0x1C */ u32 current_transfer_size; + /* 0x20 */ u32 transferred_size; + /* 0x24 */ DVDDiskID* disk_id; + /* 0x28 */ DVDCBCallback callback; + /* 0x2C */ void* user_data; +} DVDCommandBlock; + +typedef struct DVDFileInfo { + /* 0x00 */ DVDCommandBlock block; + /* 0x30 */ u32 start_address; + /* 0x34 */ u32 length; + /* 0x38 */ DVDCallback callback; +} DVDFileInfo; + +typedef struct DVDDriveInfo { + /* 0x00 */ u16 revision_level; + /* 0x02 */ u16 device_code; + /* 0x04 */ u32 release_date; + /* 0x08 */ u8 padding[24]; +} DVDDriveInfo; + +typedef struct DVDBB1 { + u32 appLoaderLength; + void* appLoaderFunc1; + void* appLoaderFunc2; + void* appLoaderFunc3; +} DVDBB1; + +typedef struct DVDBB2 { + u32 bootFilePosition; + u32 FSTPosition; + u32 FSTLength; + u32 FSTMaxLength; + void* FSTAddress; + u32 userPosition; + u32 userLength; + + u32 padding0; +} DVDBB2; + +#define DVD_MIN_TRANSFER_SIZE 32 + +typedef void (*DVDOptionalCommandChecker)(DVDCommandBlock* block, void (*cb)(u32 intType)); + +void DVDInit(void); +BOOL DVDOpen(const char* filename, DVDFileInfo* fileinfo); +BOOL DVDClose(DVDFileInfo* fileinfo); +BOOL DVDReadPrio(DVDFileInfo* fileinfo, void*, s32, s32, s32); +DVDDiskID* DVDGetCurrentDiskID(void); +BOOL DVDFastOpen(long, DVDFileInfo* fileinfo); +s32 DVDGetCommandBlockStatus(const DVDCommandBlock* block); +BOOL DVDReadAsyncPrio(DVDFileInfo* fileinfo, void*, long, long, DVDCallback, long); +int DVDConvertPathToEntrynum(const char*); +s32 DVDGetDriveStatus(void); +BOOL DVDCheckDisk(void); +BOOL DVDChangeDir(const char* dirname); +BOOL DVDCloseDir(DVDDirectory* dir); +BOOL DVDOpenDir(const char*, DVDDirectory* dir); +BOOL DVDReadDir(DVDDirectory* dir, DVDDirectoryEntry* entry); +BOOL DVDReadAbsAsyncPrio(DVDCommandBlock* block, void* addr, s32 length, s32 offset, + DVDCBCallback callback, s32 prio); +BOOL DVDReadAbsAsyncForBS(DVDCommandBlock* block, void* addr, s32 length, s32 offset, + DVDCBCallback callback); +BOOL DVDReadDiskID(DVDCommandBlock* block, DVDDiskID* diskID, DVDCBCallback callback); +BOOL DVDCancelStreamAsync(DVDCommandBlock* block, DVDCBCallback callback); +BOOL DVDInquiryAsync(DVDCommandBlock* block, DVDDriveInfo* info, DVDCBCallback callback); +void DVDReset(void); +BOOL DVDSetAutoInvalidation(BOOL autoInval); +void DVDResume(void); +static BOOL DVDCancelAsync(DVDCommandBlock* block, DVDCBCallback callback); +s32 DVDCancel(DVDCommandBlock* block); + +BOOL DVDCompareDiskID(DVDDiskID* id1, DVDDiskID* id2); + +#ifdef __cplusplus +}; +#endif + +#endif /* DVD_H */ diff --git a/include/dolphin/dvd/dvdFatal.h b/include/dolphin/dvd/dvdFatal.h new file mode 100644 index 0000000..44f7033 --- /dev/null +++ b/include/dolphin/dvd/dvdFatal.h @@ -0,0 +1,5 @@ +#ifndef DVDFATAL_H +#define DVDFATAL_H + + +#endif /* DVDFATAL_H */ diff --git a/include/dolphin/dvd/dvderror.h b/include/dolphin/dvd/dvderror.h new file mode 100644 index 0000000..0ae4b57 --- /dev/null +++ b/include/dolphin/dvd/dvderror.h @@ -0,0 +1,5 @@ +#ifndef DVDERROR_H +#define DVDERROR_H + + +#endif /* DVDERROR_H */ diff --git a/include/dolphin/dvd/dvdfs.h b/include/dolphin/dvd/dvdfs.h new file mode 100644 index 0000000..d4fb3c4 --- /dev/null +++ b/include/dolphin/dvd/dvdfs.h @@ -0,0 +1,5 @@ +#ifndef DVDFS_H +#define DVDFS_H + + +#endif /* DVDFS_H */ diff --git a/include/dolphin/dvd/dvdidutils.h b/include/dolphin/dvd/dvdidutils.h new file mode 100644 index 0000000..09ae281 --- /dev/null +++ b/include/dolphin/dvd/dvdidutils.h @@ -0,0 +1,5 @@ +#ifndef DVDIDUTILS_H +#define DVDIDUTILS_H + + +#endif /* DVDIDUTILS_H */ diff --git a/include/dolphin/dvd/dvdlow.h b/include/dolphin/dvd/dvdlow.h new file mode 100644 index 0000000..a7645d9 --- /dev/null +++ b/include/dolphin/dvd/dvdlow.h @@ -0,0 +1,9 @@ +#ifndef DVDLOW_H +#define DVDLOW_H + +#include "dolphin/types.h" + +typedef void (*DVDLowCallback)(u32 intType); +vu32 __DIRegs[16] : 0xCC006000; + +#endif /* DVDLOW_H */ diff --git a/include/dolphin/dvd/dvdqueue.h b/include/dolphin/dvd/dvdqueue.h new file mode 100644 index 0000000..da8b260 --- /dev/null +++ b/include/dolphin/dvd/dvdqueue.h @@ -0,0 +1,5 @@ +#ifndef DVDQUEUE_H +#define DVDQUEUE_H + + +#endif /* DVDQUEUE_H */ diff --git a/include/dolphin/dvd/fstload.h b/include/dolphin/dvd/fstload.h new file mode 100644 index 0000000..e69d00a --- /dev/null +++ b/include/dolphin/dvd/fstload.h @@ -0,0 +1,5 @@ +#ifndef FSTLOAD_H +#define FSTLOAD_H + + +#endif /* FSTLOAD_H */ diff --git a/include/dolphin/gx/GX.h b/include/dolphin/gx/GX.h new file mode 100644 index 0000000..cc692a1 --- /dev/null +++ b/include/dolphin/gx/GX.h @@ -0,0 +1,147 @@ +#ifndef GX_H_ +#define GX_H_ + +#include "dolphin/gx/GXAttr.h" +#include "dolphin/gx/GXBump.h" +#include "dolphin/gx/GXDisplayList.h" +#include "dolphin/gx/GXFifo.h" +#include "dolphin/gx/GXFrameBuf.h" +#include "dolphin/gx/GXGeometry.h" +#include "dolphin/gx/GXLight.h" +#include "dolphin/gx/GXMisc.h" +#include "dolphin/gx/GXPerf.h" +#include "dolphin/gx/GXPixel.h" +#include "dolphin/gx/GXTev.h" +#include "dolphin/gx/GXTexture.h" +#include "dolphin/gx/GXTransform.h" + +#ifdef __cplusplus +extern "C" { +#endif + +// Pack value into bitfield +#define GX_BITFIELD_SET(field, pos, size, value) (field) = __rlwimi((field), (value), 31 - (pos) - (size) + 1, (pos), (pos) + (size)-1) + +#define INSERT_FIELD(reg, value, nbits, shift) \ + (reg) = ((u32) (reg) & ~(((1 << (nbits)) - 1) << (shift))) | \ + ((u32) (value) << (shift)); + +#define GX_LOAD_BP_REG 0x61 +#define GX_NOP 0 + +typedef union { + u8 u8; + u16 u16; + u32 u32; + u64 u64; + s8 s8; + s16 s16; + s32 s32; + s64 s64; + f32 f32; + f64 f64; +} PPCWGPipe; + +volatile PPCWGPipe GXFIFO : 0xCC008000; + +#define GFX_FIFO(T) (*(volatile T*)0xCC008000) + +inline void GXPosition3f32(f32 x, f32 y, f32 z) { + GXFIFO.f32 = x; + GXFIFO.f32 = y; + GXFIFO.f32 = z; +} + +inline void GXNormal3f32(f32 x, f32 y, f32 z) { + GXFIFO.f32 = x; + GXFIFO.f32 = y; + GXFIFO.f32 = z; +} + +inline void GXPosition2f32(f32 x, f32 z) { + GXFIFO.f32 = x; + GXFIFO.f32 = z; +} + +inline void GXColor1u32(u32 c) { + GFX_FIFO(u32) = c; +} + +inline void GXTexCoord2f32(f32 s, f32 t) { + GFX_FIFO(f32) = s; + GFX_FIFO(f32) = t; +} + +inline void GXTexCoord2u8(u8 s, u8 t) { + GFX_FIFO(u8) = s; + GFX_FIFO(u8) = t; +} + +inline void GXTexCoord1x8(u8 s) { + GFX_FIFO(u8) = s; +} + +inline void GXPosition2u16(u16 x, u16 y) { + GFX_FIFO(u16) = x; + GFX_FIFO(u16) = y; +} + +inline void GXPosition1x16(u16 x) { + GFX_FIFO(u16) = x; +} + +inline void GXPosition1x8(u8 x) { + GFX_FIFO(u8) = x; +} + +inline void GXPosition3s8(s8 x, s8 y, s8 z) { + GFX_FIFO(s8) = x; + GFX_FIFO(s8) = y; + GFX_FIFO(s8) = z; +} + +inline void GXPosition2s8(s8 x, s8 y) { + GFX_FIFO(s8) = x; + GFX_FIFO(s8) = y; +} + +inline void i_GXPosition3s16(s16 x, s16 y, s16 z) { + GFX_FIFO(s16) = x; + GFX_FIFO(s16) = y; + GFX_FIFO(s16) = z; +} + +inline void GXTexCoord2s8(s8 x, s8 y) { + GFX_FIFO(s8) = x; + GFX_FIFO(s8) = y; +} + +inline void i_GXTexCoord2u16(u16 x, u16 y) { + GFX_FIFO(u16) = x; + GFX_FIFO(u16) = y; +} + +inline void GXTexCoord2s16(const s16 u, const s16 v) { + GFX_FIFO(s16) = u; + GFX_FIFO(s16) = v; +} + +inline void GFWriteBPCmd(u32 param_1) { + GXFIFO.u8 = 0x61; + GXFIFO.u32 = param_1; +} + +inline void GFFill(u16 param_1, u32 param_2) { + GXFIFO.u8 = 0x10; + GXFIFO.u16 = 0; + GXFIFO.u16 = param_1; + GXFIFO.u32 = param_2; +} + +inline void i_GXEnd() {} + +#ifdef __cplusplus +}; +#endif + +#endif diff --git a/include/dolphin/gx/GXAttr.h b/include/dolphin/gx/GXAttr.h new file mode 100644 index 0000000..7cebd8d --- /dev/null +++ b/include/dolphin/gx/GXAttr.h @@ -0,0 +1,45 @@ +#ifndef GXATTR_H +#define GXATTR_H + +#include "dolphin/gx/GXEnum.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _GXVtxDescList { + /* 0x0 */ GXAttr attr; + /* 0x4 */ GXAttrType type; +} GXVtxDescList; // Size: 0x08 + +typedef struct _GXVtxAttrFmtList { + /* 0x00 */ GXAttr mAttrib; + /* 0x04 */ GXCompCnt mCompCnt; + /* 0x08 */ GXCompType mCompType; + /* 0x0C */ u8 mCompShift; +} GXVtxAttrFmtList; // Size: 0x10 + +void GXSetVtxDesc(GXAttr attr, GXAttrType type); +void GXSetVtxDescv(GXVtxDescList* list); +void __GXSetVCD(void); +void __GXCalculateVLim(void); +void GXClearVtxDesc(void); +void GXSetVtxAttrFmt(GXVtxFmt fmt, GXAttr attr, GXCompCnt cnt, GXCompType type, u32); +void GXSetVtxAttrFmtv(GXVtxFmt fmt, GXVtxAttrFmtList* list); +void __GXSetVAT(void); +void GXSetArray(GXAttr attr, void* base, u8); +void GXInvalidateVtxCache(void); +void GXSetTexCoordGen2(GXTexCoordID dst, GXTexGenType type, GXTexGenSrc src, u32 mtx, + GXBool renormalize, u32 pt_mtx); +void GXSetNumTexGens(u8 numTexGens); + +void GXGetVtxAttrFmtv(GXVtxFmt param_0, GXVtxAttrFmtList* param_1); +void GXGetVtxAttrFmt(GXVtxFmt param_0, int param_1, GXCompCnt* param_2, GXCompType* param_3, + u8* param_4); +void GXGetVtxDescv(GXVtxDescList* attrPtr); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXATTR_H */ diff --git a/include/dolphin/gx/GXBump.h b/include/dolphin/gx/GXBump.h new file mode 100644 index 0000000..ddb8d67 --- /dev/null +++ b/include/dolphin/gx/GXBump.h @@ -0,0 +1,23 @@ +#ifndef GXBUMP_H +#define GXBUMP_H + +#include "dolphin/gx/GXEnum.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXSetTevIndirect(GXTevStageID tevStage, GXIndTexStageID texStage, GXIndTexFormat texFmt, + GXIndTexBiasSel biasSel, GXIndTexMtxID mtxID, GXIndTexWrap wrapS, + GXIndTexWrap wrapT, u8 addPrev, u8 utcLod, GXIndTexAlphaSel alphaSel); +void GXSetIndTexMtx(GXIndTexMtxID mtxID, f32 offset[6], s8 scale_exp); +void GXSetIndTexCoordScale(GXIndTexStageID texStage, GXIndTexScale scaleS, GXIndTexScale scaleT); +void GXSetIndTexOrder(GXIndTexStageID stage, GXTexCoordID coord, GXTexMapID map); +void GXSetNumIndStages(u8 num); +void GXSetTevDirect(GXTevStageID stage); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXBUMP_H */ diff --git a/include/dolphin/gx/GXDisplayList.h b/include/dolphin/gx/GXDisplayList.h new file mode 100644 index 0000000..fc8a4d5 --- /dev/null +++ b/include/dolphin/gx/GXDisplayList.h @@ -0,0 +1,18 @@ +#ifndef GXDISPLAYLIST_H +#define GXDISPLAYLIST_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXBeginDisplayList(void* list, u32 capacity); +void GXEndDisplayList(void); +void GXCallDisplayList(void* list, u32 nbytes); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXDISPLAYLIST_H */ diff --git a/include/dolphin/gx/GXDraw.h b/include/dolphin/gx/GXDraw.h new file mode 100644 index 0000000..c3e1137 --- /dev/null +++ b/include/dolphin/gx/GXDraw.h @@ -0,0 +1,16 @@ +#ifndef GXDRAW_H +#define GXDRAW_H + +#include "dolphin/gx/GXEnum.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXDrawCylinder(u8 numEdges); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXDRAW_H */ diff --git a/include/dolphin/gx/GXEnum.h b/include/dolphin/gx/GXEnum.h new file mode 100644 index 0000000..591f873 --- /dev/null +++ b/include/dolphin/gx/GXEnum.h @@ -0,0 +1,809 @@ +#ifndef GXENUM_H +#define GXENUM_H + +#include "dolphin/types.h" + +typedef enum _GXPrimitive { + /* 0x80 */ GX_QUADS = 0x80, + /* 0x90 */ GX_TRIANGLES = 0x90, + /* 0x98 */ GX_TRIANGLESTRIP = 0x98, + /* 0xA0 */ GX_TRIANGLEFAN = 0xA0, + /* 0xA8 */ GX_LINES = 0xA8, + /* 0xB0 */ GX_LINESTRIP = 0xB0, + /* 0xB8 */ GX_POINTS = 0xB8, +} GXPrimitive; + +typedef enum _GXCullMode { + /* 0x0 */ GX_CULL_NONE, + /* 0x1 */ GX_CULL_FRONT, + /* 0x2 */ GX_CULL_BACK, + /* 0x3 */ GX_CULL_ALL +} GXCullMode; + +typedef enum _GXBoolVal { + /* 0x0 */ GX_FALSE, + /* 0x1 */ GX_TRUE, + /* 0x0 */ GX_DISABLE = 0, + /* 0x1 */ GX_ENABLE +} GXBoolVal; + +typedef u8 GXBool; + +typedef enum _GXTexMapID { + /* 0x000 */ GX_TEXMAP0, + /* 0x001 */ GX_TEXMAP1, + /* 0x002 */ GX_TEXMAP2, + /* 0x003 */ GX_TEXMAP3, + /* 0x004 */ GX_TEXMAP4, + /* 0x005 */ GX_TEXMAP5, + /* 0x006 */ GX_TEXMAP6, + /* 0x007 */ GX_TEXMAP7, + /* 0x008 */ GX_MAX_TEXMAP, + /* 0x0FF */ GX_TEXMAP_NULL = 255, + /* 0x100 */ GX_TEXMAP_DISABLE, +} GXTexMapID; + +typedef enum _GXTevStageID { + /* 0x00 */ GX_TEVSTAGE0, + /* 0x01 */ GX_TEVSTAGE1, + /* 0x02 */ GX_TEVSTAGE2, + /* 0x03 */ GX_TEVSTAGE3, + /* 0x04 */ GX_TEVSTAGE4, + /* 0x05 */ GX_TEVSTAGE5, + /* 0x06 */ GX_TEVSTAGE6, + /* 0x07 */ GX_TEVSTAGE7, + /* 0x08 */ GX_TEVSTAGE8, + /* 0x09 */ GX_TEVSTAGE9, + /* 0x0A */ GX_TEVSTAGE10, + /* 0x0B */ GX_TEVSTAGE11, + /* 0x0C */ GX_TEVSTAGE12, + /* 0x0D */ GX_TEVSTAGE13, + /* 0x0E */ GX_TEVSTAGE14, + /* 0x0F */ GX_TEVSTAGE15, + /* 0x10 */ GX_MAX_TEVSTAGE, +} GXTevStageID; + +typedef enum _GXTexCoordID { + /* 0x00 */ GX_TEXCOORD0, + /* 0x01 */ GX_TEXCOORD1, + /* 0x02 */ GX_TEXCOORD2, + /* 0x03 */ GX_TEXCOORD3, + /* 0x04 */ GX_TEXCOORD4, + /* 0x05 */ GX_TEXCOORD5, + /* 0x06 */ GX_TEXCOORD6, + /* 0x07 */ GX_TEXCOORD7, + /* 0x08 */ GX_MAXCOORD, + /* 0xFF */ GX_TEXCOORD_NULL = 255, +} GXTexCoordID; + +typedef enum _GXChannelID { + /* 0x00 */ GX_COLOR0, + /* 0x01 */ GX_COLOR1, + /* 0x02 */ GX_ALPHA0, + /* 0x03 */ GX_ALPHA1, + /* 0x04 */ GX_COLOR0A0, + /* 0x05 */ GX_COLOR1A1, + /* 0x06 */ GX_COLOR_ZERO, + /* 0x07 */ GX_ALPHA_BUMP, + /* 0x08 */ GX_ALPHA_BUMPN, + /* 0xFF */ GX_COLOR_NULL = 255, +} GXChannelID; + +typedef enum _GXColorSrc { + /* 0x0 */ GX_SRC_REG, + /* 0x1 */ GX_SRC_VTX, +} GXColorSrc; + +typedef enum _GXLightID { + /* 0x000 */ GX_LIGHT_NULL = 0, + /* 0x001 */ GX_LIGHT0 = 1 << 0, + /* 0x002 */ GX_LIGHT1 = 1 << 1, + /* 0x004 */ GX_LIGHT2 = 1 << 2, + /* 0x008 */ GX_LIGHT3 = 1 << 3, + /* 0x010 */ GX_LIGHT4 = 1 << 4, + /* 0x020 */ GX_LIGHT5 = 1 << 5, + /* 0x040 */ GX_LIGHT6 = 1 << 6, + /* 0x080 */ GX_LIGHT7 = 1 << 7, + /* 0x100 */ GX_MAX_LIGHT = 1 << 8, +} GXLightID; + +typedef enum _GXDiffuseFn { + /* 0x0 */ GX_DF_NONE, + /* 0x1 */ GX_DF_SIGN, + /* 0x2 */ GX_DF_CLAMP, +} GXDiffuseFn; + +typedef enum _GXAttnFn { + /* 0x0 */ GX_AF_SPEC, + /* 0x1 */ GX_AF_SPOT, + /* 0x2 */ GX_AF_NONE, +} GXAttnFn; + +typedef enum _GXDistAttnFn { + /* 0x0 */ GX_DA_OFF, + /* 0x1 */ GX_DA_GENTLE, + /* 0x2 */ GX_DA_MEDIUM, + /* 0x3 */ GX_DA_STEEP +} GXDistAttnFn; + +typedef enum _GXSpotFn { + /* 0x0 */ GX_SP_OFF, + /* 0x1 */ GX_SP_FLAT, + /* 0x2 */ GX_SP_COS, + /* 0x3 */ GX_SP_COS2, + /* 0x4 */ GX_SP_SHARP, + /* 0x5 */ GX_SP_RING1, + /* 0x6 */ GX_SP_RING2 +} GXSpotFn; + +typedef enum _GXTevMode { + /* 0x0 */ GX_MODULATE, + /* 0x1 */ GX_DECAL, + /* 0x2 */ GX_BLEND, + /* 0x3 */ GX_REPLACE, + /* 0x4 */ GX_PASSCLR, +} GXTevMode; + +typedef enum _GXBlendMode { + /* 0x0 */ GX_BM_NONE, + /* 0x1 */ GX_BM_BLEND, + /* 0x2 */ GX_BM_LOGIC, + /* 0x3 */ GX_BM_SUBTRACT, + /* 0x4 */ GX_MAX_BLENDMODE, +} GXBlendMode; + +typedef enum _GXBlendFactor { + /* 0x0 */ GX_BL_ZERO, + /* 0x1 */ GX_BL_ONE, + /* 0x2 */ GX_BL_SRC_COLOR, + /* 0x2 */ GX_BL_DST_COLOR = 2, + /* 0x3 */ GX_BL_INV_SRC_COLOR, + /* 0x3 */ GX_BL_INV_DST_COLOR = 3, + /* 0x4 */ GX_BL_SRC_ALPHA, + /* 0x5 */ GX_BL_INV_SRC_ALPHA, + /* 0x6 */ GX_BL_DST_ALPHA, + /* 0x7 */ GX_BL_INV_DST_ALPHA, +} GXBlendFactor; + +typedef enum _GXLogicOp { + /* 0x0 */ GX_LO_CLEAR, + /* 0x1 */ GX_LO_AND, + /* 0x2 */ GX_LO_REV_AND, + /* 0x3 */ GX_LO_COPY, + /* 0x4 */ GX_LO_INV_AND, + /* 0x5 */ GX_LO_NOOP, + /* 0x6 */ GX_LO_XOR, + /* 0x7 */ GX_LO_OR, + /* 0x8 */ GX_LO_NOR, + /* 0x9 */ GX_LO_EQUIV, + /* 0xA */ GX_LO_INV, + /* 0xB */ GX_LO_REV_OR, + /* 0xC */ GX_LO_INV_COPY, + /* 0xD */ GX_LO_INV_OR, + /* 0xE */ GX_LO_NAND, + /* 0xF */ GX_LO_SET, +} GXLogicOp; + +typedef enum _GXVtxFmt { + /* 0x0 */ GX_VTXFMT0, + /* 0x1 */ GX_VTXFMT1, + /* 0x2 */ GX_VTXFMT2, + /* 0x3 */ GX_VTXFMT3, + /* 0x4 */ GX_VTXFMT4, + /* 0x5 */ GX_VTXFMT5, + /* 0x6 */ GX_VTXFMT6, + /* 0x7 */ GX_VTXFMT7, + /* 0x8 */ GX_MAX_VTXFMT, +} GXVtxFmt; + +typedef enum _GXAttr { + /* 0x00 */ GX_VA_PNMTXIDX, + /* 0x01 */ GX_VA_TEX0MTXIDX, + /* 0x02 */ GX_VA_TEX1MTXIDX, + /* 0x03 */ GX_VA_TEX2MTXIDX, + /* 0x04 */ GX_VA_TEX3MTXIDX, + /* 0x05 */ GX_VA_TEX4MTXIDX, + /* 0x06 */ GX_VA_TEX5MTXIDX, + /* 0x07 */ GX_VA_TEX6MTXIDX, + /* 0x08 */ GX_VA_TEX7MTXIDX, + /* 0x09 */ GX_VA_POS, + /* 0x0A */ GX_VA_NRM, + /* 0x0B */ GX_VA_CLR0, + /* 0x0C */ GX_VA_CLR1, + /* 0x0D */ GX_VA_TEX0, + /* 0x0E */ GX_VA_TEX1, + /* 0x0F */ GX_VA_TEX2, + /* 0x10 */ GX_VA_TEX3, + /* 0x11 */ GX_VA_TEX4, + /* 0x12 */ GX_VA_TEX5, + /* 0x13 */ GX_VA_TEX6, + /* 0x14 */ GX_VA_TEX7, + /* 0x15 */ GX_POS_MTX_ARRAY, + /* 0x16 */ GX_NRM_MTX_ARRAY, + /* 0x17 */ GX_TEX_MTX_ARRAY, + /* 0x18 */ GX_LIGHT_ARRAY, + /* 0x19 */ GX_VA_NBT, + /* 0x1A */ GX_VA_MAX_ATTR, + /* 0xFF */ GX_VA_NULL = 255, +} GXAttr; + +typedef enum _GXCompCnt { + /* 0x0 */ GX_POS_XY = 0, + /* 0x1 */ GX_POS_XYZ = 1, + /* 0x0 */ GX_NRM_XYZ = 0, + /* 0x1 */ GX_NRM_NBT = 1, + /* 0x2 */ GX_NRM_NBT3 = 2, + /* 0x0 */ GX_CLR_RGB = 0, + /* 0x1 */ GX_CLR_RGBA = 1, + /* 0x0 */ GX_TEX_S = 0, + /* 0x1 */ GX_TEX_ST = 1, +} GXCompCnt; + +typedef enum _GXCompType { + /* 0x0 */ GX_U8, + /* 0x1 */ GX_S8, + /* 0x2 */ GX_U16, + /* 0x3 */ GX_S16, + /* 0x4 */ GX_F32, + /* 0x0 */ GX_RGB565 = 0, + /* 0x1 */ GX_RGB8, + /* 0x2 */ GX_RGBX8, + /* 0x3 */ GX_RGBA4, + /* 0x4 */ GX_RGBA6, + /* 0x5 */ GX_RGBA8, +} GXCompType; + +typedef enum _GXAttrType { + /* 0x0 */ GX_NONE, + /* 0x1 */ GX_DIRECT, + /* 0x2 */ GX_INDEX8, + /* 0x3 */ GX_INDEX16, +} GXAttrType; + +typedef enum _GXTevOp { + /* 0x0 */ GX_TEV_ADD, + /* 0x1 */ GX_TEV_SUB, + /* 0x8 */ GX_TEV_COMP_R8_GT = 8, + /* 0x9 */ GX_TEV_COMP_R8_EQ, + /* 0xA */ GX_TEV_COMP_GR16_GT, + /* 0xB */ GX_TEV_COMP_GR16_EQ, + /* 0xC */ GX_TEV_COMP_BGR24_GT, + /* 0xD */ GX_TEV_COMP_BGR24_EQ, + /* 0xE */ GX_TEV_COMP_A8_GT, + /* 0xE */ GX_TEV_COMP_RGB8_GT = 14, + /* 0xF */ GX_TEV_COMP_RGB8_EQ, + /* 0xF */ GX_TEV_COMP_A8_EQ = 15, +} GXTevOp; + +typedef enum _GXTevBias { + /* 0x0 */ GX_TB_ZERO, + /* 0x1 */ GX_TB_ADDHALF, + /* 0x2 */ GX_TB_SUBHALF, + /* 0x3 */ GX_MAX_TEVBIAS, +} GXTevBias; + +typedef enum _GXTevColorArg { + /* 0x0 */ GX_CC_CPREV, + /* 0x1 */ GX_CC_APREV, + /* 0x2 */ GX_CC_C0, + /* 0x3 */ GX_CC_A0, + /* 0x4 */ GX_CC_C1, + /* 0x5 */ GX_CC_A1, + /* 0x6 */ GX_CC_C2, + /* 0x7 */ GX_CC_A2, + /* 0x8 */ GX_CC_TEXC, + /* 0x9 */ GX_CC_TEXA, + /* 0xA */ GX_CC_RASC, + /* 0xB */ GX_CC_RASA, + /* 0xC */ GX_CC_ONE, + /* 0xD */ GX_CC_HALF, + /* 0xE */ GX_CC_KONST, + /* 0xF */ GX_CC_ZERO, +} GXTevColorArg; + +typedef enum _GXTevColor { + /* 0x0 */ GX_CH_RED, + /* 0x1 */ GX_CH_GREEN, + /* 0x2 */ GX_CH_BLUE, + /* 0x3 */ GX_CH_ALPHA, +} GXTevColor; + +typedef enum _GXTevScale { + /* 0x0 */ GX_CS_SCALE_1, + /* 0x1 */ GX_CS_SCALE_2, + /* 0x2 */ GX_CS_SCALE_4, + /* 0x3 */ GX_CS_DIVIDE_2, + /* 0x4 */ GX_MAX_TEVSCALE +} GXTevScale; + +typedef enum _GXTevRegID { + /* 0x0 */ GX_TEVPREV, + /* 0x1 */ GX_TEVREG0, + /* 0x2 */ GX_TEVREG1, + /* 0x3 */ GX_TEVREG2, + /* 0x4 */ GX_MAX_TEVREG +} GXTevRegID; + +typedef enum _GXTevAlphaArg { + /* 0x0 */ GX_CA_APREV, + /* 0x1 */ GX_CA_A0, + /* 0x2 */ GX_CA_A1, + /* 0x3 */ GX_CA_A2, + /* 0x4 */ GX_CA_TEXA, + /* 0x5 */ GX_CA_RASA, + /* 0x6 */ GX_CA_KONST, + /* 0x7 */ GX_CA_ZERO, +} GXTevAlphaArg; + +typedef enum _GXTexFmt { + /* 0x0 */ GX_TF_I4, + /* 0x1 */ GX_TF_I8, + /* 0x2 */ GX_TF_IA4, + /* 0x3 */ GX_TF_IA8, + /* 0x4 */ GX_TF_RGB565, + /* 0x5 */ GX_TF_TGB5A3, + /* 0x6 */ GX_TF_RGBA8, + /* 0x7 */ GX_TF_CI4, + /* 0x8 */ GX_TF_CI8, + /* 0x9 */ GX_TF_CI14, + /* 0xE */ GX_TF_CMPR = 14, + /* 0x10 */ _GX_TF_ZTF = 0x10, + /* 0x11 */ GX_TF_Z8 = (0x1 | _GX_TF_ZTF), + /* 0x13 */ GX_TF_Z16 = (0x3 | _GX_TF_ZTF), + /* 0x16 */ GX_TF_Z24X8 = (0x6 | _GX_TF_ZTF), + /* 0x20 */ _GX_TF_CTF = 0x20, + /* 0x28 */ _GX_CTF_R8 = 0x28, + /* 0x30 */ GX_CTF_Z4 = (0x0 | _GX_TF_ZTF | _GX_TF_CTF), + /* 0x39 */ GX_CTF_Z8M = (0x9 | _GX_TF_ZTF | _GX_TF_CTF), + /* 0x3A */ GX_CTF_Z8L = (0xA | _GX_TF_ZTF | _GX_TF_CTF), + /* 0x3C */ GX_CTF_Z16L = (0xC | _GX_TF_ZTF | _GX_TF_CTF), +} GXTexFmt; + +typedef enum _GXGamma { + /* 0x0 */ GX_GM_1_0, + /* 0x0 */ GX_GM_1_7, + /* 0x0 */ GX_GM_2_2, +} GXGamma; + +typedef enum _GXTlutFmt { + /* 0x0 */ GX_TL_IA8, + /* 0x1 */ GX_TL_RGB565, + /* 0x2 */ GX_TL_RGB5A3, +} GXTlutFmt; + +typedef enum _GXTlut { + /* 0x00 */ GX_TLUT0, + /* 0x01 */ GX_TLUT1, + /* 0x02 */ GX_TLUT2, + /* 0x03 */ GX_TLUT3, + /* 0x04 */ GX_TLUT4, + /* 0x05 */ GX_TLUT5, + /* 0x06 */ GX_TLUT6, + /* 0x07 */ GX_TLUT7, + /* 0x08 */ GX_TLUT8, + /* 0x09 */ GX_TLUT9, + /* 0x0A */ GX_TLUT10, + /* 0x0B */ GX_TLUT11, + /* 0x0C */ GX_TLUT12, + /* 0x0D */ GX_TLUT13, + /* 0x0E */ GX_TLUT14, + /* 0x0F */ GX_TLUT15, + /* 0x10 */ GX_BIGTLUT0, + /* 0x11 */ GX_BIGTLUT1, + /* 0x12 */ GX_BIGTLUT2, + /* 0x13 */ GX_BIGTLUT3, +} GXTlut; + +/* 8-bit version of GXTexFmt for use in structures */ +typedef enum _GXTexFmt8 { + /* 0x20 */ GX_CTF_R4 = (0x0 | _GX_TF_CTF), + /* 0x22 */ GX_CTF_RA4 = (0x2 | _GX_TF_CTF), + /* 0x23 */ GX_CTF_RA8 = (0x3 | _GX_TF_CTF), + /* 0x26 */ GX_CTF_YUVA8 = (0x6 | _GX_TF_CTF), + /* 0x27 */ GX_CTF_A8 = (0x7 | _GX_TF_CTF), + /* 0x28 */ GX_CTF_R8 = (0x8 | _GX_TF_CTF), + /* 0x29 */ GX_CTF_G8 = (0x9 | _GX_TF_CTF), + /* 0x2A */ GX_CTF_B8 = (0xA | _GX_TF_CTF), + /* 0x2B */ GX_CTF_RG8 = (0xB | _GX_TF_CTF), + /* 0x2C */ GX_CTF_GB8 = (0xC | _GX_TF_CTF), +} GXTexFmt8; + +typedef enum _GXTexWrapMode { + /* 0x0 */ GX_CLAMP, + /* 0x1 */ GX_REPEAT, + /* 0x2 */ GX_MIRROR, + /* 0x3 */ GX_MAX_TEXWRAP_MODE, +} GXTexWrapMode; + +typedef enum _GXTexFilter { + /* 0x0 */ GX_NEAR, + /* 0x1 */ GX_LINEAR, + /* 0x2 */ GX_NEAR_MIP_NEAR, + /* 0x3 */ GX_LIN_MIP_NEAR, + /* 0x4 */ GX_NEAR_MIP_LIN, + /* 0x5 */ GX_LIN_MIP_LIN, +} GXTexFilter; + +typedef enum _GXAnisotropy { + /* 0x0 */ GX_ANISO_1, + /* 0x1 */ GX_ANISO_2, + /* 0x2 */ GX_ANISO_4, + /* 0x3 */ GX_MAX_ANISOTROPY, +} GXAnisotropy; + +typedef enum _GXCITexFmt { + /* 0x8 */ GX_TF_C4 = 8, + /* 0x8 */ GX_TF_C8, + /* 0xA */ GX_TF_C14X2 +} GXCITexFmt; + +typedef enum _GXTexMtxType { + /* 0x0 */ GX_MTX3x4, + /* 0x1 */ GX_MTX2x4 +} GXTexMtxType; + +typedef enum _GXCompare { + /* 0x0 */ GX_NEVER, + /* 0x1 */ GX_LESS, + /* 0x2 */ GX_EQUAL, + /* 0x3 */ GX_LEQUAL, + /* 0x4 */ GX_GREATER, + /* 0x5 */ GX_NEQUAL, + /* 0x6 */ GX_GEQUAL, + /* 0x7 */ GX_ALWAYS, +} GXCompare; + +typedef enum _GXAlphaOp { + /* 0x0 */ GX_AOP_AND, + /* 0x1 */ GX_AOP_OR, + /* 0x2 */ GX_AOP_XOR, + /* 0x3 */ GX_AOP_XNOR, + /* 0x4 */ GX_MAX_ALPHAOP +} GXAlphaOp; + +typedef enum _GXFogType { + /* 0x0 */ GX_FOG_NONE, + /* 0x2 */ GX_FOG_LIN = 2, + /* 0x2 */ GX_FOG_PERSP_LIN = 2, + /* 0x4 */ GX_FOG_EXP = 4, + /* 0x4 */ GX_FOG_PERSP_EXP = 4, + /* 0x5 */ GX_FOG_EXP2, + /* 0x5 */ GX_FOG_PERSP_EXP2 = 5, + /* 0x6 */ GX_FOG_REVEXP, + /* 0x6 */ GX_FOG_PERSP_REVEXP = 6, + /* 0x7 */ GX_FOG_REVEXP2, + /* 0x7 */ GX_FOG_PERSP_REVEXP2 = 7, + /* 0xA */ GX_FOG_ORTHO_LIN = 10, + /* 0xC */ GX_FOG_ORTHO_EXP = 12, + /* 0xD */ GX_FOG_ORTHO_EXP2, + /* 0xE */ GX_FOG_ORTHO_REVEXP, + /* 0xF */ GX_FOG_ORTHO_REVEXP2, +} GXFogType; + +typedef enum _GXProjectionType { + /* 0x0 */ GX_PERSPECTIVE, + /* 0x1 */ GX_ORTHOGRAPHIC +} GXProjectionType; + +typedef enum _GXTevKAlphaSel { + /* 0x00 */ GX_TEV_KASEL_1, + /* 0x01 */ GX_TEV_KASEL_7_8, + /* 0x02 */ GX_TEV_KASEL_3_4, + /* 0x03 */ GX_TEV_KASEL_5_8, + /* 0x04 */ GX_TEV_KASEL_1_2, + /* 0x05 */ GX_TEV_KASEL_3_8, + /* 0x06 */ GX_TEV_KASEL_1_4, + /* 0x07 */ GX_TEV_KASEL_1_8, + + /* 0x10 */ GX_TEV_KASEL_K0_R = 0x10, + /* 0x11 */ GX_TEV_KASEL_K1_R, + /* 0x12 */ GX_TEV_KASEL_K2_R, + /* 0x13 */ GX_TEV_KASEL_K3_R, + /* 0x14 */ GX_TEV_KASEL_K0_G, + /* 0x15 */ GX_TEV_KASEL_K1_G, + /* 0x16 */ GX_TEV_KASEL_K2_G, + /* 0x17 */ GX_TEV_KASEL_K3_G, + /* 0x18 */ GX_TEV_KASEL_K0_B, + /* 0x19 */ GX_TEV_KASEL_K1_B, + /* 0x1A */ GX_TEV_KASEL_K2_B, + /* 0x1B */ GX_TEV_KASEL_K3_B, + /* 0x1C */ GX_TEV_KASEL_K0_A, + /* 0x1D */ GX_TEV_KASEL_K1_A, + /* 0x1E */ GX_TEV_KASEL_K2_A, + /* 0x1F */ GX_TEV_KASEL_K3_A, +} GXTevKAlphaSel; + +typedef enum _GXTevKColorSel { + /* 0x00 */ GX_TEV_KCSEL_1, + /* 0x01 */ GX_TEV_KCSEL_7_8, + /* 0x02 */ GX_TEV_KCSEL_3_4, + /* 0x03 */ GX_TEV_KCSEL_5_8, + /* 0x04 */ GX_TEV_KCSEL_1_2, + /* 0x05 */ GX_TEV_KCSEL_3_8, + /* 0x06 */ GX_TEV_KCSEL_1_4, + /* 0x07 */ GX_TEV_KCSEL_1_8, + /* 0x0C */ GX_TEV_KCSEL_K0 = 0xC, + /* 0x0D */ GX_TEV_KCSEL_K1, + /* 0x0E */ GX_TEV_KCSEL_K2, + /* 0x0F */ GX_TEV_KCSEL_K3, + /* 0x10 */ GX_TEV_KCSEL_K0_R, + /* 0x11 */ GX_TEV_KCSEL_K1_R, + /* 0x12 */ GX_TEV_KCSEL_K2_R, + /* 0x13 */ GX_TEV_KCSEL_K3_R, + /* 0x14 */ GX_TEV_KCSEL_K0_G, + /* 0x15 */ GX_TEV_KCSEL_K1_G, + /* 0x16 */ GX_TEV_KCSEL_K2_G, + /* 0x17 */ GX_TEV_KCSEL_K3_G, + /* 0x18 */ GX_TEV_KCSEL_K0_B, + /* 0x19 */ GX_TEV_KCSEL_K1_B, + /* 0x1A */ GX_TEV_KCSEL_K2_B, + /* 0x1B */ GX_TEV_KCSEL_K3_B, + /* 0x1C */ GX_TEV_KCSEL_K0_A, + /* 0x1D */ GX_TEV_KCSEL_K1_A, + /* 0x1E */ GX_TEV_KCSEL_K2_A, + /* 0x1F */ GX_TEV_KCSEL_K3_A, +} GXTevKColorSel; + +typedef enum _GXTevSwapSel { + /* 0x0 */ GX_TEV_SWAP0, + /* 0x1 */ GX_TEV_SWAP1, + /* 0x2 */ GX_TEV_SWAP2, + /* 0x3 */ GX_TEV_SWAP3, + /* 0x4 */ GX_MAX_TEVSWAP, +} GXTevSwapSel; + +typedef enum _GXTexGenType { + /* 0x0 */ GX_TG_MTX3x4, + /* 0x1 */ GX_TG_MTX2x4, + /* 0x2 */ GX_TG_BUMP0, + /* 0x3 */ GX_TG_BUMP1, + /* 0x4 */ GX_TG_BUMP2, + /* 0x5 */ GX_TG_BUMP3, + /* 0x6 */ GX_TG_BUMP4, + /* 0x7 */ GX_TG_BUMP5, + /* 0x8 */ GX_TG_BUMP6, + /* 0x9 */ GX_TG_BUMP7, + /* 0xA */ GX_TG_SRTG, +} GXTexGenType; + +typedef enum _GXTexGenSrc { + /* 0x00 */ GX_TG_POS, + /* 0x01 */ GX_TG_NRM, + /* 0x02 */ GX_TG_BINRM, + /* 0x03 */ GX_TG_TANGENT, + /* 0x04 */ GX_TG_TEX0, + /* 0x05 */ GX_TG_TEX1, + /* 0x06 */ GX_TG_TEX2, + /* 0x07 */ GX_TG_TEX3, + /* 0x08 */ GX_TG_TEX4, + /* 0x09 */ GX_TG_TEX5, + /* 0x0A */ GX_TG_TEX6, + /* 0x0B */ GX_TG_TEX7, + /* 0x0C */ GX_TG_TEXCOORD0, + /* 0x0D */ GX_TG_TEXCOORD1, + /* 0x0E */ GX_TG_TEXCOORD2, + /* 0x0F */ GX_TG_TEXCOORD3, + /* 0x10 */ GX_TG_TEXCOORD4, + /* 0x11 */ GX_TG_TEXCOORD5, + /* 0x12 */ GX_TG_TEXCOORD6, +} GXTexGenSrc; + +typedef enum _GXZTexOp { + /* 0x0 */ GX_ZT_DISABLE, + /* 0x1 */ GX_ZT_ADD, + /* 0x2 */ GX_ZT_REPLACE, + /* 0x3 */ GX_MAX_ZTEXOP, +} GXZTexOp; + +typedef enum _GXIndTexStageID { + /* 0x0 */ GX_INDTEXSTAGE0, + /* 0x1 */ GX_INDTEXSTAGE1, + /* 0x2 */ GX_INDTEXSTAGE2, + /* 0x3 */ GX_INDTEXSTAGE3, + /* 0x4 */ GX_MAX_INDTEXSTAGE, +} GXIndTexStageID; + +typedef enum _GXIndTexScale { + /* 0x0 */ GX_ITS_1, + /* 0x1 */ GX_ITS_2, + /* 0x2 */ GX_ITS_4, + /* 0x3 */ GX_ITS_8, + /* 0x4 */ GX_ITS_16, + /* 0x5 */ GX_ITS_32, + /* 0x6 */ GX_ITS_64, + /* 0x7 */ GX_ITS_128, + /* 0x8 */ GX_ITS_256, + /* 0x9 */ GX_MAX_ITSCALE, +} GXIndTexScale; + +typedef enum _GXIndTexMtxID { + /* 0x0 */ GX_ITM_OFF, + /* 0x1 */ GX_ITM_0, + /* 0x2 */ GX_ITM_1, + /* 0x3 */ GX_ITM_2, + /* 0x4 */ GX_ITM_3, + /* 0x5 */ GX_ITM_S0 = 5, + /* 0x6 */ GX_ITM_S1, + /* 0x7 */ GX_ITM_S2, + /* 0x8 */ GX_ITM_S3, + /* 0x9 */ GX_ITM_T0 = 9, + /* 0xA */ GX_ITM_T1, + /* 0xB */ GX_ITM_T2, +} GXIndTexMtxID; + +typedef enum _GXIndTexFormat { + /* 0x0 */ GX_ITF_8, + /* 0x1 */ GX_ITF_5, + /* 0x2 */ GX_ITF_4, + /* 0x3 */ GX_ITF_3, +} GXIndTexFormat; + +typedef enum _GXIndTexBiasSel { + /* 0x0 */ GX_ITB_NONE, + /* 0x1 */ GX_ITB_S, + /* 0x2 */ GX_ITB_T, + /* 0x3 */ GX_ITB_ST, + /* 0x4 */ GX_ITB_U, + /* 0x5 */ GX_ITB_SU, + /* 0x6 */ GX_ITB_TU, + /* 0x7 */ GX_ITB_STU, +} GXIndTexBiasSel; + +typedef enum _GXIndTexAlphaSel { + /* 0x0 */ GX_ITBA_OFF, + /* 0x1 */ GX_ITBA_S, + /* 0x2 */ GX_ITBA_T, + /* 0x3 */ GX_ITBA_U, +} GXIndTexAlphaSel; + +typedef enum _GXIndTexWrap { + /* 0x0 */ GX_ITW_OFF, + /* 0x1 */ GX_ITW_256, + /* 0x2 */ GX_ITW_128, + /* 0x3 */ GX_ITW_64, + /* 0x4 */ GX_ITW_32, + /* 0x5 */ GX_ITW_16, + /* 0x6 */ GX_ITW_0, +} GXIndTexWrap; + +typedef enum _GXTexOffset { + /* 0x0 */ GX_TO_ZERO, + /* 0x1 */ GX_TO_SIXTEENTH, + /* 0x2 */ GX_TO_EIGHTH, + /* 0x3 */ GX_TO_FOURTH, + /* 0x4 */ GX_TO_HALF, + /* 0x5 */ GX_TO_ONE, + /* 0x6 */ GX_MAX_TEXOFFSET, +} GXTexOffset; + +typedef enum _GXTevKColorID { + /* 0x0 */ GX_KCOLOR0, + /* 0x1 */ GX_KCOLOR1, + /* 0x2 */ GX_KCOLOR2, + /* 0x3 */ GX_KCOLOR3, +} GXTevKColorID; + +typedef enum _GXTexCacheSize { + /* 0x0 */ GX_TEXCACHE_32K, + /* 0x1 */ GX_TEXCACHE_128K, + /* 0x2 */ GX_TEXCACHE_512K, + /* 0x3 */ GX_TEXCACHE_NONE, +} GXTexCacheSize; + +typedef enum _GXPosNrmMtx { + GX_PNMTX0 = 3 * 0, + GX_PNMTX1 = 3 * 1, + GX_PNMTX2 = 3 * 2, + GX_PNMTX3 = 3 * 3, + GX_PNMTX4 = 3 * 4, + GX_PNMTX5 = 3 * 5, + GX_PNMTX6 = 3 * 6, + GX_PNMTX7 = 3 * 7, + GX_PNMTX8 = 3 * 8, + GX_PNMTX9 = 3 * 9, +} GXPosNrmMtx; + +typedef enum _GXTexMtx { + GX_TEXMTX0 = 30 + 0 * 3, + GX_TEXMTX1 = 30 + 1 * 3, + GX_TEXMTX2 = 30 + 2 * 3, + GX_TEXMTX3 = 30 + 3 * 3, + GX_TEXMTX4 = 30 + 4 * 3, + GX_TEXMTX5 = 30 + 5 * 3, + GX_TEXMTX6 = 30 + 6 * 3, + GX_TEXMTX7 = 30 + 7 * 3, + GX_TEXMTX8 = 30 + 8 * 3, + GX_TEXMTX9 = 30 + 9 * 3, + GX_IDENTITY = 60, +} GXTexMtx; + +typedef enum _GXPTTexMtx { + GX_PTTEXMTX0 = 64 + 0 * 3, + GX_PTTEXMTX1 = 64 + 1 * 3, + GX_PTTEXMTX2 = 64 + 2 * 3, + GX_PTTEXMTX3 = 64 + 3 * 3, + GX_PTTEXMTX4 = 64 + 4 * 3, + GX_PTTEXMTX5 = 64 + 5 * 3, + GX_PTTEXMTX6 = 64 + 6 * 3, + GX_PTTEXMTX7 = 64 + 7 * 3, + GX_PTTEXMTX8 = 64 + 8 * 3, + GX_PTTEXMTX9 = 64 + 9 * 3, + GX_PTTEXMTX10 = 64 + 10 * 3, + GX_PTTEXMTX11 = 64 + 11 * 3, + GX_PTTEXMTX12 = 64 + 12 * 3, + GX_PTTEXMTX13 = 64 + 13 * 3, + GX_PTTEXMTX14 = 64 + 14 * 3, + GX_PTTEXMTX15 = 64 + 15 * 3, + GX_PTTEXMTX16 = 64 + 16 * 3, + GX_PTTEXMTX17 = 64 + 17 * 3, + GX_PTTEXMTX18 = 64 + 18 * 3, + GX_PTTEXMTX19 = 64 + 19 * 3, + GX_PTIDENTITY = 125, +} GXPTTexMtx; + +typedef enum _GXFBClamp { + /* 0x0 */ GX_CLAMP_NONE, + /* 0x1 */ GX_CLAMP_TOP, + /* 0x2 */ GX_CLAMP_BOTTOM, +} GXFBClamp; + +typedef enum _GXPixelFmt { + /* 0x0 */ GX_PF_RGB8_Z24, + /* 0x1 */ GX_PF_RGBA6_Z24, + /* 0x2 */ GX_PF_RGB565_Z16, + /* 0x3 */ GX_PF_Z24, + /* 0x4 */ GX_PF_Y8, + /* 0x5 */ GX_PF_U8, + /* 0x6 */ GX_PF_V8, + /* 0x7 */ GX_PF_YUV420, +} GXPixelFmt; + +typedef enum _GXZFmt16 { + /* 0x0 */ GX_ZC_LINEAR, + /* 0x1 */ GX_ZC_NEAR, + /* 0x2 */ GX_ZC_MID, + /* 0x3 */ GX_ZC_FAR, +} GXZFmt16; + +typedef enum _GXCommand { + GX_CMD_LOAD_INDX_A = 0x20, + GX_CMD_LOAD_INDX_B = 0x28, + GX_CMD_LOAD_INDX_C = 0x30, + GX_CMD_LOAD_INDX_D = 0x38, + + GX_CMD_LOAD_CP_REG = 0x08, + GX_CMD_LOAD_XF_REG = 0x10, +} GXCommand; + +typedef enum _GXClipMode { + /* 0x0 */ GX_CLIP_ENABLE, + /* 0x1 */ GX_CLIP_DISABLE, +} GXClipMode; + +typedef enum _GXCopyMode { + /* 0x0 */ GX_COPY_PROGRESSIVE, + /* 0x1 */ GX_COPY_INTLC_EVEN, + /* 0x2 */ GX_COPY_INTLC_ODD, +} GXCopyMode; + +typedef enum _GXAlphaReadMode { + /* 0x0 */ GX_READ_00, + /* 0x1 */ GX_READ_FF, + /* 0x2 */ GX_READ_NONE, +} GXAlphaReadMode; + +typedef enum _GXTlutSize { + /* 0x001 */ GX_TLUT_16 = 1, + /* 0x002 */ GX_TLUT_32 = 2, + /* 0x004 */ GX_TLUT_64 = 4, + /* 0x008 */ GX_TLUT_128 = 8, + /* 0x010 */ GX_TLUT_256 = 16, + /* 0x020 */ GX_TLUT_512 = 32, + /* 0x040 */ GX_TLUT_1K = 64, + /* 0x080 */ GX_TLUT_2K = 128, + /* 0x100 */ GX_TLUT_4K = 256, + /* 0x200 */ GX_TLUT_8K = 512, + /* 0x400 */ GX_TLUT_16K = 1024, +} GXTlutSize; + +#endif /* GXENUM_H */ \ No newline at end of file diff --git a/include/dolphin/gx/GXFifo.h b/include/dolphin/gx/GXFifo.h new file mode 100644 index 0000000..7bdfcee --- /dev/null +++ b/include/dolphin/gx/GXFifo.h @@ -0,0 +1,38 @@ +#ifndef GXFIFO_H +#define GXFIFO_H + +#include "dolphin/gx/GXStruct.h" +#include "dolphin/gx/GXEnum.h" +#include "dolphin/os/OSThread.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXInitFifoBase(GXFifoObj* fifo, void* base, u32 size); +void GXInitFifoPtrs(GXFifoObj* fifo, void* read_ptr, void* write_ptr); +void GXSetCPUFifo(void); +void GXSetGPFifo(void); +void GXSaveCPUFifo(GXFifoObj* fifo); +void __GXSaveCPUFifoAux(GXFifoObj* fifo); +void GXGetGPStatus(GXBool* overhi, GXBool* underlo, GXBool* read_idle, GXBool* cmd_idle, GXBool* breakpoint); +void* GXGetFifoBase(GXFifoObj* fifo); +u32 GXGetFifoSize(GXFifoObj* fifo); +void GXSetBreakPtCallback(void); +void __GXFifoInit(void); +void __GXFifoReadEnable(void); +void __GXFifoReadDisable(void); +void __GXFifoLink(u8); +void __GXWriteFifoIntEnable(u8, u8); +void __GXWriteFifoIntReset(u8, u8); +void __GXCleanGPFifo(void); +OSThread* GXSetCurrentGXThread(void); +OSThread* GXGetCurrentGXThread(void); +GXFifoObj* GXGetCPUFifo(void); +u32 GXGetGPFifo(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXFIFO_H */ diff --git a/include/dolphin/gx/GXFrameBuf.h b/include/dolphin/gx/GXFrameBuf.h new file mode 100644 index 0000000..781a397 --- /dev/null +++ b/include/dolphin/gx/GXFrameBuf.h @@ -0,0 +1,31 @@ +#ifndef GXFRAMEBUF_H +#define GXFRAMEBUF_H + +#include "dolphin/gx/GXStruct.h" +#include "dolphin/gx/GXEnum.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXSetDispCopySrc(u16 left, u16 top, u16 width, u16 height); +void GXSetTexCopySrc(u16 left, u16 top, u16 width, u16 height); +void GXSetDispCopyDst(u16 arg0, u16 arg1); +void GXSetTexCopyDst(u16 width, u16 height, s32 fmt, GXBool mipmap); +void GXSetDispCopyFrame2Field(GXCopyMode mode); +void GXSetCopyClamp(GXFBClamp clamp); +u16 GXGetNumXfbLines(u32 efb_height, f32 y_scale); +f32 GXGetYScaleFactor(u16 efb_height, u16 xfb_height); +u32 GXSetDispCopyYScale(f32 y_scale); +void GXSetCopyClear(GXColor color, u32 clear_z); +void GXSetCopyFilter(GXBool antialias, u8 pattern[12][2], GXBool vf, u8 vfilter[7]); +void GXSetDispCopyGamma(GXGamma gamma); +void GXCopyDisp(void* dst, GXBool clear); +void GXCopyTex(void* dst, GXBool clear); +void GXClearBoundingBox(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXFRAMEBUF_H */ diff --git a/include/dolphin/gx/GXGeometry.h b/include/dolphin/gx/GXGeometry.h new file mode 100644 index 0000000..a711eb4 --- /dev/null +++ b/include/dolphin/gx/GXGeometry.h @@ -0,0 +1,24 @@ +#ifndef GXGEOMETRY_H +#define GXGEOMETRY_H + +#include "dolphin/gx/GXEnum.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void __GXSetDirtyState(void); +void GXBegin(GXPrimitive type, GXVtxFmt fmt, u16 vert_num); +void __GXSendFlushPrim(void); +void GXSetLineWidth(u8 width, GXTexOffset offsets); +void GXSetPointSize(u8 size, GXTexOffset offsets); +void GXEnableTexOffsets(GXTexCoordID coord, GXBool line, GXBool point); +void GXSetCullMode(GXCullMode mode); +void GXSetCoPlanar(GXBool enable); +void __GXSetGenMode(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXGEOMETRY_H */ diff --git a/include/dolphin/gx/GXInit.h b/include/dolphin/gx/GXInit.h new file mode 100644 index 0000000..ea28dcd --- /dev/null +++ b/include/dolphin/gx/GXInit.h @@ -0,0 +1,122 @@ +#ifndef GXINIT_H +#define GXINIT_H + +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" +#include "dolphin/mtx/mtx.h" + +typedef GXTexRegion (*GXTexRegionCallback)(GXTexObj* obj); +typedef GXTlutRegion* (*GXTlutRegionCallback)(u32 name); + +typedef struct _GXData { + /* 0x000 */ u16 field_0x0; + /* 0x002 */ u16 field_0x2; + /* 0x004 */ u16 field_0x4; + /* 0x006 */ u16 field_0x6; + /* 0x008 */ u32 field_0x8; + /* 0x00C */ u32 field_0xc; + /* 0x010 */ u32 field_0x10; + /* 0x014 */ u32 field_0x14; + /* 0x018 */ GXAttrType field_0x18; + /* 0x01C */ GXCompCnt field_0x1c[8]; + /* 0x03C */ GXCompCnt field_0x3c[8]; + /* 0x05C */ u32 field_0x5c[8]; + /* 0x07C */ u32 field_0x7c; + /* 0x080 */ u32 field_0x80; + /* 0x084 */ u32 field_0x84; + /* 0x088 */ u8 field_0x88[0xA8 - 0x88]; + /* 0x0A8 */ GXColor ambColors[2]; + /* 0x0B0 */ GXColor matColors[2]; + /* 0x0B8 */ u32 field_0xb8[8]; // GX_MAX_TEXCOORD + /* 0x0D8 */ u32 field_0xd8[8]; // GX_MAX_TEXCOORD + /* 0x0F8 */ u32 field_0xf8; + /* 0x0FC */ u32 field_0xfc; + /* 0x100 */ u32 field_0x100[GX_MAX_TEVSTAGE / 2]; + /* 0x120 */ u32 field_0x120; + /* 0x124 */ u32 field_0x124; + /* 0x128 */ u32 field_0x128; + /* 0x12C */ u32 field_0x12c; + /* 0x130 */ u32 field_0x130[GX_MAX_TEVSTAGE]; + /* 0x170 */ u32 field_0x170[GX_MAX_TEVSTAGE]; + /* 0x1B0 */ u32 field_0x1b0[GX_MAX_TEVSTAGE / 2]; + /* 0x1D0 */ u32 field_0x1d0; + /* 0x1D4 */ u32 field_0x1d4; + /* 0x1D8 */ u32 field_0x1d8; + /* 0x1DC */ u32 field_0x1dc; + /* 0x1E0 */ u32 field_0x1e0; + /* 0x1E4 */ u32 field_0x1e4; + /* 0x1E8 */ u32 field_0x1e8; + /* 0x1EC */ u32 field_0x1ec; + /* 0x1F0 */ u32 field_0x1f0; + /* 0x1F4 */ u32 field_0x1f4; + /* 0x1F8 */ u32 field_0x1f8; + /* 0x1FC */ u32 field_0x1fc; + /* 0x200 */ u8 field_0x200; + /* 0x204 */ u32 field_0x204; + /* 0x208 */ GXTexRegion field_0x208[8]; + /* 0x288 */ GXTexRegion field_0x288[8]; + /* 0x308 */ GXTexRegion field_0x308[8]; + /* 0x388 */ GXTlutRegion field_0x388[16]; + /* 0x488 */ GXTlutRegion field_0x488[4]; + /* 0x4C8 */ GXTexRegionCallback field_0x4c8; + /* 0x4CC */ GXTlutRegionCallback field_0x4cc; + /* 0x4D0 */ GXAttrType field_0x4d0; + /* 0x4D4 */ u8 field_0x4d4; + /* 0x4D5 */ u8 field_0x4d5; + /* 0x4D8 */ GXProjectionType field_0x4d8; + /* 0x4DC */ Mtx field_0x4dc; + /* 0x50C */ f32 field_0x50c; + /* 0x510 */ f32 field_0x510; + /* 0x514 */ u32 field_0x514[8]; + /* 0x534 */ u32 field_0x534[8]; + /* 0x554 */ u32 field_0x554; + /* 0x558 */ u32 field_0x558[8]; + /* 0x578 */ u8 field_0x578[0x594 - 0x578]; + /* 0x594 */ u32 field_0x594; + /* 0x598 */ u32 field_0x598; + /* 0x59C */ u32 field_0x59c; + /* 0x5A0 */ u8 field_0x5a0[4]; + /* 0x5A4 */ u32 field_0x5a4; + /* 0x5A8 */ u8 field_0x5a8; + /* 0x5A9 */ u8 field_0x5a9; + /* 0x5AA */ u8 field_0x5aa; + /* 0x5AB */ u8 field_0x5ab; + /* 0x5AC */ u32 field_0x5ac; +} GXData; // Size: 0x5B0 + +STATIC_ASSERT(sizeof(GXData) == 0x5B0); + +extern GXData* const __GXData; + +extern u32* __piReg; +extern u16* __cpReg; +extern u8 __peReg[4]; +extern u8 __memReg[4]; + +inline void GXSetWasteFlags() { + GXData* data = __GXData; + data->field_0x5ac |= 0x3; + data->field_0x2 = 0; +} + +static inline void set_x2(u16 value) +{ + __GXData->field_0x2 = value; +} + +#ifdef __cplusplus +extern "C" { +#endif + +GXTexRegion* __GXDefaultTexRegionCallback(GXTexObj* obj, GXTexMapID mapID); +GXTlutRegion* __GXDefaultTlutRegionCallback(u32 tlut); +void __GXShutdown(s32); +void __GXInitRevisionBits(void); +GXFifoObj* GXInit(void* base, u32 size); +void __GXInitGX(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXINIT_H */ diff --git a/include/dolphin/gx/GXLight.h b/include/dolphin/gx/GXLight.h new file mode 100644 index 0000000..82fd78a --- /dev/null +++ b/include/dolphin/gx/GXLight.h @@ -0,0 +1,27 @@ +#ifndef GXLIGHT_H +#define GXLIGHT_H + +#include "dolphin/gx/GXStruct.h" +#include "dolphin/gx/GXEnum.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXInitLightAttn(GXLightObj* obj, f32 a0, f32 a1, f32 a2, f32 k0, f32 k1, f32 k2); +void GXInitLightSpot(GXLightObj* obj, f32 cutoff, GXSpotFn spot_fn); +void GXInitLightDistAttn(GXLightObj* obj, f32 dist, f32 brightness, GXDistAttnFn dist_fn); +void GXInitLightPos(GXLightObj* obj, f32 x, f32 y, f32 z); +void GXInitLightDir(GXLightObj* obj, f32 x, f32 y, f32 z); +void GXInitLightColor(GXLightObj* obj, GXColor color); +void GXLoadLightObjImm(GXLightObj* obj, GXLightID light); +void GXSetChanAmbColor(GXChannelID channel, GXColor color); +void GXSetChanMatColor(GXChannelID channel, GXColor color); +void GXSetNumChans(u8 chan_num); +void GXSetChanCtrl(GXChannelID channel, GXBool enable, GXColorSrc amb_src, GXColorSrc mat_src, u32 light_mask, GXDiffuseFn diff_fn, GXAttnFn attn_fn); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXLIGHT_H */ diff --git a/include/dolphin/gx/GXMisc.h b/include/dolphin/gx/GXMisc.h new file mode 100644 index 0000000..5a22f30 --- /dev/null +++ b/include/dolphin/gx/GXMisc.h @@ -0,0 +1,38 @@ +#ifndef GXMISC_H +#define GXMISC_H + +#include "dolphin/gx/GXEnum.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXSetMisc(u32 id, u32 value); +void GXFlush(void); +void __GXAbort(void); +void GXAbortFrame(void); +void GXSetDrawDone(void); +void GXDrawDone(void); +void GXPixModeSync(void); +void GXPokeAlphaMode(GXCompare comp, u8 threshold); +void GXPokeAlphaRead(GXAlphaReadMode mode); +void GXPokeAlphaUpdate(GXBool enable_update); +void GXPokeBlendMode(GXBlendMode mode, GXBlendFactor src_factor, GXBlendFactor dst_factor, GXLogicOp op); +void GXPokeColorUpdate(GXBool enable_update); +void GXPokeDstAlpha(GXBool enable, u8 alpha); +void GXPokeDither(GXBool enable); +void GXPokeZMode(GXBool enable_compare, GXCompare comp); +void GXPeekZ(u16 x, u16 y, u32* z); + +typedef void (*GXDrawSyncCallback)(u16 token); +void GXSetDrawSyncCallback(GXDrawSyncCallback callback); + +typedef void (*GXDrawDoneCallback)(void); +void GXSetDrawDoneCallback(GXDrawDoneCallback callback); +void __GXPEInit(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXMISC_H */ diff --git a/include/dolphin/gx/GXPerf.h b/include/dolphin/gx/GXPerf.h new file mode 100644 index 0000000..821c81b --- /dev/null +++ b/include/dolphin/gx/GXPerf.h @@ -0,0 +1,18 @@ +#ifndef GXPERF_H +#define GXPERF_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXSetGPMetric(u32 perf0, u32 perf1); +void GXClearGPMetric(void); +void GXReadXfRasMetric(u32*, u32*, u32*, u32*); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXPERF_H */ diff --git a/include/dolphin/gx/GXPixel.h b/include/dolphin/gx/GXPixel.h new file mode 100644 index 0000000..b9b3d3a --- /dev/null +++ b/include/dolphin/gx/GXPixel.h @@ -0,0 +1,28 @@ +#ifndef GXPIXEL_H +#define GXPIXEL_H + +#include "dolphin/gx/GXStruct.h" +#include "dolphin/gx/GXEnum.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXSetFog(GXFogType type, f32 startZ, f32 endZ, f32 nearZ, f32 farZ, GXColor color); +void GXSetFogRangeAdj(GXBool enable, u16 center, GXFogAdjTable* table); +void GXSetBlendMode(GXBlendMode mode, GXBlendFactor src_factor, GXBlendFactor dst_factor, GXLogicOp op); +void GXSetColorUpdate(GXBool enable_update); +void GXSetAlphaUpdate(GXBool enable_update); +void GXSetZMode(GXBool enable_compare, GXCompare comp, GXBool enable_update); +void GXSetZCompLoc(GXBool z_buf_before_tex); +void GXSetPixelFmt(GXPixelFmt pixel_fmt, GXZFmt16 z_fmt); +void GXSetDither(GXBool enable_dither); +void GXSetDstAlpha(GXBool enable, u8 alpha); +void GXSetFieldMask(GXBool odd_mask, GXBool even_mask); +void GXSetFieldMode(GXBool field_mode, GXBool half_aspect_ratio); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXPIXEL_H */ diff --git a/include/dolphin/gx/GXStruct.h b/include/dolphin/gx/GXStruct.h new file mode 100644 index 0000000..57e0231 --- /dev/null +++ b/include/dolphin/gx/GXStruct.h @@ -0,0 +1,101 @@ +#ifndef GXSTRUCT_H +#define GXSTRUCT_H + +#include "global.h" + +typedef struct _GXColor { + /* 0x0 */ u8 r; + /* 0x1 */ u8 g; + /* 0x2 */ u8 b; + /* 0x3 */ u8 a; +} GXColor; + +typedef struct _GXColorS10 { + /* 0x0 */ s16 r; + /* 0x2 */ s16 g; + /* 0x4 */ s16 b; + /* 0x6 */ s16 a; +} GXColorS10; + +typedef struct _GXRenderModeObj { + /* 0x00 */ s32 vi_tv_mode; + /* 0x04 */ u16 fb_width; + /* 0x06 */ u16 efb_height; + /* 0x08 */ u16 xfb_height; + /* 0x0A */ u16 vi_x_origin; + /* 0x0C */ u16 vi_y_origin; + /* 0x0E */ u16 vi_width; + /* 0x10 */ u16 vi_height; + /* 0x14 */ s32 xfb_mode; + /* 0x18 */ u8 field_rendering; + /* 0x19 */ u8 antialiasing; + /* 0x1A */ u8 sample_pattern[12][2]; + /* 0x32 */ u8 vfilter[7]; +} GXRenderModeObj; + +STATIC_ASSERT(sizeof(GXRenderModeObj) == 60); + +typedef struct _GXTexObj { + /* 0x00 */ u32 texture_filter; + /* 0x04 */ u32 texture_lod; + /* 0x08 */ u32 texture_size; + /* 0x0C */ u32 texture_address; + /* 0x10 */ u32 user_data; + /* 0x14 */ u32 texture_format; + /* 0x18 */ u32 tlut_name; + /* 0x1C */ u16 texture_time_count; + /* 0x1E */ u8 texture_tile_type; + /* 0x1F */ u8 texture_flags; +} GXTexObj; + +typedef struct _GXTlutObj { + /* 0x0 */ u32 format; + /* 0x4 */ u32 address; + /* 0x8 */ u32 numEntries; +} GXTlutObj; + +typedef struct _GXLightObj { + /* 0x00 */ u8 field_0x0[0xc]; + /* 0x0C */ GXColor color; + /* 0x10 */ f32 a0; + /* 0x14 */ f32 a1; + /* 0x18 */ f32 a2; + /* 0x1C */ f32 k0; + /* 0x20 */ f32 k1; + /* 0x24 */ f32 k2; + /* 0x28 */ f32 posX; + /* 0x2C */ f32 posY; + /* 0x30 */ f32 posZ; + /* 0x34 */ f32 dirX; + /* 0x38 */ f32 dirY; + /* 0x3C */ f32 dirZ; +} GXLightObj; + +typedef struct _GXFogAdjTable { + /* 0x0 */ u16 r[10]; +} GXFogAdjTable; + +typedef struct _GXFifoObj { + /* 0x00 */ void* base; + /* 0x04 */ u32 end; + /* 0x08 */ u32 size; + /* 0x0C */ u32 high_wtrmark; + /* 0x10 */ u32 low_wtrmark; + /* 0x14 */ void* read_ptr; + /* 0x18 */ void* write_ptr; + /* 0x1C */ void* rw_dst; + /* 0x20 */ u8 fifo_wrap; + /* 0x21 */ u8 cpu_fifo_ready; + /* 0x22 */ u8 gp_fifo_ready; + /* 0x23 */ u8 field_0x23[93]; +} GXFifoObj; // Size: 0x80 + +typedef struct _GXTexRegion { + /* 0x00 */ u8 dummy[0x10]; +} GXTexRegion; // Size: 0x10 + +typedef struct _GXTlutRegion { + /* 0x00 */ u8 dummy[0x10]; +} GXTlutRegion; // Size: 0x10 + +#endif /* GXSTRUCT_H */ diff --git a/include/dolphin/gx/GXTev.h b/include/dolphin/gx/GXTev.h new file mode 100644 index 0000000..20da7b3 --- /dev/null +++ b/include/dolphin/gx/GXTev.h @@ -0,0 +1,37 @@ +#ifndef GXTEV_H +#define GXTEV_H + +#include "dolphin/gx/GXEnum.h" +#include "dolphin/gx/GXStruct.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXSetTevOp(GXTevStageID id, GXTevMode mode); +void GXSetTevColorIn(GXTevStageID stage, GXTevColorArg a, GXTevColorArg b, GXTevColorArg c, + GXTevColorArg d); +void GXSetTevAlphaIn(GXTevStageID stage, GXTevAlphaArg a, GXTevAlphaArg b, GXTevAlphaArg c, + GXTevAlphaArg d); +void GXSetTevColorOp(GXTevStageID stage, GXTevOp op, GXTevBias bias, GXTevScale scale, GXBool clamp, + GXTevRegID out_reg); +void GXSetTevAlphaOp(GXTevStageID stage, GXTevOp op, GXTevBias bias, GXTevScale scale, GXBool clamp, + GXTevRegID out_reg); +void GXSetTevColor(GXTevRegID id, GXColor color); +void GXSetTevColorS10(GXTevRegID id, GXColorS10 color); +void GXSetTevKColor(GXTevKColorID id, GXColor color); +void GXSetTevKColorSel(GXTevStageID stage, GXTevKColorSel color_sel); +void GXSetTevKAlphaSel(GXTevStageID stage, GXTevKAlphaSel alpha_sel); +void GXSetTevSwapMode(GXTevStageID stage, GXTevSwapSel ras_sel, GXTevSwapSel tex_sel); +void GXSetTevSwapModeTable(GXTevSwapSel select, GXTevColor r, GXTevColor g, GXTevColor b, + GXTevColor a); +void GXSetAlphaCompare(GXCompare comp0, u8 ref0, GXAlphaOp op, GXCompare comp1, u8 ref1); +void GXSetZTexture(GXZTexOp op, GXTexFmt fmt, u32 bias); +void GXSetTevOrder(GXTevStageID stage, GXTexCoordID coord, GXTexMapID map, GXChannelID color); +void GXSetNumTevStages(u8 num_stages); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXTEV_H */ diff --git a/include/dolphin/gx/GXTexture.h b/include/dolphin/gx/GXTexture.h new file mode 100644 index 0000000..e10c9f8 --- /dev/null +++ b/include/dolphin/gx/GXTexture.h @@ -0,0 +1,47 @@ +#ifndef GXTEXTURE_H +#define GXTEXTURE_H + +#include "dolphin/gx/GXInit.h" + +#ifdef __cplusplus +extern "C" { +#endif + +u32 GXGetTexBufferSize(u16 width, u16 height, u32 format, GXBool mipmap, u8 max_lod); +void __GetImageTileCount(u32 arg0, s16 arg1, s16 arg2, s32* arg3, s32* arg4, s32* arg5); +void GXInitTexObj(GXTexObj* obj, void* image, u16 width, u16 height, GXTexFmt fmt, + GXTexWrapMode wrapS, GXTexWrapMode wrapT, GXBool mipmap); +void GXInitTexObjCI(GXTexObj* obj, void* image, u16 width, u16 height, GXCITexFmt format, + GXTexWrapMode wrapS, GXTexWrapMode wrapT, GXBool mipmap, u32 tlut_name); +void GXInitTexObjLOD(GXTexObj* obj, GXTexFilter min_filter, GXTexFilter max_filter, f32 min_lod, + f32 max_lod, f32 lod_bias, GXBool bias_clamp, GXBool edge_lod, + GXAnisotropy aniso); +u16 GXGetTexObjWidth(GXTexObj* obj); +u16 GXGetTexObjHeight(GXTexObj* obj); +GXTexFmt GXGetTexObjFmt(GXTexObj* obj); +GXTexWrapMode GXGetTexObjWrapS(GXTexObj* obj); +GXTexWrapMode GXGetTexObjWrapT(GXTexObj* obj); +GXBool GXGetTexObjMipMap(GXTexObj* obj); +u32 GXGetTexObjTlut(GXTexObj* obj); +void GXLoadTexObj(GXTexObj* obj, GXTexMapID id); +void GXInitTlutObj(GXTlutObj* obj, void* lut, GXTlutFmt fmt, u16 entry_num); +void GXLoadTlut(GXTlutObj* obj, u32 tlut_name); +void GXInitTexCacheRegion(GXTexRegion* region, GXBool is_32b_mipmap, u32 tmem_even, + GXTexCacheSize size_even, u32 tmem_odd, GXTexCacheSize size_odd); +void GXInitTlutRegion(GXTlutRegion* region, u32 tmem_addr, GXTlutSize tlut_size); +void GXInvalidateTexAll(void); + +GXTexRegionCallback GXSetTexRegionCallback(GXTexRegionCallback callback); +GXTlutRegionCallback GXSetTlutRegionCallback(GXTlutRegionCallback callback); + +void GXSetTexCoordScaleManually(GXTexCoordID coord, GXBool enable, u16 s_scale, u16 t_scale); + +void __SetSURegs(); +void __GXSetSUTexRegs(); +void __GXSetTmemConfig(); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXTEXTURE_H */ diff --git a/include/dolphin/gx/GXTransform.h b/include/dolphin/gx/GXTransform.h new file mode 100644 index 0000000..3eaad46 --- /dev/null +++ b/include/dolphin/gx/GXTransform.h @@ -0,0 +1,31 @@ +#ifndef GXTRANSFORM_H +#define GXTRANSFORM_H + +#include "dolphin/gx/GXEnum.h" +#include "dolphin/mtx/mtx.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GXProject(f32 model_x, f32 model_y, f32 model_z, Mtx model_mtx, f32* proj_mtx, f32* viewpoint, + f32* screen_x, f32* screen_y, f32* screen_z); +void GXSetProjection(Mtx44 mtx, GXProjectionType type); +void GXSetProjectionv(f32* p); +void GXGetProjectionv(f32* p); +void GXLoadPosMtxImm(Mtx mtx, u32 id); +void GXLoadNrmMtxImm(Mtx mtx, u32 id); +void GXSetCurrentMtx(u32 id); +void GXLoadTexMtxImm(Mtx mtx, u32 id, GXTexMtxType type); +void GXSetViewport(f32 x_orig, f32 y_orig, f32 width, f32 height, f32 near_z, f32 far_z); +void GXGetViewportv(f32* p); +void GXSetScissor(u32 left, u32 top, u32 width, u32 height); +void GXGetScissor(u32* left, u32* top, u32* width, u32* height); +void GXSetScissorBoxOffset(u32 x_offset, u32 y_offset); +void GXSetClipMode(GXClipMode mode); + +#ifdef __cplusplus +}; +#endif + +#endif /* GXTRANSFORM_H */ diff --git a/include/dolphin/os/OS.h b/include/dolphin/os/OS.h new file mode 100644 index 0000000..21bbc49 --- /dev/null +++ b/include/dolphin/os/OS.h @@ -0,0 +1,311 @@ +#ifndef OS_H_ +#define OS_H_ + +#include "Runtime.PPCEABI.H/__va_arg.h" +#include "dolphin/dvd/dvd.h" + +#include "dolphin/os/OSAlarm.h" +#include "dolphin/os/OSAlloc.h" +#include "dolphin/os/OSArena.h" +#include "dolphin/os/OSAudioSystem.h" +#include "dolphin/os/OSCache.h" +#include "dolphin/os/OSContext.h" +#include "dolphin/os/OSError.h" +#include "dolphin/os/OSExec.h" +#include "dolphin/os/OSFont.h" +#include "dolphin/os/OSInterrupt.h" +#include "dolphin/os/OSLink.h" +#include "dolphin/os/OSMemory.h" +#include "dolphin/os/OSMessage.h" +#include "dolphin/os/OSMutex.h" +#include "dolphin/os/OSReboot.h" +#include "dolphin/os/OSReset.h" +#include "dolphin/os/OSResetSW.h" +#include "dolphin/os/OSRtc.h" +#include "dolphin/os/OSSync.h" +#include "dolphin/os/OSThread.h" +#include "dolphin/os/OSTime.h" + +#ifdef __cplusplus +extern "C" { +#endif + +// Upper words of the masks, since UIMM is only 16 bits +#define OS_CACHED_REGION_PREFIX 0x8000 +#define OS_UNCACHED_REGION_PREFIX 0xC000 +#define OS_PHYSICAL_MASK 0x3FFF + +#define OS_BASE_CACHED (OS_CACHED_REGION_PREFIX << 16) +#define OS_BASE_UNCACHED (OS_UNCACHED_REGION_PREFIX << 16) + +#define OS_CONSOLE_MASK 0xf0000000 +#define OS_CONSOLE_RETAIL 0x00000000 +#define OS_CONSOLE_DEVELOPMENT 0x10000000 +#define OS_CONSOLE_TDEV 0x20000000 + +#define OS_CONSOLE_RETAIL4 0x00000004 +#define OS_CONSOLE_RETAIL3 0x00000003 +#define OS_CONSOLE_RETAIL2 0x00000002 +#define OS_CONSOLE_RETAIL1 0x00000001 +#define OS_CONSOLE_TDEVHW4 0x20000007 +#define OS_CONSOLE_TDEVHW3 0x20000006 +#define OS_CONSOLE_TDEVHW2 0x20000005 +#define OS_CONSOLE_TDEVHW1 0x20000004 +#define OS_CONSOLE_DEVHW4 0x10000007 +#define OS_CONSOLE_DEVHW3 0x10000006 +#define OS_CONSOLE_DEVHW2 0x10000005 +#define OS_CONSOLE_DEVHW1 0x10000004 +#define OS_CONSOLE_MINNOW 0x10000003 +#define OS_CONSOLE_ARTHUR 0x10000002 +#define OS_CONSOLE_PC_EMULATOR 0x10000001 +#define OS_CONSOLE_EMULATOR 0x10000000 + +volatile u16 __OSDeviceCode : 0x800030E6; + +volatile u32 OS_PI_INTR_CAUSE : 0xCC003000; +volatile u32 OS_PI_INTR_MASK : 0xCC003004; + +volatile u16 OS_MI_INTR_MASK : 0xCC00401C; + +volatile u16 OS_DSP_DMA_ADDR_HI : 0xCC005030; +volatile u16 OS_DSP_DMA_ADDR_LO : 0xCC005032; +volatile u16 OS_DSP_INTR_MASK : 0xCC00500A; + +volatile u16 OS_ARAM_DMA_ADDR_HI : 0xCC005020; +volatile u16 OS_ARAM_DMA_ADDR_LO : 0xCC005022; + +BOOL OSIsThreadSuspended(OSThread* thread); + +u32 OSGetConsoleType(void); + +void OSAttention(const char* msg, ...); +void OSPanic(const char* file, s32 line, const char* fmt, ...); +void OSReport(const char* fmt, ...); +void OSReport_Error(const char* fmt, ...); +void OSReport_FatalError(const char* fmt, ...); +void OSReport_System(const char* fmt, ...); +void OSReport_Warning(const char* fmt, ...); +void OSReportDisable(void); +void OSReportEnable(void); +void OSReportForceEnableOff(void); +void OSReportForceEnableOn(void); +void OSVReport(const char* format, va_list list); +void OSVAttention(const char* fmt, va_list args); +void OSReportInit(void); + +extern u8 __OSReport_disable; +extern u8 __OSReport_Error_disable; +extern u8 __OSReport_Warning_disable; +extern u8 __OSReport_System_disable; +extern u8 __OSReport_enable; + +void OSReportInit__Fv(void); // needed for inline asm + +u8* OSGetStackPointer(void); +void __OSFPRInit(void); +static void InquiryCallback(u32 param_0, DVDCommandBlock* param_1); +void OSInit(void); +static void OSExceptionInit(void); +void __OSDBIntegrator(void); +void __OSDBJump(void); + +typedef void (*OSExceptionHandler)(__OSException, OSContext*); +OSExceptionHandler __OSSetExceptionHandler(__OSException exception, OSExceptionHandler handler); +OSExceptionHandler __OSGetExceptionHandler(__OSException exception); +static void OSExceptionVector(void); +void __DBVECTOR(); +void __OSEVSetNumber(); +void __OSEVEnd(); +static void OSDefaultExceptionHandler(__OSException exception, OSContext* context); +void __OSPSInit(void); +u32 __OSGetDIConfig(void); +void OSRegisterVersion(const char* version); +void OSSwitchFiberEx(u32, u32, u32, u32, u32, u32); + +inline s16 __OSf32tos16(register f32 inF) { + register s16 out; + u32 tmp; + register u32* tmpPtr = &tmp; + // clang-format off + asm { + psq_st inF, 0(tmpPtr), 0x1, 5 + lha out, 0(tmpPtr) + } + // clang-format on + + return out; +} + +inline void OSf32tos16(f32* f, s16* out) { + *out = __OSf32tos16(*f); +} + +inline u8 __OSf32tou8(register f32 inF) { + register u8 out; + u32 tmp; + register u32* tmpPtr = &tmp; + // clang-format off + asm { + psq_st inF, 0(tmpPtr), 0x1, 2 + lbz out, 0(tmpPtr) + } + // clang-format on + + return out; +} + +inline void OSf32tou8(f32* f, u8* out) { + *out = __OSf32tou8(*f); +} + +inline void i_OSInitFastCast(void) { + // clang-format off + asm { + li r3, 4 + oris r3, r3, 4 + mtspr 0x392, r3 + li r3, 5 + oris r3, r3, 5 + mtspr 0x393, r3 + li r3, 6 + oris r3, r3, 6 + mtspr 0x394, r3 + li r3, 7 + oris r3, r3, 7 + mtspr 0x395, r3 + } + // clang-format on +} + +typedef struct OSBootInfo { + /* 0x00 */ DVDDiskID disk_info; + /* 0x20 */ u32 boot_code; + /* 0x24 */ u32 version; + /* 0x28 */ u32 memory_size; + /* 0x2C */ u32 console_type; + /* 0x30 */ void* arena_lo; + /* 0x34 */ void* arena_hi; + /* 0x38 */ void* fst_location; + /* 0x3C */ u32 fst_max_length; +} OSBootInfo; + +typedef struct { + BOOL valid; + u32 restartCode; + u32 bootDol; + void* regionStart; + void* regionEnd; + BOOL argsUseDefault; + void* argsAddr; // valid only when argsUseDefault = FALSE +} OSExecParams; + +typedef struct BI2Debug { + /* 0x00 */ s32 debugMonSize; + /* 0x04 */ s32 simMemSize; + /* 0x08 */ u32 argOffset; + /* 0x0C */ u32 debugFlag; + /* 0x10 */ int trackLocation; + /* 0x14 */ int trackSize; + /* 0x18 */ u32 countryCode; + /* 0x1C */ u8 unk[8]; + /* 0x24 */ u32 padSpec; +} BI2Debug; + +struct GLOBAL_MEMORY { + DVDDiskID disk; + u32 nintendo_boot_code; /* Nintendo Standard Boot Code. */ + u32 field_0x24; /* Version (set by apploader) */ + u32 memory_size; /* Memory Size (Physical) 24MB */ + u32 field_0x2c; /* Production Board Model */ + u32 arena_low; /* Arena Low */ + u32 arena_high; /* Arena High */ + u32 field_0x38; /* Start of FST (varies in all games) */ + u32 field_0x3c; /* Maximum FST Size (varies in all games) */ + u8 padding_0x40[32]; + u8 field_0x60[36]; /* Hook is PPC assembler used by Debugger. */ + u8 padding_0x84[84]; + OSContext* field_0xd8; /* Current OSContext instance. */ + OSThread* field_0xdc; /* OSThread pointer, previously created thread. */ + OSThread* field_0xe0; /* OSThread pointer, most recently created thread. */ + OSThread* field_0xe4; /* Current thread pointer. */ + u32 field_0xe8; /* Dev Debugger Monitor Address (If present) */ + u32 field_0xec; /* Simulated Memory Size */ + u32 field_0xf0; /* Pointer to data read from partition's bi2.bin, set by apploader */ + u32 field_0xf4; /* Console Bus Speed */ + u32 field_0xf8; /* Console CPU Speed */ + u8 padding_0xfc[5892]; + u8 field_0x1800[6144]; /* Unused Exception Vector */ + u8 padding_0x3000[64]; + u32 field_0x3040[34]; /* __OSInterrupt table. */ + u32 field_0x30c8; /* Pointer to the first loaded REL file. */ + u32 field_0x30cc; /* Pointer to the last loaded REL file. */ + u32 field_0x30d0; /* Pointer to a REL module name table, or 0. */ + u8 padding_0x30d8[4]; + u64 field_0x30d8; /* System time */ + u8 padding_0x30e0[4]; + u32 field_0x30e4; /* __OSPADButton */ + u8 padding_0x30ec[8]; + u32 field_0x30f0; /* DOL Execute Parameters */ + u8 padding_0x30f4[12]; + u32 field_0x3100; /* Physical MEM1 size */ + u32 field_0x3104; /* Simulated MEM1 size */ + u8 padding_0x3108[8]; + u32 field_0x3110; /* Heap pointer (end of usable memory by the game) */ + u8 padding_0x3114[4]; + u32 field_0x3118; /* Physical MEM2 size */ + u32 field_0x311c; /* Simulated MEM2 size */ + u8 padding_0x3120[16]; + u32 field_0x3130; /* IOS Heap Range (start) */ + u32 field_0x3134; /* IOS Heap Range (end) */ + u32 field_0x3138; /* Hollywood Version */ + u8 padding_0x313c[4]; + u32 field_0x3140; /* IOS version */ + u32 field_0x3144; /* IOS Build Date */ + u8 padding_0x3148[16]; + u32 field_0x3158; /* GDDR Vendor Code */ + u32 field_0x315c; /* During the boot process, */ + u32 field_0x3160; /* Init semaphore (1-2 main() waits for this to clear) */ + u32 field_0x3164; /* GC (MIOS) mode flag? */ + u8 padding_0x3168[24]; + u32 field_0x3180; /* Game ID */ + u8 field_0x3184; /* Application type. 0x80 for disc games, 0x81 for channels. */ + u8 padding_0x3185; + u8 field_0x3186; /* Application type 2 */ + u8 padding_0x3187; + u32 field_0x3188; /* Minimum IOS version */ + u32 field_0x318c; /* Title Booted from NAND (Launch Code) */ + u32 field_0x3190; /* Title Booted from NAND (Return Code) */ + u32 field_0x3194; /* While reading a disc, the system menu reads the first partition table (0x20 + bytes from 0x00040020) and stores a pointer to the data partition entry. + When launching the disc game, it copies the partition type to 0x3194. The + partition type for data partitions is 0, so typically this location always + has 0. */ + u32 field_0x3198; /* While reading a disc, the system menu reads the first partition table (0x20 + bytes from 0x00040020) and stores a pointer to the data partition entry. + When launching the disc game, it copies the partition offset to 0x3198. */ + u32 field_0x319c; /* Set by the apploader to 0x80 for single-layer discs and 0x81 for dual-layer + discs (determined by whether 0x7ed40000 is the value at offset 0x30 in the + partition's bi2.bin; it seems that that value is 0 for single-layer discs). + Early titles' apploaders do not set it at all, leaving the value as 0. This + controls the /dev/di#0x8D_DVDLowUnencryptedRead out-of-bounds Error #001 + read for titles that do make such a read: they try to read at 0x7ed40000 + for dual-layer discs and 0x460a0000 for single-layer discs. */ + u8 field_0x31a0[3424]; +}; + +#define OS_ASSERT(...) + +#define OSPhysicalToCached(paddr) ((void*)((u32)(paddr) + OS_BASE_CACHED)) +#define OSPhysicalToUncached(paddr) ((void*)((u32)(paddr) + OS_BASE_UNCACHED)) +#define OSCachedToPhysical(caddr) ((u32)((u8*)(caddr)-OS_BASE_CACHED)) +#define OSUncachedToPhysical(ucaddr) ((u32)((u8*)(ucaddr)-OS_BASE_UNCACHED)) +#define OSCachedToUncached(caddr) ((void*)((u8*)(caddr) + (OS_BASE_UNCACHED - OS_BASE_CACHED))) +#define OSUncachedToCached(ucaddr) ((void*)((u8*)(ucaddr) - (OS_BASE_UNCACHED - OS_BASE_CACHED))) + +extern OSTime __OSStartTime; + +#ifdef __cplusplus +}; +#endif + +#endif diff --git a/include/dolphin/os/OSAlarm.h b/include/dolphin/os/OSAlarm.h new file mode 100644 index 0000000..658e988 --- /dev/null +++ b/include/dolphin/os/OSAlarm.h @@ -0,0 +1,46 @@ +#ifndef OSALARM_H +#define OSALARM_H + +#include "dolphin/os/OSError.h" +#include "dolphin/os/OSTime.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct OSAlarmLink { + /* 0x0 */ struct OSAlarm* prev; + /* 0x4 */ struct OSAlarm* next; +} OSAlarmLink; + +typedef struct OSAlarm; +typedef void (*OSAlarmHandler)(struct OSAlarm* alarm, OSContext* context); + +typedef struct OSAlarm { + /* 0x00 */ OSAlarmHandler handler; + /* 0x04 */ u32 tag; + /* 0x08 */ OSTime fire_time; + /* 0x10 */ OSAlarmLink link; + /* 0x18 */ OSTime period_time; + /* 0x20 */ OSTime start_time; +} OSAlarm; // Size: 0x28 + +typedef struct OSAlarmQueue { + OSAlarm* head; + OSAlarm* tail; +} OSAlarmQueue; + +void OSInitAlarm(void); +void OSCreateAlarm(OSAlarm* alarm); +static void InsertAlarm(OSAlarm* alarm, s64 time, OSAlarmHandler handler); +void OSSetAlarm(OSAlarm* alarm, s64 time, OSAlarmHandler handler); +void OSSetPeriodicAlarm(OSAlarm* alarm, s64 start, s64 period, OSAlarmHandler handler); +void OSCancelAlarm(OSAlarm* alarm); +static void DecrementerExceptionCallback(__OSException exception, OSContext* context); +static void DecrementerExceptionHandler(__OSException exception, OSContext* context); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSALARM_H */ diff --git a/include/dolphin/os/OSAlloc.h b/include/dolphin/os/OSAlloc.h new file mode 100644 index 0000000..ffb5e0c --- /dev/null +++ b/include/dolphin/os/OSAlloc.h @@ -0,0 +1,48 @@ +#ifndef OSALLOC_H +#define OSALLOC_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct OSHeapDescriptor { + /* 0x0 */ s32 size; + /* 0x4 */ struct OSHeapCell* freeList; + /* 0x8 */ struct OSHeapCell* usedList; +} OSHeapDescriptor; + +typedef struct OSHeapCell { + /* 0x00 */ struct OSHeapCell* prev; + /* 0x04 */ struct OSHeapCell* next; + /* 0x08 */ s32 size; + /* 0x0C */ struct OSHeapDescriptor* hd; + /* 0x10 */ s32 usedSize; + /* 0x14 */ char field_0x14[0x20 - 0x14]; +} OSHeapCell; + +typedef u32 OSHeapHandle; + +extern volatile s32 __OSCurrHeap; + +#define OSRoundUp32B(x) (((u32)(x) + 0x1F) & ~(0x1F)) +#define OSRoundDown32B(x) (((u32)(x)) & ~(0x1F)) + +#define OSRoundUp(x, align) (((x) + (align)-1) & (-(align))) +#define OSRoundUpPtr(x, align) ((void*)((((u32)(x)) + (align)-1) & (~((align)-1)))) + +#define OSRoundDown(x, align) ((x) & (-(align))) +#define OSRoundDownPtr(x, align) ((void*)(((u32)(x)) & (~((align)-1)))) + +static OSHeapCell* DLInsert(OSHeapCell* list, OSHeapCell* child); +void OSFreeToHeap(OSHeapHandle handle, void* ptr); +s32 OSSetCurrentHeap(OSHeapHandle handle); +void* OSInitAlloc(void* lo, void* hi, s32 maxHeaps); +OSHeapHandle OSCreateHeap(void* start, void* end); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSALLOC_H */ diff --git a/include/dolphin/os/OSArena.h b/include/dolphin/os/OSArena.h new file mode 100644 index 0000000..4e5a76c --- /dev/null +++ b/include/dolphin/os/OSArena.h @@ -0,0 +1,20 @@ +#ifndef OSARENA_H +#define OSARENA_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void* OSGetArenaHi(void); +void* OSGetArenaLo(void); +void OSSetArenaHi(void* hi); +void OSSetArenaLo(void* lo); +void* OSAllocFromArenaLo(u32 size, s32 alignment); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSARENA_H */ diff --git a/include/dolphin/os/OSAudioSystem.h b/include/dolphin/os/OSAudioSystem.h new file mode 100644 index 0000000..cf1f3ed --- /dev/null +++ b/include/dolphin/os/OSAudioSystem.h @@ -0,0 +1,16 @@ +#ifndef OSAUDIOSYSTEM_H +#define OSAUDIOSYSTEM_H + + +#ifdef __cplusplus +extern "C" { +#endif + +void __OSInitAudioSystem(void); +void __OSStopAudioSystem(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSAUDIOSYSTEM_H */ diff --git a/include/dolphin/os/OSCache.h b/include/dolphin/os/OSCache.h new file mode 100644 index 0000000..2388542 --- /dev/null +++ b/include/dolphin/os/OSCache.h @@ -0,0 +1,34 @@ +#ifndef OSCACHE_H +#define OSCACHE_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +static void DCEnable(void); +void DCInvalidateRange(void* start, u32 nBytes); +void DCFlushRange(void* start, u32 nBytes); +void DCStoreRange(void* start, u32 nBytes); +void DCFlushRangeNoSync(void* start, u32 nBytes); +void DCStoreRangeNoSync(void* start, u32 nBytes); +void DCZeroRange(void* start, u32 nBytes); +void ICInvalidateRange(void* start, u32 nBytes); +void ICFlashInvalidate(void); +static void ICEnable(void); +void __LCEnable(void); +void LCEnable(void); +void LCDisable(void); +static void LCStoreBlocks(void* destAddr, void* srcAddr, u32 blockNum); +u32 LCStoreData(void* destAddr, void* srcAddr, u32 nBytes); +void LCQueueWait(u32 len); +static void L2GlobalInvalidate(void); +static void DMAErrorHandler(u16 error, struct OSContext* context, ...); +void __OSCacheInit(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSCACHE_H */ diff --git a/include/dolphin/os/OSContext.h b/include/dolphin/os/OSContext.h new file mode 100644 index 0000000..78562a3 --- /dev/null +++ b/include/dolphin/os/OSContext.h @@ -0,0 +1,175 @@ +#ifndef OSCONTEXT_H +#define OSCONTEXT_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define __OS_CONTEXT_FRAME 768 + +#define OS_CONTEXT_R0 0 +#define OS_CONTEXT_R1 4 +#define OS_CONTEXT_R2 8 +#define OS_CONTEXT_R3 12 +#define OS_CONTEXT_R4 16 +#define OS_CONTEXT_R5 20 +#define OS_CONTEXT_R6 24 +#define OS_CONTEXT_R7 28 +#define OS_CONTEXT_R8 32 +#define OS_CONTEXT_R9 36 +#define OS_CONTEXT_R10 40 +#define OS_CONTEXT_R11 44 +#define OS_CONTEXT_R12 48 +#define OS_CONTEXT_R13 52 +#define OS_CONTEXT_R14 56 +#define OS_CONTEXT_R15 60 +#define OS_CONTEXT_R16 64 +#define OS_CONTEXT_R17 68 +#define OS_CONTEXT_R18 72 +#define OS_CONTEXT_R19 76 +#define OS_CONTEXT_R20 80 +#define OS_CONTEXT_R21 84 +#define OS_CONTEXT_R22 88 +#define OS_CONTEXT_R23 92 +#define OS_CONTEXT_R24 96 +#define OS_CONTEXT_R25 100 +#define OS_CONTEXT_R26 104 +#define OS_CONTEXT_R27 108 +#define OS_CONTEXT_R28 112 +#define OS_CONTEXT_R29 116 +#define OS_CONTEXT_R30 120 +#define OS_CONTEXT_R31 124 + +#define OS_CONTEXT_CR 128 +#define OS_CONTEXT_LR 132 +#define OS_CONTEXT_CTR 136 +#define OS_CONTEXT_XER 140 + +#define OS_CONTEXT_FPR0 144 +#define OS_CONTEXT_FPR1 152 +#define OS_CONTEXT_FPR2 160 +#define OS_CONTEXT_FPR3 168 +#define OS_CONTEXT_FPR4 176 +#define OS_CONTEXT_FPR5 184 +#define OS_CONTEXT_FPR6 192 +#define OS_CONTEXT_FPR7 200 +#define OS_CONTEXT_FPR8 208 +#define OS_CONTEXT_FPR9 216 +#define OS_CONTEXT_FPR10 224 +#define OS_CONTEXT_FPR11 232 +#define OS_CONTEXT_FPR12 240 +#define OS_CONTEXT_FPR13 248 +#define OS_CONTEXT_FPR14 256 +#define OS_CONTEXT_FPR15 264 +#define OS_CONTEXT_FPR16 272 +#define OS_CONTEXT_FPR17 280 +#define OS_CONTEXT_FPR18 288 +#define OS_CONTEXT_FPR19 296 +#define OS_CONTEXT_FPR20 304 +#define OS_CONTEXT_FPR21 312 +#define OS_CONTEXT_FPR22 320 +#define OS_CONTEXT_FPR23 328 +#define OS_CONTEXT_FPR24 336 +#define OS_CONTEXT_FPR25 344 +#define OS_CONTEXT_FPR26 352 +#define OS_CONTEXT_FPR27 360 +#define OS_CONTEXT_FPR28 368 +#define OS_CONTEXT_FPR29 376 +#define OS_CONTEXT_FPR30 384 +#define OS_CONTEXT_FPR31 392 + +#define OS_CONTEXT_FPSCR 400 + +#define OS_CONTEXT_SRR0 408 +#define OS_CONTEXT_SRR1 412 + +#define OS_CONTEXT_MODE 416 +#define OS_CONTEXT_STATE 418 + +#define OS_CONTEXT_GQR0 420 +#define OS_CONTEXT_GQR1 424 +#define OS_CONTEXT_GQR2 428 +#define OS_CONTEXT_GQR3 432 +#define OS_CONTEXT_GQR4 436 +#define OS_CONTEXT_GQR5 440 +#define OS_CONTEXT_GQR6 444 +#define OS_CONTEXT_GQR7 448 +#define __OSCONTEXT_PADDING 452 + +#define OS_CONTEXT_PSF0 456 +#define OS_CONTEXT_PSF1 464 +#define OS_CONTEXT_PSF2 472 +#define OS_CONTEXT_PSF3 480 +#define OS_CONTEXT_PSF4 488 +#define OS_CONTEXT_PSF5 496 +#define OS_CONTEXT_PSF6 504 +#define OS_CONTEXT_PSF7 512 +#define OS_CONTEXT_PSF8 520 +#define OS_CONTEXT_PSF9 528 +#define OS_CONTEXT_PSF10 536 +#define OS_CONTEXT_PSF11 544 +#define OS_CONTEXT_PSF12 552 +#define OS_CONTEXT_PSF13 560 +#define OS_CONTEXT_PSF14 568 +#define OS_CONTEXT_PSF15 576 +#define OS_CONTEXT_PSF16 584 +#define OS_CONTEXT_PSF17 592 +#define OS_CONTEXT_PSF18 600 +#define OS_CONTEXT_PSF19 608 +#define OS_CONTEXT_PSF20 616 +#define OS_CONTEXT_PSF21 624 +#define OS_CONTEXT_PSF22 632 +#define OS_CONTEXT_PSF23 640 +#define OS_CONTEXT_PSF24 648 +#define OS_CONTEXT_PSF25 656 +#define OS_CONTEXT_PSF26 664 +#define OS_CONTEXT_PSF27 672 +#define OS_CONTEXT_PSF28 680 +#define OS_CONTEXT_PSF29 688 +#define OS_CONTEXT_PSF30 696 +#define OS_CONTEXT_PSF31 704 +#define OS_CONTEXT_STATE_EXC 0x02u + +#define OS_CONTEXT_STATE_FPSAVED 0x01u + +typedef struct OSContext { + /* 0x000 */ u32 gpr[32]; + /* 0x080 */ u32 cr; + /* 0x084 */ u32 lr; + /* 0x088 */ u32 ctr; + /* 0x08C */ u32 xer; + /* 0x090 */ f64 fpr[32]; + /* 0x190 */ u32 field_0x190; + /* 0x194 */ u32 fpscr; + /* 0x198 */ u32 srr0; + /* 0x19C */ u32 srr1; + /* 0x1A0 */ u16 mode; + /* 0x1A2 */ u16 state; + /* 0x1A4 */ u32 gqr[8]; + /* 0x1C4 */ f64 ps[32]; +} OSContext; + +OSContext* OS_CURRENT_CONTEXT : 0x800000D4; +OSContext* OS_CURRENT_FPU_CONTEXT : 0x800000D8; + +void __OSLoadFPUContext(void); +void __OSSaveFPUContext(s32 unused0, s32 unused1, OSContext* context); +void OSSaveFPUContext(OSContext* context); +void OSSetCurrentContext(OSContext* context); +OSContext* OSGetCurrentContext(void); +u32 OSSaveContext(OSContext* context); +void OSLoadContext(OSContext* context); +void OSClearContext(OSContext* context); +void OSInitContext(OSContext* context, u32 pc, u32 lr); +void OSDumpContext(OSContext* context); +static void OSSwitchFPUContext(u8 err, OSContext* context); +void __OSContextInit(void); +void OSFillFPUContext(OSContext* context); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSCONTEXT_H */ diff --git a/include/dolphin/os/OSError.h b/include/dolphin/os/OSError.h new file mode 100644 index 0000000..833ce34 --- /dev/null +++ b/include/dolphin/os/OSError.h @@ -0,0 +1,66 @@ +#ifndef OSERROR_H +#define OSERROR_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct OSContext OSContext; + +extern u32 __OSFpscrEnableBits; +typedef u16 OSError; + +#define OS_ERROR_SYSTEM_RESET 0 +#define OS_ERROR_MACHINE_CHECK 1 +#define OS_ERROR_DSI 2 +#define OS_ERROR_ISI 3 +#define OS_ERROR_INTERRUPT 4 +#define OS_ERROR_ALIGNMENT 5 +#define OS_ERROR_PROGRAM 6 +#define OS_ERROR_FLOATING_POINT 7 +#define OS_ERROR_DECREMENTER 8 +#define OS_ERROR_SYSTEM_CALL 9 +#define OS_ERROR_TRACE 10 +#define OS_ERROR_PERFORMANCE_MONITOR 11 +#define OS_ERROR_BREAKPOINT 12 +#define OS_ERROR_RESERVED 13 +#define OS_ERROR_THERMAL_INTERRUPT 14 +#define OS_ERROR_MEMORY_PROTECTION 15 +#define OS_ERROR_FLOATING_POINT_EXCEPTION 16 + +typedef enum { + EXCEPTION_SYSTEM_RESET, + EXCEPTION_MACHINE_CHECK, + EXCEPTION_DSI, + EXCEPTION_ISI, + EXCEPTION_EXTERNAL_INTERRUPT, + EXCEPTION_ALIGNMENT, + EXCEPTION_PROGRAM, + EXCEPTION_FLOATING_POINT, + EXCEPTION_DECREMENTER, + EXCEPTION_SYSTEM_CALL, + EXCEPTION_TRACE , + EXCEPTION_PERFORMANCE_MONITOR, + EXCEPTION_BREAKPOINT, + EXCEPTION_RESERVED, + EXCEPTION_THERMAL_INTERRUPT, + EXCEPTION_MEMORY_PROTECTION, + EXCEPTION_FLOATING_POINT_EXCEPTION, +} OSException; + +typedef u8 __OSException; + +typedef void (*OSErrorHandler)(OSError error, OSContext* context, u32, u32); +// Using this type for the C++ handlers makes stuff not match +typedef void (*OSErrorHandlerEx)(OSError error, OSContext* context, u32, u32, ...); + +OSErrorHandler OSSetErrorHandler(OSError error, OSErrorHandler handler); +void __OSUnhandledException(__OSException exception, OSContext* context, u32 dsisr, u32 dar); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSERROR_H */ diff --git a/include/dolphin/os/OSExec.h b/include/dolphin/os/OSExec.h new file mode 100644 index 0000000..cb6a2a9 --- /dev/null +++ b/include/dolphin/os/OSExec.h @@ -0,0 +1,23 @@ +#ifndef OSEXEC_H +#define OSEXEC_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +static s32 PackArgs(void* param_0, u32 param_1, void* param_2); +static void Run(void); +static void ReadDisc(void* param_0, s32 param_1, s32 param_2); +static void Callback(void); +void __OSGetExecParams(void* param_0); +static void GetApploaderPosition(void); +void __OSBootDolSimple(u32 param_0, u32 param_1, void* param_2, void* param_3, s32 param_4, u32 param_5, void* param_6); +void __OSBootDol(s32 param_0, u32 param_1, s32 param_2); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSEXEC_H */ diff --git a/include/dolphin/os/OSFont.h b/include/dolphin/os/OSFont.h new file mode 100644 index 0000000..cc29b50 --- /dev/null +++ b/include/dolphin/os/OSFont.h @@ -0,0 +1,18 @@ +#ifndef OSFONT_H +#define OSFONT_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +static u32 GetFontCode(s16 param_0, u32 param_1); +u16 OSGetFontEncode(void); +static char* ParseStringS(s16 param_0, char* param_1, void* param_2, u32* param_3, u32 param_4, void* param_5); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSFONT_H */ diff --git a/include/dolphin/os/OSInterrupt.h b/include/dolphin/os/OSInterrupt.h new file mode 100644 index 0000000..5726d44 --- /dev/null +++ b/include/dolphin/os/OSInterrupt.h @@ -0,0 +1,131 @@ +#ifndef OSINTERRUPT_H +#define OSINTERRUPT_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct OSContext OSContext; + +typedef enum { + OS_INTR_MEM_0, + OS_INTR_MEM_1, + OS_INTR_MEM_2, + OS_INTR_MEM_3, + OS_INTR_MEM_ADDRESS, + OS_INTR_DSP_AI, + OS_INTR_DSP_ARAM, + OS_INTR_DSP_DSP, + OS_INTR_AI_AI, + OS_INTR_EXI_0_EXI, + OS_INTR_EXI_0_TC, + OS_INTR_EXI_0_EXT, + OS_INTR_EXI_1_EXI, + OS_INTR_EXI_1_TC, + OS_INTR_EXI_1_EXT, + OS_INTR_EXI_2_EXI, + OS_INTR_EXI_2_TC, + OS_INTR_PI_CP, + OS_INTR_PI_PE_TOKEN, + OS_INTR_PI_PE_FINISH, + OS_INTR_PI_SI, + OS_INTR_PI_DI, + OS_INTR_PI_RSW, + OS_INTR_PI_ERROR, + OS_INTR_PI_VI, + OS_INTR_PI_DEBUG, + OS_INTR_PI_HSP, + OS_INTR_PI_ACR, + OS_INTR_28, + OS_INTR_29, + OS_INTR_30, + OS_INTR_31, + + OS_INTR_MAX +} OSInterruptType; + +#define OS_INTERRUPTMASK(interrupt) (0x80000000u >> (interrupt)) + +#define OS_INTERRUPTMASK_MEM_0 OS_INTERRUPTMASK(OS_INTR_MEM_0) +#define OS_INTERRUPTMASK_MEM_1 OS_INTERRUPTMASK(OS_INTR_MEM_1) +#define OS_INTERRUPTMASK_MEM_2 OS_INTERRUPTMASK(OS_INTR_MEM_2) +#define OS_INTERRUPTMASK_MEM_3 OS_INTERRUPTMASK(OS_INTR_MEM_3) +#define OS_INTERRUPTMASK_MEM_ADDRESS OS_INTERRUPTMASK(OS_INTR_MEM_ADDRESS) +#define OS_INTERRUPTMASK_MEM \ + (OS_INTERRUPTMASK_MEM_0 | OS_INTERRUPTMASK_MEM_1 | OS_INTERRUPTMASK_MEM_2 | \ + OS_INTERRUPTMASK_MEM_3 | OS_INTERRUPTMASK_MEM_ADDRESS) + +#define OS_INTERRUPTMASK_DSP_AI OS_INTERRUPTMASK(OS_INTR_DSP_AI) +#define OS_INTERRUPTMASK_DSP_ARAM OS_INTERRUPTMASK(OS_INTR_DSP_ARAM) +#define OS_INTERRUPTMASK_DSP_DSP OS_INTERRUPTMASK(OS_INTR_DSP_DSP) +#define OS_INTERRUPTMASK_DSP \ + (OS_INTERRUPTMASK_DSP_AI | OS_INTERRUPTMASK_DSP_ARAM | OS_INTERRUPTMASK_DSP_DSP) + +#define OS_INTERRUPTMASK_AI_AI OS_INTERRUPTMASK(OS_INTR_AI_AI) +#define OS_INTERRUPTMASK_AI (OS_INTERRUPTMASK_AI_AI) + +#define OS_INTERRUPTMASK_EXI_0_EXI OS_INTERRUPTMASK(OS_INTR_EXI_0_EXI) +#define OS_INTERRUPTMASK_EXI_0_TC OS_INTERRUPTMASK(OS_INTR_EXI_0_TC) +#define OS_INTERRUPTMASK_EXI_0_EXT OS_INTERRUPTMASK(OS_INTR_EXI_0_EXT) +#define OS_INTERRUPTMASK_EXI_0 \ + (OS_INTERRUPTMASK_EXI_0_EXI | OS_INTERRUPTMASK_EXI_0_TC | OS_INTERRUPTMASK_EXI_0_EXT) + +#define OS_INTERRUPTMASK_EXI_1_EXI OS_INTERRUPTMASK(OS_INTR_EXI_1_EXI) +#define OS_INTERRUPTMASK_EXI_1_TC OS_INTERRUPTMASK(OS_INTR_EXI_1_TC) +#define OS_INTERRUPTMASK_EXI_1_EXT OS_INTERRUPTMASK(OS_INTR_EXI_1_EXT) +#define OS_INTERRUPTMASK_EXI_1 \ + (OS_INTERRUPTMASK_EXI_1_EXI | OS_INTERRUPTMASK_EXI_1_TC | OS_INTERRUPTMASK_EXI_1_EXT) + +#define OS_INTERRUPTMASK_EXI_2_EXI OS_INTERRUPTMASK(OS_INTR_EXI_2_EXI) +#define OS_INTERRUPTMASK_EXI_2_TC OS_INTERRUPTMASK(OS_INTR_EXI_2_TC) +#define OS_INTERRUPTMASK_EXI_2 (OS_INTERRUPTMASK_EXI_2_EXI | OS_INTERRUPTMASK_EXI_2_TC) +#define OS_INTERRUPTMASK_EXI \ + (OS_INTERRUPTMASK_EXI_0_EXI | OS_INTERRUPTMASK_EXI_0_TC | OS_INTERRUPTMASK_EXI_0_EXT | \ + OS_INTERRUPTMASK_EXI_1_EXI | OS_INTERRUPTMASK_EXI_1_TC | OS_INTERRUPTMASK_EXI_1_EXT | \ + OS_INTERRUPTMASK_EXI_2_EXI | OS_INTERRUPTMASK_EXI_2_TC) + +#define OS_INTERRUPTMASK_PI_PE_TOKEN OS_INTERRUPTMASK(OS_INTR_PI_PE_TOKEN) +#define OS_INTERRUPTMASK_PI_PE_FINISH OS_INTERRUPTMASK(OS_INTR_PI_PE_FINISH) +#define OS_INTERRUPTMASK_PI_PE (OS_INTERRUPTMASK_PI_PE_TOKEN | OS_INTERRUPTMASK_PI_PE_FINISH) + +#define OS_INTERRUPTMASK_PI_CP OS_INTERRUPTMASK(OS_INTR_PI_CP) +#define OS_INTERRUPTMASK_PI_SI OS_INTERRUPTMASK(OS_INTR_PI_SI) +#define OS_INTERRUPTMASK_PI_DI OS_INTERRUPTMASK(OS_INTR_PI_DI) +#define OS_INTERRUPTMASK_PI_RSW OS_INTERRUPTMASK(OS_INTR_PI_RSW) +#define OS_INTERRUPTMASK_PI_ERROR OS_INTERRUPTMASK(OS_INTR_PI_ERROR) +#define OS_INTERRUPTMASK_PI_VI OS_INTERRUPTMASK(OS_INTR_PI_VI) +#define OS_INTERRUPTMASK_PI_DEBUG OS_INTERRUPTMASK(OS_INTR_PI_DEBUG) +#define OS_INTERRUPTMASK_PI_HSP OS_INTERRUPTMASK(OS_INTR_PI_HSP) +#define OS_INTERRUPTMASK_PI \ + (OS_INTERRUPTMASK_PI_CP | OS_INTERRUPTMASK_PI_SI | OS_INTERRUPTMASK_PI_DI | \ + OS_INTERRUPTMASK_PI_RSW | OS_INTERRUPTMASK_PI_ERROR | OS_INTERRUPTMASK_PI_VI | \ + OS_INTERRUPTMASK_PI_PE_TOKEN | OS_INTERRUPTMASK_PI_PE_FINISH | OS_INTERRUPTMASK_PI_DEBUG | \ + OS_INTERRUPTMASK_PI_HSP) + +typedef s16 OSInterrupt; +typedef u32 OSInterruptMask; +typedef void (*OSInterruptHandler)(OSInterrupt interrupt, OSContext* context); + +BOOL OSDisableInterrupts(void); +void __RAS_OSDisableInterrupts_end(void); +BOOL OSEnableInterrupts(void); +BOOL OSRestoreInterrupts(BOOL enable); +OSInterruptHandler __OSSetInterruptHandler(OSInterrupt interrupt, OSInterruptHandler handler); +OSInterruptHandler __OSGetInterruptHandler(s16 index); +void __OSInterruptInit(void); +static OSInterruptMask SetInterruptMask(OSInterruptMask param_0, OSInterruptMask param_1); +OSInterruptMask __OSMaskInterrupts(OSInterruptMask mask); +OSInterruptMask __OSUnmaskInterrupts(OSInterruptMask mask); +void __OSDispatchInterrupt(u8 interrupt, OSContext* context); +static void ExternalInterruptHandler(OSInterrupt interrupt, OSContext* context); + +void __RAS_OSDisableInterrupts_begin(void); +void __RAS_OSDisableInterrupts_end(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSINTERRUPT_H */ diff --git a/include/dolphin/os/OSLink.h b/include/dolphin/os/OSLink.h new file mode 100644 index 0000000..06f1bb3 --- /dev/null +++ b/include/dolphin/os/OSLink.h @@ -0,0 +1,65 @@ +#ifndef OSLINK_H +#define OSLINK_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct OSModuleQueue { + int* first; + int* last; +} OSModuleQueue; + +OSModuleQueue __OSModuleList : 0x800030C8; +void* __OSStringTable : 0x800030D0; + +typedef struct OSSectionInfo { + u32 mOffset; + u32 mSize; +} OSSectionInfo; + +typedef struct OSModuleInfo { + u32 mId; + u32 mNext; + u32 mPrev; + u32 mNumSections; + struct { // Needed to get an assert correct; very likely bigger + u32 sectionInfoOffset; + } info; + u32 mModuleNameOffset; + u32 mModuleNameSize; + u32 mModuleVersion; + u32 mBssSize; + u32 mRelocationTableOffset; + u32 mImportTableOffset; + u32 mImportTableSize; + u8 mPrologSection; + u8 mEpilogSection; + u8 mUnresolvedSection; + u8 mBssSection; + u32 prolog; + u32 epilog; + u32 mUnresolvedFuncOffset; + u32 mModuleAlignment; + u32 mBssAlignment; + u32 fixSize; +} OSModuleInfo; + +BOOL OSLink(OSModuleInfo* module); +BOOL OSLinkFixed(OSModuleInfo* module, u32 param_1); +BOOL OSUnlink(OSModuleInfo* module); +static void OSNotifyLink(void); +static void OSNotifyUnlink(void); +void OSSetStringTable(void* string_table); +static BOOL Relocate(OSModuleInfo* param_0, OSModuleInfo* param_1); +static BOOL Link(OSModuleInfo* module, u32 param_1); +static BOOL Undo(OSModuleInfo* param_0, OSModuleInfo* param_1); +void __OSModuleInit(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSLINK_H */ diff --git a/include/dolphin/os/OSMemory.h b/include/dolphin/os/OSMemory.h new file mode 100644 index 0000000..bf05969 --- /dev/null +++ b/include/dolphin/os/OSMemory.h @@ -0,0 +1,31 @@ +#ifndef OSMEMORY_H +#define OSMEMORY_H + +#include "dolphin/os/OSInterrupt.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define OS_PROTECT_CHAN0 0 +#define OS_PROTECT_CHAN1 1 +#define OS_PROTECT_CHAN2 2 +#define OS_PROTECT_CHAN3 3 + +#define OS_PROTECT_CONTROL_NONE 0x00 +#define OS_PROTECT_CONTROL_READ 0x01 +#define OS_PROTECT_CONTROL_WRITE 0x02 +#define OS_PROTECT_CONTROL_RDWR (OS_PROTECT_CONTROL_READ | OS_PROTECT_CONTROL_WRITE) + +static void MEMIntrruptHandler(OSInterrupt interrupt, struct OSContext* context); +void OSProtectRange(u32 channel, void* address, u32 nBytes, u32 control); +static void Config24MB(void); +static void Config48MB(void); +static void RealMode(u32 config); +void __OSInitMemoryProtection(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSMEMORY_H */ diff --git a/include/dolphin/os/OSMessage.h b/include/dolphin/os/OSMessage.h new file mode 100644 index 0000000..a6447ec --- /dev/null +++ b/include/dolphin/os/OSMessage.h @@ -0,0 +1,34 @@ +#ifndef OSMESSAGE_H +#define OSMESSAGE_H + +#include "dolphin/os/OSThread.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void* OSMessage; + +typedef struct OSMessageQueue { + /* 0x00 */ OSThreadQueue sending_queue; + /* 0x08 */ OSThreadQueue receiving_queue; + /* 0x10 */ OSMessage* message_array; + /* 0x14 */ s32 num_messages; + /* 0x18 */ s32 first_index; + /* 0x1C */ s32 num_used; +} OSMessageQueue; + +// Flags to turn blocking on/off when sending/receiving message +#define OS_MESSAGE_NOBLOCK 0 +#define OS_MESSAGE_BLOCK 1 + +void OSInitMessageQueue(OSMessageQueue* queue, OSMessage* msgArray, s32 msgCount); +BOOL OSSendMessage(OSMessageQueue* queue, OSMessage msg, s32 flags); +BOOL OSReceiveMessage(OSMessageQueue* queue, OSMessage* msg, s32 flags); +BOOL OSJamMessage(OSMessageQueue* queue, OSMessage msg, s32 flags); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSMESSAGE_H */ diff --git a/include/dolphin/os/OSMutex.h b/include/dolphin/os/OSMutex.h new file mode 100644 index 0000000..0392c8d --- /dev/null +++ b/include/dolphin/os/OSMutex.h @@ -0,0 +1,38 @@ +#ifndef OSMUTEX_H +#define OSMUTEX_H + +#include "dolphin/os/OSThread.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct OSMutex { + /* 0x00 */ OSThreadQueue queue; + /* 0x08 */ OSThread* thread; + /* 0x0C */ s32 count; + /* 0x10 */ OSMutexLink link; +} OSMutex; // Size: 0x18 + +typedef struct OSCond { + OSThreadQueue queue; +} OSCond; + +void OSInitMutex(OSMutex* mutex); +void OSLockMutex(OSMutex* mutex); +void OSUnlockMutex(OSMutex* mutex); +BOOL OSTryLockMutex(OSMutex* mutex); +void OSInitCond(OSCond* cond); +void OSWaitCond(OSCond* cond, OSMutex* mutex); +void OSSignalCond(OSCond* cond); + +void __OSUnlockAllMutex(OSThread* thread); +BOOL __OSCheckMutex(OSMutex* thread); +BOOL __OSCheckDeadLock(OSThread* thread); +BOOL __OSCheckMutexes(OSThread* thread); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSMUTEX_H */ diff --git a/include/dolphin/os/OSReboot.h b/include/dolphin/os/OSReboot.h new file mode 100644 index 0000000..4c9be11 --- /dev/null +++ b/include/dolphin/os/OSReboot.h @@ -0,0 +1,18 @@ +#ifndef OSREBOOT_H +#define OSREBOOT_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void __OSReboot(u32 param_0, u32 param_1); +void OSSetSaveRegion(void* start, void* end); +void OSGetSaveRegion(void** start, void** end); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSREBOOT_H */ diff --git a/include/dolphin/os/OSReset.h b/include/dolphin/os/OSReset.h new file mode 100644 index 0000000..5ecf9b7 --- /dev/null +++ b/include/dolphin/os/OSReset.h @@ -0,0 +1,57 @@ +#ifndef OSRESET_H +#define OSRESET_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +vu32 __PIRegs[12] : 0xCC003000; + +#define OS_RESETCODE_RESTART 0x80000000 +#define OS_RESETCODE_SYSTEM 0x40000000 + +#define OS_RESETCODE_EXEC 0xC0000000 +#define OS_RESETCODE_NETCONFIG 0xC0010000 + +#define OS_RESET_TIMEOUT OSMillisecondsToTicks(1000) + +#define OS_RESET_RESTART 0 +#define OS_RESET_HOTRESET 1 +#define OS_RESET_SHUTDOWN 2 + +#define OS_RESET_PRIO_SO 110 +#define OS_RESET_PRIO_IP 111 +#define OS_RESET_PRIO_CARD 127 +#define OS_RESET_PRIO_PAD 127 +#define OS_RESET_PRIO_GX 127 +#define OS_RESET_PRIO_ALARM 4294967295 + +typedef s32 (*OSResetFunction)(s32); + +typedef struct OSResetFunctionInfo { + /* 0x0 */ OSResetFunction func; + /* 0x4 */ u32 priority; + /* 0x8 */ struct OSResetFunctionInfo* next; + /* 0xC */ struct OSResetFunctionInfo* prev; +} OSResetFunctionInfo; + +typedef struct OSResetQueue { + OSResetFunctionInfo* first; + OSResetFunctionInfo* last; +} OSResetQueue; + +void OSRegisterResetFunction(OSResetFunctionInfo* info); +BOOL __OSCallResetFunctions(u32 param_0); +static void Reset(s32 param_0); +static void KillThreads(void); +void __OSDoHotReset(s32 param_0); +void OSResetSystem(int reset, u32 resetCode, BOOL forceMenu); +u32 OSGetResetCode(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSRESET_H */ diff --git a/include/dolphin/os/OSResetSW.h b/include/dolphin/os/OSResetSW.h new file mode 100644 index 0000000..4ac7800 --- /dev/null +++ b/include/dolphin/os/OSResetSW.h @@ -0,0 +1,19 @@ +#ifndef OSRESETSW_H +#define OSRESETSW_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void (*OSResetCallback)(void); + +static BOOL OSGetResetButtonState(void); +BOOL OSGetResetSwitchState(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSRESETSW_H */ diff --git a/include/dolphin/os/OSRtc.h b/include/dolphin/os/OSRtc.h new file mode 100644 index 0000000..e19f091 --- /dev/null +++ b/include/dolphin/os/OSRtc.h @@ -0,0 +1,76 @@ +#ifndef OSRTC_H +#define OSRTC_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef u32 OSSoundMode; + +#define OS_SOUND_MODE_MONO 0 +#define OS_SOUND_MODE_STEREO 1 + +#define RTC_CMD_READ 0x20000000 +#define RTC_CMD_WRITE 0xa0000000 + +#define RTC_SRAM_ADDR 0x00000100 +#define RTC_SRAM_SIZE 64 + +#define RTC_CHAN 0 +#define RTC_DEV 1 +#define RTC_FREQ 3 // EXI_FREQ_8M + +typedef struct SramControlBlock { + u8 sram[RTC_SRAM_SIZE]; + u32 offset; + BOOL enabled; + BOOL locked; + BOOL sync; + void (*callback)(void); +} SramControlBlock; + +typedef struct OSSram { + u16 checkSum; + u16 checkSumInv; + u32 ead0; + u32 ead1; + u32 counterBias; + s8 displayOffsetH; + u8 ntd; + u8 language; + u8 flags; +} OSSram; + +typedef struct OSSramEx { + u8 flashID[2][12]; + u32 wirelessKeyboardID; + u16 wirelessPadID[4]; + u8 dvdErrorCode; + u8 _padding0; + u8 flashIDCheckSum[2]; + u16 gbs; + u8 _padding1[2]; +} OSSramEx; + +void __OSInitSram(void); +OSSram* __OSLockSram(void); +OSSramEx* __OSLockSramEx(void); +BOOL __OSUnlockSram(BOOL commit); +BOOL __OSUnlockSramEx(BOOL commit); +BOOL __OSSyncSram(void); +u32 OSGetSoundMode(void); +void OSSetSoundMode(OSSoundMode mode); +u32 OSGetProgressiveMode(void); +void OSSetProgressiveMode(u32 mode); +u16 OSGetWirelessID(s32 channel); +void OSSetWirelessID(s32 channel, u16 id); +static u16 OSGetGbsMode(void); +static void OSSetGbsMode(u16 mode); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSRTC_H */ diff --git a/include/dolphin/os/OSSync.h b/include/dolphin/os/OSSync.h new file mode 100644 index 0000000..2984bd0 --- /dev/null +++ b/include/dolphin/os/OSSync.h @@ -0,0 +1,18 @@ +#ifndef OSSYNC_H +#define OSSYNC_H + + +#ifdef __cplusplus +extern "C" { +#endif + +static void SystemCallVector(void); +void __OSInitSystemCall(void); + +void __OSSystemCallVectorEnd(void); + +#ifdef __cplusplus +}; +#endif + +#endif /* OSSYNC_H */ diff --git a/include/dolphin/os/OSThread.h b/include/dolphin/os/OSThread.h new file mode 100644 index 0000000..888e668 --- /dev/null +++ b/include/dolphin/os/OSThread.h @@ -0,0 +1,116 @@ +#ifndef OSTHREAD_H +#define OSTHREAD_H + +#include "dolphin/os/OSContext.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef u16 OSThreadState; +typedef s32 OSPriority; // 0 highest, 31 lowest + +#define OS_THREAD_STATE_UNINITIALIZED 0 +#define OS_THREAD_STATE_READY 1 +#define OS_THREAD_STATE_RUNNING 2 +#define OS_THREAD_STATE_WAITING 4 +#define OS_THREAD_STATE_DEAD 8 + +#define OS_THREAD_ATTR_DETACH 0x0001u + +#define OS_THREAD_STACK_MAGIC 0xDEADBABE + +#define OS_PRIORITY_MIN 0 // highest +#define OS_PRIORITY_MAX 31 // lowest +#define OS_PRIORITY_IDLE OS_PRIORITY_MAX + +typedef struct OSThread OSThread; +typedef struct OSThreadQueue OSThreadQueue; +typedef struct OSThreadLink OSThreadLink; + +typedef struct OSMutex OSMutex; +typedef struct OSMutexQueue OSMutexQueue; +typedef struct OSMutexLink OSMutexLink; +typedef struct OSCond OSCond; + +struct OSThreadLink { + OSThread* next; + OSThread* prev; +}; + +struct OSThreadQueue { + /* 0x0 */ OSThread* head; + /* 0x4 */ OSThread* tail; +}; + +struct OSMutexLink { + OSMutex* next; + OSMutex* prev; +}; + +struct OSMutexQueue { + OSMutex* head; + OSMutex* tail; +}; + +struct OSThread { + OSContext context; + OSThreadState state; + u16 attributes; + s32 suspend_count; + s32 effective_priority; + u32 base_priority; + void* exit_value; + OSThreadQueue* queue; + OSThreadLink link; + OSThreadQueue join_queue; + OSMutex* mutex; + OSMutexQueue owned_mutexes; + OSThreadLink active_threads_link; + u8* stack_base; + u8* stack_end; + u8* error_code; + void* data[2]; +}; + +typedef void (*OSSwitchThreadCallback)(OSThread* from, OSThread* to); + +OSThreadQueue OS_THREAD_QUEUE : 0x800000DC; +OSThread* OS_CURRENT_THREAD : 0x800000E4; + +static void DefaultSwitchThreadCallback(OSThread* from, OSThread* to); +OSSwitchThreadCallback OSSetSwitchThreadCallback(OSSwitchThreadCallback func); +void __OSThreadInit(void); +void OSInitThreadQueue(OSThreadQueue* queue); +OSThread* OSGetCurrentThread(void); +BOOL OSIsThreadTerminated(OSThread* thread); +s32 OSDisableScheduler(void); +s32 OSEnableScheduler(void); +static void UnsetRun(OSThread* thread); +s32 __OSGetEffectivePriority(OSThread* thread); +static OSThread* SetEffectivePriority(OSThread* thread, s32 priority); +void __OSPromoteThread(OSThread* thread, s32 priority); +static OSThread* SelectThread(BOOL yield); +void __OSReschedule(void); +void OSYieldThread(void); +BOOL OSCreateThread(OSThread* thread, void* func, void* param, void* stackBase, u32 stackSize, + s32 priority, u16 attribute); +void OSExitThread(void* exitValue); +void OSCancelThread(OSThread* thread); +void OSDetachThread(OSThread* thread); +s32 OSResumeThread(OSThread* thread); +s32 OSSuspendThread(OSThread* thread); +void OSSleepThread(OSThreadQueue* queue); +void OSWakeupThread(OSThreadQueue* queue); +s32 OSSetThreadPriority(OSThread* thread, s32 priority); +s32 OSGetThreadPriority(OSThread* thread); +static s32 CheckThreadQueue(OSThreadQueue* thread); +s32 OSCheckActiveThreads(void); +static void OSClearStack(u8 value); +extern u8 data_804516D0[8]; + +#ifdef __cplusplus +}; +#endif + +#endif /* OSTHREAD_H */ diff --git a/include/dolphin/os/OSTime.h b/include/dolphin/os/OSTime.h new file mode 100644 index 0000000..c0df358 --- /dev/null +++ b/include/dolphin/os/OSTime.h @@ -0,0 +1,56 @@ +#ifndef OSTIME_H +#define OSTIME_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef s64 OSTime; +typedef u32 OSTick; + +OSTime OS_SYSTEM_TIME : 0x800030D8; + +typedef struct OSCalendarTime { + /* 0x00 */ s32 seconds; + /* 0x04 */ s32 minutes; + /* 0x08 */ s32 hours; + /* 0x0C */ s32 day_of_month; + /* 0x10 */ s32 month; + /* 0x14 */ s32 year; + /* 0x18 */ s32 week_day; + /* 0x1C */ s32 year_day; + /* 0x20 */ s32 milliseconds; + /* 0x24 */ s32 microseconds; +} OSCalendarTime; + +OSTime OSGetTime(void); +OSTick OSGetTick(void); +OSTime __OSGetSystemTime(void); +OSTime __OSTimeToSystemTime(OSTime time); +void GetDates(s32 days, OSCalendarTime* ct); +void OSTicksToCalendarTime(OSTime ticks, OSCalendarTime* ct); + +extern u32 __OSBusClock : 0x800000F8; + +#define OS_BUS_CLOCK (__OSBusClock) +#define OS_CORE_CLOCK (*(u32*)0x800000FC) +#define OS_TIMER_CLOCK (OS_BUS_CLOCK / 4) +#define OS_TIMER_CLOCK_MS (OS_TIMER_CLOCK / 1000) + +#define OSTicksToCycles(ticks) (((ticks) * ((OS_CORE_CLOCK * 2) / OS_TIMER_CLOCK)) / 2) +#define OSTicksToSeconds(ticks) ((ticks) / OS_TIMER_CLOCK) +#define OSTicksToMilliseconds(ticks) ((ticks) / (OS_TIMER_CLOCK / 1000)) +#define OSTicksToMicroseconds(ticks) (((ticks)*8) / (OS_TIMER_CLOCK / 125000)) +#define OSTicksToNanoseconds(ticks) (((ticks)*8000) / (OS_TIMER_CLOCK / 125000)) +#define OSSecondsToTicks(sec) ((sec)*OS_TIMER_CLOCK) +#define OSMillisecondsToTicks(msec) ((msec) * (OS_TIMER_CLOCK / 1000)) +#define OSMicrosecondsToTicks(usec) (((usec) * (OS_TIMER_CLOCK / 125000)) / 8) +#define OSNanosecondsToTicks(nsec) (((nsec) * (OS_TIMER_CLOCK / 125000)) / 8000) + +#ifdef __cplusplus +}; +#endif + +#endif /* OSTIME_H */ diff --git a/include/dolphin/os/__ppc_eabi_init.h b/include/dolphin/os/__ppc_eabi_init.h new file mode 100644 index 0000000..5d116bc --- /dev/null +++ b/include/dolphin/os/__ppc_eabi_init.h @@ -0,0 +1,5 @@ +#ifndef __PPC_EABI_INIT_H +#define __PPC_EABI_INIT_H + + +#endif /* __PPC_EABI_INIT_H */ diff --git a/include/dolphin/pad/Pad.h b/include/dolphin/pad/Pad.h new file mode 100644 index 0000000..229e645 --- /dev/null +++ b/include/dolphin/pad/Pad.h @@ -0,0 +1,83 @@ +#ifndef PAD_H +#define PAD_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct OSContext OSContext; + +typedef enum PADMask { + PAD_CHAN3_BIT = (1 << 28), + PAD_CHAN2_BIT = (1 << 29), + PAD_CHAN1_BIT = (1 << 30), + PAD_CHAN0_BIT = (1 << 31), +} PADMask; + +#define PAD_SPEC_0 0 +#define PAD_SPEC_1 1 +#define PAD_SPEC_2 2 +#define PAD_SPEC_3 3 +#define PAD_SPEC_4 4 +#define PAD_SPEC_5 5 + +#define PAD_MOTOR_STOP 0 +#define PAD_MOTOR_RUMBLE 1 +#define PAD_MOTOR_STOP_HARD 2 + +#define PAD_ERR_NONE 0 +#define PAD_ERR_NO_CONTROLLER -1 +#define PAD_ERR_NOT_READY -2 +#define PAD_ERR_TRANSFER -3 + +#define PAD_BUTTON_LEFT 0x0001 +#define PAD_BUTTON_RIGHT 0x0002 +#define PAD_BUTTON_DOWN 0x0004 +#define PAD_BUTTON_UP 0x0008 +#define PAD_TRIGGER_Z 0x0010 +#define PAD_TRIGGER_R 0x0020 +#define PAD_TRIGGER_L 0x0040 +#define PAD_BUTTON_A 0x0100 +#define PAD_BUTTON_B 0x0200 +#define PAD_BUTTON_X 0x0400 +#define PAD_BUTTON_Y 0x0800 +#define PAD_BUTTON_MENU 0x1000 +#define PAD_BUTTON_START 0x1000 + +typedef struct PADStatus { + /* 0x0 */ u16 button; + /* 0x2 */ s8 stick_x; + /* 0x3 */ s8 stick_y; + /* 0x4 */ s8 substick_x; + /* 0x5 */ s8 substick_y; + /* 0x6 */ u8 trigger_left; + /* 0x7 */ u8 trigger_right; + /* 0x8 */ u8 analog_a; + /* 0x9 */ u8 analog_b; + /* 0xA */ s8 error; +} PADStatus; + +typedef void (*PADSamplingCallback)(void); + +BOOL PADInit(void); +void PADSetAnalogMode(u32 mode); +void PADSetSpec(u32 spec); +BOOL PADReset(u32 mask); +void PADClampCircle(PADStatus* status); +void PADClamp(PADStatus* status); +u32 PADRead(PADStatus* status); +void PADControlMotor(s32 channel, u32 command); +BOOL PADRecalibrate(u32 mask); +static void PADOriginCallback(s32 chan, u32 error, OSContext* context); +static void PADOriginUpdateCallback(s32 chan, u32 error, OSContext* context); +static void PADProbeCallback(s32 chan, u32 error, OSContext* context); +static void PADTypeAndStatusCallback(s32 chan, u32 type); +static void PADReceiveCheckCallback(s32 chan, u32 type); + +#ifdef __cplusplus +}; +#endif + +#endif /* PAD_H */ diff --git a/include/dolphin/pad/Padclamp.h b/include/dolphin/pad/Padclamp.h new file mode 100644 index 0000000..5047667 --- /dev/null +++ b/include/dolphin/pad/Padclamp.h @@ -0,0 +1,29 @@ +#ifndef PADCLAMP_H +#define PADCLAMP_H + + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct PADClampRegion { + u8 minTrigger; + u8 maxTrigger; + s8 minStick; + s8 maxStick; + s8 xyStick; + s8 minSubstick; + s8 maxSubstick; + s8 xySubstick; + s8 radStick; + s8 radSubstick; +} PADClampRegion; + +void PADClamp(PADStatus* status); +void PADClampCircle(PADStatus* status); + +#ifdef __cplusplus +}; +#endif + +#endif /* PADCLAMP_H */ diff --git a/include/dolphin/vi/vi.h b/include/dolphin/vi/vi.h new file mode 100644 index 0000000..f233b30 --- /dev/null +++ b/include/dolphin/vi/vi.h @@ -0,0 +1,63 @@ +#ifndef VI_H +#define VI_H + +#include "dolphin/types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _GXRenderModeObj GXRenderModeObj; + +#define VI_TVMODE(format, interlace) (((format) << 2) + (interlace)) + +#define VI_INTERLACE 0 +#define VI_NON_INTERLACE 1 +#define VI_PROGRESSIVE 2 + +#define VI_NTSC 0 +#define VI_PAL 1 +#define VI_MPAL 2 +#define VI_DEBUG 3 +#define VI_DEBUG_PAL 4 +#define VI_EURGB60 5 + +typedef enum { + VI_TVMODE_NTSC_INT = VI_TVMODE(VI_NTSC, VI_INTERLACE), + VI_TVMODE_NTSC_DS = VI_TVMODE(VI_NTSC, VI_NON_INTERLACE), + VI_TVMODE_NTSC_PROG = VI_TVMODE(VI_NTSC, VI_PROGRESSIVE), + VI_TVMODE_PAL_INT = VI_TVMODE(VI_PAL, VI_INTERLACE), + VI_TVMODE_PAL_DS = VI_TVMODE(VI_PAL, VI_NON_INTERLACE), + VI_TVMODE_EURGB60_INT = VI_TVMODE(VI_EURGB60, VI_INTERLACE), + VI_TVMODE_EURGB60_DS = VI_TVMODE(VI_EURGB60, VI_NON_INTERLACE), + VI_TVMODE_MPAL_INT = VI_TVMODE(VI_MPAL, VI_INTERLACE), + VI_TVMODE_MPAL_DS = VI_TVMODE(VI_MPAL, VI_NON_INTERLACE), + VI_TVMODE_DEBUG_INT = VI_TVMODE(VI_DEBUG, VI_INTERLACE), + VI_TVMODE_DEBUG_PAL_INT = VI_TVMODE(VI_DEBUG_PAL, VI_INTERLACE), + VI_TVMODE_DEBUG_PAL_DS = VI_TVMODE(VI_DEBUG_PAL, VI_NON_INTERLACE) +} VITVMode; + +typedef enum { VI_XFBMODE_SF = 0, VI_XFBMODE_DF } VIXFBMode; + +typedef void (*VIRetraceCallback)(u32); + +void VIWaitForRetrace(void); +void VISetNextFrameBuffer(void*); +VIRetraceCallback VISetPreRetraceCallback(VIRetraceCallback); +VIRetraceCallback VISetPostRetraceCallback(VIRetraceCallback); +void VIInit(); +void VIConfigure(GXRenderModeObj*); +void VIFlush(); +void* VIGetNextFrameBuffer(); +void* VIGetCurrentFrameBuffer(); +void VISetBlack(BOOL); +u32 VIGetRetraceCount(); +u32 VIGetDTVStatus(); + +vu16 __VIRegs[59] : 0xCC002000; + +#ifdef __cplusplus +}; +#endif + +#endif /* VI_H */ diff --git a/include/f_pc/f_pc_draw_priority.h b/include/f_pc/f_pc_draw_priority.h index 9608bd2..1049f87 100644 --- a/include/f_pc/f_pc_draw_priority.h +++ b/include/f_pc/f_pc_draw_priority.h @@ -8,7 +8,7 @@ typedef struct draw_priority_class { s16 mPriority; } draw_priority_class; -s16 fpcDwPi_Get(const draw_priority_class* pDwPi); +s16 fpcDwPi_Get(draw_priority_class* pDwPi); void fpcDwPi_Set(draw_priority_class* pDwPi, s16 p); void fpcDwPi_Init(draw_priority_class* pDwPi, s16 p); diff --git a/include/m_Do/m_Do_Reset.h b/include/m_Do/m_Do_Reset.h new file mode 100644 index 0000000..3898fe6 --- /dev/null +++ b/include/m_Do/m_Do_Reset.h @@ -0,0 +1,62 @@ +#ifndef M_DO_M_DO_RESET_H +#define M_DO_M_DO_RESET_H + +#include "dolphin/types.h" + +void mDoRst_reset(int, u32, int); +void mDoRst_resetCallBack(int, void*); + +extern bool SyncWidthSound; +extern u8 sDefaultDirection; + +struct mDoRstData { + /* 0x00 */ int mReset; + /* 0x04 */ int mResetPrepare; + /* 0x08 */ int m3ButtonReset; + /* 0x0C */ int m3ButtonResetPort; + /* 0x10 */ bool mShutdown; + /* 0x11 */ bool mReturnToMenu; + /* 0x12 */ u8 mLogoScnFlag; + /* 0x13 */ u8 mProgSeqFlag; + /* 0x14 */ u8 mProgChgFlag; + /* 0x15 */ u8 mWarningDispFlag; +}; // Size = 0x18 + +class mDoRst { +public: + static void offReturnToMenu() { mResetData->mReturnToMenu = false; } + static void offShutdown() { mResetData->mShutdown = false; } + static void setWarningDispFlag(u8 flag) { mResetData->mWarningDispFlag = flag; } + static void setProgChgFlag(u8 flag) { mResetData->mProgChgFlag = flag; } + static void setProgSeqFlag(u8 flag) { mResetData->mProgSeqFlag = flag; } + static void setLogoScnFlag(u8 flag) { mResetData->mLogoScnFlag = flag; } + static void set3ButtonResetPort(int port) { mResetData->m3ButtonResetPort = port; } + static void off3ButtonReset() { mResetData->m3ButtonReset = 0; } + static void offResetPrepare() { mResetData->mResetPrepare = 0; } + static void offReset() { + mResetData->mReset = 0; + mResetData->mResetPrepare = 0; + } + static u8 getLogoScnFlag() { return mResetData->mLogoScnFlag; } + static u8 getProgSeqFlag() { return mResetData->mProgSeqFlag; } + static u8 getWarningDispFlag() { return mResetData->mWarningDispFlag; } + static BOOL isReturnToMenu() { return mResetData->mReturnToMenu; } + static BOOL isShutdown() { return mResetData->mShutdown; } + static int isReset() { return mResetData->mReset; } + static int get3ButtonResetPort() { return mResetData->m3ButtonResetPort; } + static int is3ButtonReset() { return mResetData->m3ButtonReset; } + static void onReset() { mResetData->mReset = 1; } + static void onReturnToMenu() { mResetData->mReturnToMenu = true; } + static void on3ButtonReset() { mResetData->m3ButtonReset = 1; } + static void onShutdown() { mResetData->mShutdown = true; } + + static mDoRstData* getResetData(); + static mDoRstData* i_getResetData() { return mResetData; } + static void setResetData(mDoRstData* rstData) { mResetData = rstData; } + + static mDoRstData* mResetData; +}; + +extern bool mDoDvdErr_initialized; + +#endif /* M_DO_M_DO_RESET_H */ diff --git a/include/m_Do/m_Do_controller_pad.h b/include/m_Do/m_Do_controller_pad.h new file mode 100644 index 0000000..c6619ac --- /dev/null +++ b/include/m_Do/m_Do_controller_pad.h @@ -0,0 +1,4 @@ +#ifndef M_DO_CONTROLLER_PAD_H +#define M_DO_CONTROLLER_PAD_H + +#endif diff --git a/include/m_Do/m_Do_main.h b/include/m_Do/m_Do_main.h new file mode 100644 index 0000000..64468c5 --- /dev/null +++ b/include/m_Do/m_Do_main.h @@ -0,0 +1,62 @@ +#ifndef M_DO_M_DO_MAIN_H +#define M_DO_M_DO_MAIN_H + +#include "JSystem/JKernel/JKRExpHeap.h" +#include "dolphin/os/OSTime.h" + +class JKRExpHeap; + +void version_check(); +s32 LOAD_COPYDATE(void*); + +class HeapCheck { +public: + HeapCheck(JKRExpHeap* heap, const char* name, const char* jName) { + mName = name; + mJName = jName; + setHeap(heap); + } + + void CheckHeap1(void); + s32 getUsedCount(void) const; + void heapDisplay(void) const; + + u32& getUsedCountRef() { return mUsedCount; } + u32& getTotalUsedSizeRef() { return mTotalUsedSize; } + JKRExpHeap* getHeap() { return mHeap; } + void setHeap(JKRExpHeap* i_heap) { mHeap = i_heap; } + void setHeapSize(u32 i_size) { mTargetHeapSize = i_size; } + s32 getMaxTotalUsedSize() { return mMaxTotalUsedSize; } + s32 getMaxTotalFreeSize() { return mMaxTotalFreeSize; } + const char* getName() const { return mName; } + void saveRelBase() { + mUsedCount = getUsedCount(); + mTotalUsedSize = mHeap->getTotalUsedSize(); + } + + u32 getRelUsedCount() const { return getUsedCount() - mUsedCount; } + u32 getRelTotalUsedSize() const { return mHeap->getTotalUsedSize() - mTotalUsedSize; } + +private: + /* 0x00 */ const char* mName; + /* 0x04 */ const char* mJName; + /* 0x08 */ JKRExpHeap* mHeap; + /* 0x0C */ s32 mMaxTotalUsedSize; + /* 0x10 */ s32 mMaxTotalFreeSize; + /* 0x14 */ s32 field_0x14; + /* 0x18 */ s32 field_0x18; + /* 0x1C */ u32 mTargetHeapSize; + /* 0x20 */ u32 mUsedCount; + /* 0x24 */ u32 mTotalUsedSize; +}; + +struct mDoMain { + static char COPYDATE_STRING[18]; + static u32 memMargin; + static u8 mHeapBriefType; + static OSTime sPowerOnTime; + static OSTime sHungUpTime; + static s8 developmentMode; +}; + +#endif /* M_DO_M_DO_MAIN_H */ diff --git a/src/JPALoader/JPATexture.cpp b/src/JPALoader/JPATexture.cpp deleted file mode 100644 index 685a8c8..0000000 --- a/src/JPALoader/JPATexture.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// -// Generated by dtk -// Translation Unit: JPATexture.cpp -// - -#include "JSystem/JPALoader/JPATexture.h" -#include "dolphin/types.h" - -/* 80258660-802586D0 .text __ct__13JPATextureArcFPCUc */ -JPATextureArc::JPATextureArc(const unsigned char*) { - /* Nonmatching */ -} - -/* 802586D0-80258BB4 .text initialize__17JPADefaultTextureFP7JKRHeap */ -void JPADefaultTexture::initialize(JKRHeap*) { - /* Nonmatching */ -} - -/* 80258BB4-80258BFC .text __dt__10JPATextureFv */ -JPATexture::~JPATexture() { - /* Nonmatching */ -} - -/* 80258BFC-80258C74 .text __dt__13JPATextureArcFv */ -JPATextureArc::~JPATextureArc() { - /* Nonmatching */ -} - -/* 80258C74-80258C80 .text getName__13JPATextureArcCFv */ -void JPATextureArc::getName() const { - /* Nonmatching */ -} - -/* 80258C80-80258CA4 .text load__13JPATextureArcF11_GXTexMapID */ -void JPATextureArc::load(_GXTexMapID) { - /* Nonmatching */ -} - -/* 80258CA4-80258CAC .text getJUTTexture__13JPATextureArcFv */ -void JPATextureArc::getJUTTexture() { - /* Nonmatching */ -} diff --git a/src/JSystem/JKernel/JKRFile.cpp b/src/JSystem/JKernel/JKRFile.cpp index 746b212..2a5ee1c 100644 --- a/src/JSystem/JKernel/JKRFile.cpp +++ b/src/JSystem/JKernel/JKRFile.cpp @@ -4,9 +4,17 @@ // #include "JSystem/JKernel/JKRFile.h" -#include "dolphin/types.h" +#include "JSystem/JUtility/JUTAssert.h" +#include "dolphin/vi/vi.h" /* 802BC610-802BC6B4 .text read__7JKRFileFPvll */ -void JKRFile::read(void*, long, long) { - /* Nonmatching */ +s32 JKRFile::read(void* data, s32 length, long offset) { + JUT_ASSERT("JKRFile.cpp", 34, ( length & 0x1f ) == 0); + while (true) { + s32 result = readData(data, length, offset); + if (length != result) + VIWaitForRetrace(); + else + return result; + } } diff --git a/src/JPALoader/JPABaseShape.cpp b/src/JSystem/JParticle/JPABaseShape.cpp similarity index 99% rename from src/JPALoader/JPABaseShape.cpp rename to src/JSystem/JParticle/JPABaseShape.cpp index 030bc3a..54adcb6 100644 --- a/src/JPALoader/JPABaseShape.cpp +++ b/src/JSystem/JParticle/JPABaseShape.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPABaseShape.cpp // -#include "JSystem/JPALoader/JPABaseShape.h" +#include "JSystem/JParticle/JPABaseShape.h" #include "dolphin/types.h" /* 80256F88-80257248 .text makeColorTable__FP17JPAColorRegAnmKeyiiP7JKRHeap */ diff --git a/src/JPADraw/JPADraw.cpp b/src/JSystem/JParticle/JPADraw.cpp similarity index 98% rename from src/JPADraw/JPADraw.cpp rename to src/JSystem/JParticle/JPADraw.cpp index 624bfa0..ff1af6f 100644 --- a/src/JPADraw/JPADraw.cpp +++ b/src/JSystem/JParticle/JPADraw.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPADraw.cpp // -#include "JSystem/JPADraw/JPADraw.h" +#include "JSystem/JParticle/JPADraw.h" #include "dolphin/types.h" /* 80267F40-80268634 .text initialize__7JPADrawFP14JPABaseEmitterP18JPATextureResource */ diff --git a/src/JPADraw/JPADrawSetupTev.cpp b/src/JSystem/JParticle/JPADrawSetupTev.cpp similarity index 85% rename from src/JPADraw/JPADrawSetupTev.cpp rename to src/JSystem/JParticle/JPADrawSetupTev.cpp index 9ef5294..25ae2c2 100644 --- a/src/JPADraw/JPADrawSetupTev.cpp +++ b/src/JSystem/JParticle/JPADrawSetupTev.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPADrawSetupTev.cpp // -#include "JSystem/JPADraw/JPADrawSetupTev.h" +#include "JSystem/JParticle/JPADrawSetupTev.h" #include "dolphin/types.h" /* 8026D7B8-8026DBBC .text setupTev__15JPADrawSetupTevFP12JPABaseShapeP13JPAExTexShape */ diff --git a/src/JPADraw/JPADrawVisitor.cpp b/src/JSystem/JParticle/JPADrawVisitor.cpp similarity index 99% rename from src/JPADraw/JPADrawVisitor.cpp rename to src/JSystem/JParticle/JPADrawVisitor.cpp index cfca977..abbf9b1 100644 --- a/src/JPADraw/JPADrawVisitor.cpp +++ b/src/JSystem/JParticle/JPADrawVisitor.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPADrawVisitor.cpp // -#include "JSystem/JPADraw/JPADrawVisitor.h" +#include "JSystem/JParticle/JPADrawVisitor.h" #include "dolphin/types.h" /* 8025F960-8025FBE4 .text exec__20JPADrawExecLoadExTexFPC14JPADrawContext */ diff --git a/src/JPALoader/JPADynamicsBlock.cpp b/src/JSystem/JParticle/JPADynamicsBlock.cpp similarity index 99% rename from src/JPALoader/JPADynamicsBlock.cpp rename to src/JSystem/JParticle/JPADynamicsBlock.cpp index fddba1b..f45a9b2 100644 --- a/src/JPALoader/JPADynamicsBlock.cpp +++ b/src/JSystem/JParticle/JPADynamicsBlock.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPADynamicsBlock.cpp // -#include "JSystem/JPALoader/JPADynamicsBlock.h" +#include "JSystem/JParticle/JPADynamicsBlock.h" #include "dolphin/types.h" /* 80258118-8025813C .text __ct__19JPADynamicsBlockArcFPCUc */ diff --git a/src/JPABase/JPAEmitter.cpp b/src/JSystem/JParticle/JPAEmitter.cpp similarity index 98% rename from src/JPABase/JPAEmitter.cpp rename to src/JSystem/JParticle/JPAEmitter.cpp index cbae431..40af372 100644 --- a/src/JPABase/JPAEmitter.cpp +++ b/src/JSystem/JParticle/JPAEmitter.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAEmitter.cpp // -#include "JSystem/JPABase/JPAEmitter.h" +#include "JSystem/JParticle/JPAEmitter.h" #include "dolphin/types.h" /* 8025C128-8025C254 .text calcVolumePoint__14JPABaseEmitterFv */ diff --git a/src/JPALoader/JPAEmitterLoader.cpp b/src/JSystem/JParticle/JPAEmitterLoader.cpp similarity index 91% rename from src/JPALoader/JPAEmitterLoader.cpp rename to src/JSystem/JParticle/JPAEmitterLoader.cpp index 96a3b7b..957e5a3 100644 --- a/src/JPALoader/JPAEmitterLoader.cpp +++ b/src/JSystem/JParticle/JPAEmitterLoader.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAEmitterLoader.cpp // -#include "JSystem/JPALoader/JPAEmitterLoader.h" +#include "JSystem/JParticle/JPAEmitterLoader.h" #include "dolphin/types.h" /* 802590B4-8025917C .text load__31JPAEmitterArchiveLoaderDataBaseFPCUcP7JKRHeapPP18JPAEmitterResourcePP18JPATextureResource */ diff --git a/src/JPABase/JPAEmitterManager.cpp b/src/JSystem/JParticle/JPAEmitterManager.cpp similarity index 98% rename from src/JPABase/JPAEmitterManager.cpp rename to src/JSystem/JParticle/JPAEmitterManager.cpp index c9369cf..f82e8ea 100644 --- a/src/JPABase/JPAEmitterManager.cpp +++ b/src/JSystem/JParticle/JPAEmitterManager.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAEmitterManager.cpp // -#include "JSystem/JPABase/JPAEmitterManager.h" +#include "JSystem/JParticle/JPAEmitterManager.h" #include "dolphin/types.h" /* 8025EE44-8025F0E4 .text __ct__17JPAEmitterManagerFP18JPAResourceManagerUlUlUlP7JKRHeap */ diff --git a/src/JPALoader/JPAExTexShape.cpp b/src/JSystem/JParticle/JPAExTexShape.cpp similarity index 97% rename from src/JPALoader/JPAExTexShape.cpp rename to src/JSystem/JParticle/JPAExTexShape.cpp index 1f77301..ea8024e 100644 --- a/src/JPALoader/JPAExTexShape.cpp +++ b/src/JSystem/JParticle/JPAExTexShape.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAExTexShape.cpp // -#include "JSystem/JPALoader/JPAExTexShape.h" +#include "JSystem/JParticle/JPAExTexShape.h" #include "dolphin/types.h" /* 80257FD4-80257FF8 .text __ct__16JPAExTexShapeArcFPCUc */ diff --git a/src/JPALoader/JPAExtraShape.cpp b/src/JSystem/JParticle/JPAExtraShape.cpp similarity index 99% rename from src/JPALoader/JPAExtraShape.cpp rename to src/JSystem/JParticle/JPAExtraShape.cpp index 35abea6..393ea71 100644 --- a/src/JPALoader/JPAExtraShape.cpp +++ b/src/JSystem/JParticle/JPAExtraShape.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAExtraShape.cpp // -#include "JSystem/JPALoader/JPAExtraShape.h" +#include "JSystem/JParticle/JPAExtraShape.h" #include "dolphin/types.h" /* 80257988-80257AA8 .text __ct__16JPAExtraShapeArcFPCUc */ diff --git a/src/JPABase/JPAField.cpp b/src/JSystem/JParticle/JPAField.cpp similarity index 99% rename from src/JPABase/JPAField.cpp rename to src/JSystem/JParticle/JPAField.cpp index 3eb5644..a528834 100644 --- a/src/JPABase/JPAField.cpp +++ b/src/JSystem/JParticle/JPAField.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAField.cpp // -#include "JSystem/JPABase/JPAField.h" +#include "JSystem/JParticle/JPAField.h" #include "dolphin/types.h" /* 80259EE8-8025A0D8 .text loadFieldData__12JPABaseFieldFP12JPAFieldDataP13JPAFieldBlock */ diff --git a/src/JPALoader/JPAFieldBlock.cpp b/src/JSystem/JParticle/JPAFieldBlock.cpp similarity index 98% rename from src/JPALoader/JPAFieldBlock.cpp rename to src/JSystem/JParticle/JPAFieldBlock.cpp index cc6e8d1..dd82e65 100644 --- a/src/JPALoader/JPAFieldBlock.cpp +++ b/src/JSystem/JParticle/JPAFieldBlock.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAFieldBlock.cpp // -#include "JSystem/JPALoader/JPAFieldBlock.h" +#include "JSystem/JParticle/JPAFieldBlock.h" #include "dolphin/types.h" /* 80258398-802583BC .text __ct__16JPAFieldBlockArcFPCUc */ diff --git a/src/JPALoader/JPAKeyBlock.cpp b/src/JSystem/JParticle/JPAKeyBlock.cpp similarity index 95% rename from src/JPALoader/JPAKeyBlock.cpp rename to src/JSystem/JParticle/JPAKeyBlock.cpp index 17aeea7..057f17a 100644 --- a/src/JPALoader/JPAKeyBlock.cpp +++ b/src/JSystem/JParticle/JPAKeyBlock.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAKeyBlock.cpp // -#include "JSystem/JPALoader/JPAKeyBlock.h" +#include "JSystem/JParticle/JPAKeyBlock.h" #include "dolphin/types.h" /* 8025855C-80258588 .text __ct__14JPAKeyBlockArcFPCUc */ diff --git a/src/JPABase/JPAMath.cpp b/src/JSystem/JParticle/JPAMath.cpp similarity index 97% rename from src/JPABase/JPAMath.cpp rename to src/JSystem/JParticle/JPAMath.cpp index 1e9ee52..86b1015 100644 --- a/src/JPABase/JPAMath.cpp +++ b/src/JSystem/JParticle/JPAMath.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAMath.cpp // -#include "JSystem/JPABase/JPAMath.h" +#include "JSystem/JParticle/JPAMath.h" #include "dolphin/types.h" /* 8025991C-802599A0 .text JPAGetYZRotateMtx__FssPA4_f */ diff --git a/src/JPABase/JPAParticle.cpp b/src/JSystem/JParticle/JPAParticle.cpp similarity index 95% rename from src/JPABase/JPAParticle.cpp rename to src/JSystem/JParticle/JPAParticle.cpp index a6d91ca..391bb93 100644 --- a/src/JPABase/JPAParticle.cpp +++ b/src/JSystem/JParticle/JPAParticle.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAParticle.cpp // -#include "JSystem/JPABase/JPAParticle.h" +#include "JSystem/JParticle/JPAParticle.h" #include "dolphin/types.h" /* 8025DEF4-8025E62C .text initParticle__15JPABaseParticleFv */ diff --git a/src/JPALoader/JPAResourceManager.cpp b/src/JSystem/JParticle/JPAResourceManager.cpp similarity index 96% rename from src/JPALoader/JPAResourceManager.cpp rename to src/JSystem/JParticle/JPAResourceManager.cpp index 5eae156..7b696e8 100644 --- a/src/JPALoader/JPAResourceManager.cpp +++ b/src/JSystem/JParticle/JPAResourceManager.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPAResourceManager.cpp // -#include "JSystem/JPALoader/JPAResourceManager.h" +#include "JSystem/JParticle/JPAResourceManager.h" #include "dolphin/types.h" /* 80258CAC-80258D54 .text __ct__18JPATextureResourceFUlP7JKRHeap */ diff --git a/src/JPALoader/JPASweepShape.cpp b/src/JSystem/JParticle/JPASweepShape.cpp similarity index 99% rename from src/JPALoader/JPASweepShape.cpp rename to src/JSystem/JParticle/JPASweepShape.cpp index 0782060..218da3e 100644 --- a/src/JPALoader/JPASweepShape.cpp +++ b/src/JSystem/JParticle/JPASweepShape.cpp @@ -3,7 +3,7 @@ // Translation Unit: JPASweepShape.cpp // -#include "JSystem/JPALoader/JPASweepShape.h" +#include "JSystem/JParticle/JPASweepShape.h" #include "dolphin/types.h" /* 80257D4C-80257D70 .text __ct__16JPASweepShapeArcFPCUc */ diff --git a/src/JSystem/JParticle/JPATexture.cpp b/src/JSystem/JParticle/JPATexture.cpp new file mode 100644 index 0000000..5db15d7 --- /dev/null +++ b/src/JSystem/JParticle/JPATexture.cpp @@ -0,0 +1,152 @@ +// +// Generated by dtk +// Translation Unit: JPATexture.cpp +// + +#include "JSystem/JParticle/JPATexture.h" +#include "JSystem/JKernel/JKRHeap.h" +#include "JSystem/JUtility/JUTAssert.h" +#include "dolphin/types.h" + +/* 80258660-802586D0 .text __ct__13JPATextureArcFPCUc */ +JPATextureArc::JPATextureArc(const unsigned char * pData) { + mpData = (JPATextureData *) pData; + mTexture.storeTIMG(&mpData->mResTIMG, (unsigned char)'\0'); +} + +/* 802586D0-80258BB4 .text initialize__17JPADefaultTextureFP7JKRHeap */ +void JPADefaultTexture::initialize(JKRHeap* pHeap) { + imgBuf = (u8*)JKRHeap::alloc(0x80, 0x20, pHeap); + JUT_ASSERT("JPATexture.cpp", 50, imgBuf); + imgBuf[0x00] = 0x00; + imgBuf[0x01] = 0xff; + imgBuf[0x02] = 0x00; + imgBuf[0x03] = 0xff; + imgBuf[0x04] = 0x00; + imgBuf[0x05] = 0xff; + imgBuf[0x06] = 0x00; + imgBuf[0x07] = 0xff; + imgBuf[0x08] = 0x00; + imgBuf[0x09] = 0xff; + imgBuf[0x0a] = 0x1a; + imgBuf[0x0b] = 0xff; + imgBuf[0x0c] = 0x80; + imgBuf[0x0d] = 0xff; + imgBuf[0x0e] = 0xd6; + imgBuf[0x0f] = 0xff; + imgBuf[0x10] = 0x00; + imgBuf[0x11] = 0xff; + imgBuf[0x12] = 0x80; + imgBuf[0x13] = 0xff; + imgBuf[0x14] = 0xff; + imgBuf[0x15] = 0xff; + imgBuf[0x16] = 0xff; + imgBuf[0x17] = 0xff; + imgBuf[0x18] = 0x00; + imgBuf[0x19] = 0xff; + imgBuf[0x1a] = 0xd6; + imgBuf[0x1b] = 0xff; + imgBuf[0x1c] = 0xff; + imgBuf[0x1d] = 0xff; + imgBuf[0x1e] = 0xff; + imgBuf[0x1f] = 0xff; + imgBuf[0x20] = 0x00; + imgBuf[0x21] = 0xff; + imgBuf[0x22] = 0x00; + imgBuf[0x23] = 0xff; + imgBuf[0x24] = 0x00; + imgBuf[0x25] = 0xff; + imgBuf[0x26] = 0x00; + imgBuf[0x27] = 0xff; + imgBuf[0x28] = 0xd6; + imgBuf[0x29] = 0xff; + imgBuf[0x2a] = 0x80; + imgBuf[0x2b] = 0xff; + imgBuf[0x2c] = 0x1a; + imgBuf[0x2d] = 0xff; + imgBuf[0x2e] = 0x00; + imgBuf[0x2f] = 0xff; + imgBuf[0x30] = 0xff; + imgBuf[0x31] = 0xff; + imgBuf[0x32] = 0xff; + imgBuf[0x33] = 0xff; + imgBuf[0x34] = 0x80; + imgBuf[0x35] = 0xff; + imgBuf[0x36] = 0x00; + imgBuf[0x37] = 0xff; + imgBuf[0x38] = 0xff; + imgBuf[0x39] = 0xff; + imgBuf[0x3a] = 0xff; + imgBuf[0x3b] = 0xff; + imgBuf[0x3c] = 0xd6; + imgBuf[0x3d] = 0xff; + imgBuf[0x3e] = 0x00; + imgBuf[0x3f] = 0xff; + imgBuf[0x40] = 0x00; + imgBuf[0x41] = 0xff; + imgBuf[0x42] = 0xd6; + imgBuf[0x43] = 0xff; + imgBuf[0x44] = 0xff; + imgBuf[0x45] = 0xff; + imgBuf[0x46] = 0xff; + imgBuf[0x47] = 0xff; + imgBuf[0x48] = 0x00; + imgBuf[0x49] = 0xff; + imgBuf[0x4a] = 0x80; + imgBuf[0x4b] = 0xff; + imgBuf[0x4c] = 0xff; + imgBuf[0x4d] = 0xff; + imgBuf[0x4e] = 0xff; + imgBuf[0x4f] = 0xff; + imgBuf[0x50] = 0x00; + imgBuf[0x51] = 0xff; + imgBuf[0x52] = 0x1a; + imgBuf[0x53] = 0xff; + imgBuf[0x54] = 0x80; + imgBuf[0x55] = 0xff; + imgBuf[0x56] = 0xd6; + imgBuf[0x57] = 0xff; + imgBuf[0x58] = 0x00; + imgBuf[0x59] = 0xff; + imgBuf[0x5a] = 0x00; + imgBuf[0x5b] = 0xff; + imgBuf[0x5c] = 0x00; + imgBuf[0x5d] = 0xff; + imgBuf[0x5e] = 0x00; + imgBuf[0x5f] = 0xff; + imgBuf[0x60] = 0xff; + imgBuf[0x61] = 0xff; + imgBuf[0x62] = 0xff; + imgBuf[0x63] = 0xff; + imgBuf[0x64] = 0xd6; + imgBuf[0x65] = 0xff; + imgBuf[0x66] = 0x00; + imgBuf[0x67] = 0xff; + imgBuf[0x68] = 0xff; + imgBuf[0x69] = 0xff; + imgBuf[0x6a] = 0xff; + imgBuf[0x6b] = 0xff; + imgBuf[0x6c] = 0x80; + imgBuf[0x6d] = 0xff; + imgBuf[0x6e] = 0x00; + imgBuf[0x6f] = 0xff; + imgBuf[0x70] = 0xd6; + imgBuf[0x71] = 0xff; + imgBuf[0x72] = 0x80; + imgBuf[0x73] = 0xff; + imgBuf[0x74] = 0x1a; + imgBuf[0x75] = 0xff; + imgBuf[0x76] = 0x00; + imgBuf[0x77] = 0xff; + imgBuf[0x78] = 0x00; + imgBuf[0x79] = 0xff; + imgBuf[0x7a] = 0x00; + imgBuf[0x7b] = 0xff; + imgBuf[0x7c] = 0x00; + imgBuf[0x7d] = 0xff; + imgBuf[0x7e] = 0x00; + imgBuf[0x7f] = 0xff; + DCStoreRange(imgBuf, 0x80); + GXInitTexObj(&mTexObj, imgBuf, 8, 8, GX_TF_IA8, GX_REPEAT, GX_REPEAT, false); + GXInitTexObjLOD(&mTexObj, GX_LINEAR, GX_LINEAR, 0.0f, 0.0f, 0.0f, GX_FALSE, GX_FALSE, GX_ANISO_1); +} diff --git a/src/JSystem/JSupport/JSUFileStream.cpp b/src/JSystem/JSupport/JSUFileStream.cpp index 5b02bac..8ac2ddf 100644 --- a/src/JSystem/JSupport/JSUFileStream.cpp +++ b/src/JSystem/JSupport/JSUFileStream.cpp @@ -4,29 +4,68 @@ // #include "JSystem/JSupport/JSUFileStream.h" -#include "dolphin/types.h" +#include "JSystem/JKernel/JKRFile.h" /* 802BF81C-802BF860 .text __ct__18JSUFileInputStreamFP7JKRFile */ -JSUFileInputStream::JSUFileInputStream(JKRFile*) { - /* Nonmatching */ +JSUFileInputStream::JSUFileInputStream(JKRFile* pFile) { + mFile = pFile; + mPosition = 0; } /* 802BF860-802BF930 .text readData__18JSUFileInputStreamFPvl */ -void JSUFileInputStream::readData(void*, long) { - /* Nonmatching */ +u32 JSUFileInputStream::readData(void* pBuffer, s32 length) { + s32 lenRead = 0; + if (mFile->isAvailable()) { + if (mPosition + length > (u32)mFile->getFileSize()) { + length = mFile->getFileSize() - mPosition; + } + + if (length > 0) { + lenRead = mFile->readData(pBuffer, length, mPosition); + if (lenRead < 0) { + return 0; + } else { + mPosition += lenRead; + } + } + } + + return lenRead; } /* 802BF930-802BFA10 .text seekPos__18JSUFileInputStreamFl17JSUStreamSeekFrom */ -void JSUFileInputStream::seekPos(long, JSUStreamSeekFrom) { - /* Nonmatching */ +s32 JSUFileInputStream::seekPos(s32 pos, JSUStreamSeekFrom seekFrom) { + s32 oldPos = mPosition; + + switch (seekFrom) { + case JSUStreamSeekFrom_SET: + mPosition = pos; + break; + case JSUStreamSeekFrom_END: + mPosition = mFile->getFileSize() - pos; + break; + case JSUStreamSeekFrom_CUR: + mPosition += pos; + break; + } + + if (mPosition < 0) { + mPosition = 0; + } + + if (mPosition > mFile->getFileSize()) { + mPosition = mFile->getFileSize(); + } + + return mPosition - oldPos; } /* 802BFA10-802BFA40 .text getLength__18JSUFileInputStreamCFv */ -void JSUFileInputStream::getLength() const { - /* Nonmatching */ +s32 JSUFileInputStream::getLength() const { + return mFile->getFileSize(); } /* 802BFA40-802BFA48 .text getPosition__18JSUFileInputStreamCFv */ -void JSUFileInputStream::getPosition() const { - /* Nonmatching */ +s32 JSUFileInputStream::getPosition() const { + return mPosition; } diff --git a/src/JSystem/JSupport/JSUInputStream.cpp b/src/JSystem/JSupport/JSUInputStream.cpp index e16bd58..188d109 100644 --- a/src/JSystem/JSupport/JSUInputStream.cpp +++ b/src/JSystem/JSupport/JSUInputStream.cpp @@ -4,39 +4,73 @@ // #include "JSystem/JSupport/JSUInputStream.h" -#include "dolphin/types.h" +#include "JSystem/JSupport/JSURandomInputStream.h" /* 802BF3F4-802BF47C .text __dt__14JSUInputStreamFv */ JSUInputStream::~JSUInputStream() { - /* Nonmatching */ } /* 802BF47C-802BF4D4 .text read__14JSUInputStreamFPvl */ -void JSUInputStream::read(void*, long) { - /* Nonmatching */ +s32 JSUInputStream::read(void* buffer, s32 numBytes) { + s32 bytesRead = readData(buffer, numBytes); + if (bytesRead != numBytes) { + setState(IOS_STATE_1); + } + return bytesRead; } /* 802BF4D4-802BF554 .text skip__14JSUInputStreamFl */ -void JSUInputStream::skip(long) { - /* Nonmatching */ +s32 JSUInputStream::skip(s32 count) { + s32 skipCount = 0; + u8 buffer[1]; + while (count > skipCount) { + if (readData(&buffer, 1) != 1) { + setState(IOS_STATE_1); + break; + } + skipCount++; + } + return skipCount; } /* 802BF554-802BF5E0 .text align__20JSURandomInputStreamFl */ -void JSURandomInputStream::align(long) { - /* Nonmatching */ +s32 JSURandomInputStream::align(s32 alignment) { + s32 currentPos = getPosition(); + s32 offset = (alignment + currentPos); + offset -= 1; + offset &= ~(alignment - 1); + s32 alignmentOffset = offset - currentPos; + if (alignmentOffset != 0) { + s32 seekLen = seekPos(offset, JSUStreamSeekFrom_SET); + if (seekLen != alignmentOffset) { + setState(IOS_STATE_1); + } + } + return alignmentOffset; } /* 802BF5E0-802BF63C .text skip__20JSURandomInputStreamFl */ -void JSURandomInputStream::skip(long) { - /* Nonmatching */ +s32 JSURandomInputStream::skip(s32 param_0) { + s32 val = seekPos(param_0, JSUStreamSeekFrom_CUR); + if (val != param_0) { + setState(IOS_STATE_1); + } + return val; } /* 802BF63C-802BF6C0 .text peek__20JSURandomInputStreamFPvl */ -void JSURandomInputStream::peek(void*, long) { - /* Nonmatching */ +s32 JSURandomInputStream::peek(void* buffer, s32 numBytes) { + s32 oldPos = getPosition(); + s32 bytesRead = read(buffer, numBytes); + if (bytesRead != 0) { + seekPos(oldPos, JSUStreamSeekFrom_SET); + } + return bytesRead; } /* 802BF6C0-802BF704 .text seek__20JSURandomInputStreamFl17JSUStreamSeekFrom */ -void JSURandomInputStream::seek(long, JSUStreamSeekFrom) { - /* Nonmatching */ +s32 JSURandomInputStream::seek(s32 param_0, JSUStreamSeekFrom param_1) { + s32 seekResult = seekPos(param_0, param_1); + clrState(IOS_STATE_1); + return seekResult; } diff --git a/src/JSystem/JSupport/JSUList.cpp b/src/JSystem/JSupport/JSUList.cpp index 85010d4..43b22c1 100644 --- a/src/JSystem/JSupport/JSUList.cpp +++ b/src/JSystem/JSupport/JSUList.cpp @@ -4,54 +4,156 @@ // #include "JSystem/JSupport/JSUList.h" -#include "dolphin/types.h" /* 802BEFE4-802BEFFC .text __ct__10JSUPtrLinkFPv */ -JSUPtrLink::JSUPtrLink(void*) { - /* Nonmatching */ +JSUPtrLink::JSUPtrLink(void* object) { + mList = NULL; + mObject = object; + mPrev = NULL; + mNext = NULL; } /* 802BEFFC-802BF05C .text __dt__10JSUPtrLinkFv */ JSUPtrLink::~JSUPtrLink() { - /* Nonmatching */ + if (mList != NULL) { + mList->remove(this); + } } /* 802BF05C-802BF094 .text __ct__10JSUPtrListFb */ -JSUPtrList::JSUPtrList(bool) { - /* Nonmatching */ +JSUPtrList::JSUPtrList(bool init) { + if (init) { + initiate(); + } } /* 802BF094-802BF0FC .text __dt__10JSUPtrListFv */ JSUPtrList::~JSUPtrList() { - /* Nonmatching */ + JSUPtrLink* node = mHead; + s32 removed = 0; + while (mLength > removed) { + node->mList = NULL; + node = node->getNext(); + removed += 1; + } } /* 802BF0FC-802BF110 .text initiate__10JSUPtrListFv */ void JSUPtrList::initiate() { - /* Nonmatching */ + mHead = NULL; + mTail = NULL; + mLength = 0; } /* 802BF110-802BF134 .text setFirst__10JSUPtrListFP10JSUPtrLink */ -void JSUPtrList::setFirst(JSUPtrLink*) { - /* Nonmatching */ +void JSUPtrList::setFirst(JSUPtrLink* first) { + first->mList = this; + first->mPrev = NULL; + first->mNext = NULL; + mTail = first; + mHead = first; + mLength = 1; } /* 802BF134-802BF1D8 .text append__10JSUPtrListFP10JSUPtrLink */ -void JSUPtrList::append(JSUPtrLink*) { - /* Nonmatching */ +bool JSUPtrList::append(JSUPtrLink* ptr) { + JSUPtrList* list = ptr->mList; + bool result = (NULL == list); + if (!result) { + result = list->remove(ptr); + } + + if (result) { + if (mLength == 0) { + setFirst(ptr); + } else { + ptr->mList = this; + ptr->mPrev = mTail; + ptr->mNext = NULL; + mTail->mNext = ptr; + mTail = ptr; + mLength++; + } + } + + return result; } /* 802BF1D8-802BF27C .text prepend__10JSUPtrListFP10JSUPtrLink */ -void JSUPtrList::prepend(JSUPtrLink*) { - /* Nonmatching */ +bool JSUPtrList::prepend(JSUPtrLink* ptr) { + JSUPtrList* list = ptr->mList; + bool result = (NULL == list); + if (!result) { + result = list->remove(ptr); + } + + if (result) { + if (mLength == 0) { + setFirst(ptr); + } else { + ptr->mList = this; + ptr->mPrev = NULL; + ptr->mNext = mHead; + mHead->mPrev = ptr; + mHead = ptr; + mLength++; + } + } + + return result; } /* 802BF27C-802BF344 .text insert__10JSUPtrListFP10JSUPtrLinkP10JSUPtrLink */ -void JSUPtrList::insert(JSUPtrLink*, JSUPtrLink*) { - /* Nonmatching */ +bool JSUPtrList::insert(JSUPtrLink* before, JSUPtrLink* ptr) { + if (before == mHead) { + return prepend(ptr); + } else if (before == NULL) { + return append(ptr); + } + + if (before->mList != this) { + return false; + } + + bool result = (NULL == ptr->mList); + if (!result) { + result = ptr->mList->remove(ptr); + } + + if (result) { + JSUPtrLink* prev = before->mPrev; + ptr->mList = this; + ptr->mPrev = prev; + ptr->mNext = before; + prev->mNext = ptr; + before->mPrev = ptr; + mLength++; + } + + return result; } /* 802BF344-802BF3F4 .text remove__10JSUPtrListFP10JSUPtrLink */ -void JSUPtrList::remove(JSUPtrLink*) { - /* Nonmatching */ +bool JSUPtrList::remove(JSUPtrLink* ptr) { + bool is_parent = (ptr->mList == this); + if (is_parent) { + if (mLength == 1) { + mHead = NULL; + mTail = NULL; + } else if (ptr == mHead) { + ptr->mNext->mPrev = NULL; + mHead = ptr->mNext; + } else if (ptr == mTail) { + ptr->mPrev->mNext = NULL; + mTail = ptr->mPrev; + } else { + ptr->mPrev->mNext = ptr->mNext; + ptr->mNext->mPrev = ptr->mPrev; + } + + ptr->mList = NULL; + mLength--; + } + + return is_parent; } diff --git a/src/JSystem/JSupport/JSUMemoryStream.cpp b/src/JSystem/JSupport/JSUMemoryStream.cpp index 26d2a6d..3981aeb 100644 --- a/src/JSystem/JSupport/JSUMemoryStream.cpp +++ b/src/JSystem/JSupport/JSUMemoryStream.cpp @@ -4,29 +4,62 @@ // #include "JSystem/JSupport/JSUMemoryStream.h" -#include "dolphin/types.h" +#include "MSL_c/string.h" /* 802BF704-802BF718 .text setBuffer__20JSUMemoryInputStreamFPCvl */ -void JSUMemoryInputStream::setBuffer(const void*, long) { - /* Nonmatching */ +void JSUMemoryInputStream::setBuffer(void const* pBuffer, s32 length) { + mBuffer = pBuffer; + mLength = length; + mPosition = 0; } /* 802BF718-802BF790 .text readData__20JSUMemoryInputStreamFPvl */ -void JSUMemoryInputStream::readData(void*, long) { - /* Nonmatching */ +u32 JSUMemoryInputStream::readData(void* pData, s32 length) { + if (mPosition + length > mLength) { + length = mLength - mPosition; + } + + if (length > 0) { + memcpy(pData, (void*)((s32)mBuffer + mPosition), length); + mPosition += length; + } + + return length; } /* 802BF790-802BF80C .text seekPos__20JSUMemoryInputStreamFl17JSUStreamSeekFrom */ -void JSUMemoryInputStream::seekPos(long, JSUStreamSeekFrom) { - /* Nonmatching */ +s32 JSUMemoryInputStream::seekPos(s32 pos, JSUStreamSeekFrom seekFrom) { + s32 oldPos = mPosition; + + switch (seekFrom) { + case JSUStreamSeekFrom_SET: + mPosition = pos; + break; + case JSUStreamSeekFrom_END: + mPosition = mLength - pos; + break; + case JSUStreamSeekFrom_CUR: + mPosition += pos; + break; + } + + if (mPosition < 0) { + mPosition = 0; + } + + if (mPosition > mLength) { + mPosition = mLength; + } + + return mPosition - oldPos; } /* 802BF80C-802BF814 .text getLength__20JSUMemoryInputStreamCFv */ -void JSUMemoryInputStream::getLength() const { - /* Nonmatching */ +s32 JSUMemoryInputStream::getLength() const { + return mLength; } /* 802BF814-802BF81C .text getPosition__20JSUMemoryInputStreamCFv */ -void JSUMemoryInputStream::getPosition() const { - /* Nonmatching */ +s32 JSUMemoryInputStream::getPosition() const { + return mPosition; } diff --git a/src/JSystem/JUtility/JUTNameTab.cpp b/src/JSystem/JUtility/JUTNameTab.cpp index 2536e90..3a5514f 100644 --- a/src/JSystem/JUtility/JUTNameTab.cpp +++ b/src/JSystem/JUtility/JUTNameTab.cpp @@ -1,37 +1,57 @@ // -// Generated by dtk -// Translation Unit: JUTNameTab.cpp +// Generated By: dol2asm +// Translation Unit: JUTNameTab // #include "JSystem/JUtility/JUTNameTab.h" -#include "dolphin/types.h" +#include "JSystem/JUtility/JUTAssert.h" +#include "MSL_C/string.h" -/* 802C199C-802C19DC .text __ct__10JUTNameTabFv */ JUTNameTab::JUTNameTab() { - /* Nonmatching */ + setResource(NULL); } -/* 802C19DC-802C1A18 .text __ct__10JUTNameTabFPC7ResNTAB */ -JUTNameTab::JUTNameTab(const ResNTAB*) { - /* Nonmatching */ +JUTNameTab::JUTNameTab(const ResNTAB* pNameTable) { + setResource(pNameTable); } -/* 802C1A18-802C1A54 .text setResource__10JUTNameTabFPC7ResNTAB */ -void JUTNameTab::setResource(const ResNTAB*) { - /* Nonmatching */ +void JUTNameTab::setResource(const ResNTAB* pNameTable) { + mNameTable = pNameTable; + + if (pNameTable != NULL) { + mNameNum = pNameTable->mEntryNum; + mpStrData = (const char*)(pNameTable->mEntries + mNameNum); + } else { + mNameNum = 0; + mpStrData = 0; + } } -/* 802C1A54-802C1B38 .text getIndex__10JUTNameTabCFPCc */ -void JUTNameTab::getIndex(const char*) const { - /* Nonmatching */ +s32 JUTNameTab::getIndex(const char* pName) const { + JUT_ASSERT("JUTNameTab.cpp", 101, mNameTable != 0); + + const ResNTAB::Entry* pEntry = mNameTable->mEntries; + u16 keyCode = calcKeyCode(pName); + + for (u16 i = 0; i < mNameNum; pEntry++, i++) + if (pEntry->mKeyCode == keyCode && + strcmp((mNameTable->mEntries[i].mOffs + ((const char*)mNameTable)), pName) == 0) + return i; + + return -1; } -/* 802C1B38-802C1BD4 .text getName__10JUTNameTabCFUs */ -void JUTNameTab::getName(unsigned short) const { - /* Nonmatching */ +const char* JUTNameTab::getName(u16 index) const { + JUT_ASSERT("JUTNameTab.cpp", 138, mNameTable != 0); + + if (index < mNameNum) + return mNameTable->getName(index); + return NULL; } -/* 802C1BD4-802C1C04 .text calcKeyCode__10JUTNameTabCFPCc */ -void JUTNameTab::calcKeyCode(const char*) const { - /* Nonmatching */ +u16 JUTNameTab::calcKeyCode(const char* pName) const { + u32 keyCode = 0; + while (*pName) + keyCode = (keyCode * 3) + *pName++; + return keyCode; } diff --git a/src/JSystem/JUtility/JUTPalette.cpp b/src/JSystem/JUtility/JUTPalette.cpp index 28917a2..a85b214 100644 --- a/src/JSystem/JUtility/JUTPalette.cpp +++ b/src/JSystem/JUtility/JUTPalette.cpp @@ -1,22 +1,34 @@ -// -// Generated by dtk -// Translation Unit: JUTPalette.cpp -// - #include "JSystem/JUtility/JUTPalette.h" -#include "dolphin/types.h" +#include "dolphin/gx/GX.h" +#include "dolphin/os/OS.h" -/* 802C188C-802C1918 .text storeTLUT__10JUTPaletteF7_GXTlutP7ResTLUT */ -void JUTPalette::storeTLUT(_GXTlut, ResTLUT*) { - /* Nonmatching */ +void JUTPalette::storeTLUT(_GXTlut param_0, ResTLUT* tlut) { + if (tlut == NULL) { + OSPanic("JUTPalette.cpp", 35, "JUTTexture: TLUT is NULL\n"); + } + mTlutName = param_0; + mFormat = tlut->format; + mTransparency = tlut->transparency; + mNumColors = tlut->numColors; + mColorTable = tlut + 8; + GXInitTlutObj(&mTlutObj, (void*)mColorTable, (GXTlutFmt)mFormat, mNumColors); } -/* 802C1918-802C1958 .text storeTLUT__10JUTPaletteF7_GXTlut10_GXTlutFmt15JUTTransparencyUsPv */ -void JUTPalette::storeTLUT(_GXTlut, _GXTlutFmt, JUTTransparency, unsigned short, void*) { - /* Nonmatching */ +void JUTPalette::storeTLUT(_GXTlut param_0, _GXTlutFmt param_1, JUTTransparency param_2, + u16 param_3, void* param_4) { + mTlutName = param_0; + mFormat = param_1; + mTransparency = param_2; + mNumColors = param_3; + mColorTable = (ResTLUT*)param_4; + GXInitTlutObj(&mTlutObj, (void*)mColorTable, (GXTlutFmt)mFormat, mNumColors); } -/* 802C1958-802C199C .text load__10JUTPaletteFv */ -void JUTPalette::load() { - /* Nonmatching */ +bool JUTPalette::load() { + bool check = mNumColors != 0; + if (check) { + GXLoadTlut(&mTlutObj, mTlutName); + } + + return check; } diff --git a/src/SSystem/SComponent/c_API.cpp b/src/SSystem/SComponent/c_API.cpp index cf86dcc..661e144 100644 --- a/src/SSystem/SComponent/c_API.cpp +++ b/src/SSystem/SComponent/c_API.cpp @@ -10,20 +10,20 @@ // External References: // -void mDoGph_BlankingON(); -void mDoGph_BlankingOFF(); -void mDoGph_BeforeOfDraw(); -void mDoGph_AfterOfDraw(); -void mDoGph_Painter(); -void mDoGph_Create(); +extern s16 g_mDoGph_graphicInfo; +extern void mDoGph_BlankingON(); +extern void mDoGph_BlankingOFF(); +extern void mDoGph_BeforeOfDraw(); +extern void mDoGph_AfterOfDraw(); +extern void mDoGph_Painter(); +extern void mDoGph_Create(); -// -// Declarations: -// - -/* ############################################################################################## */ -/* 803C3528-803C3540 0018+00 s=0 e=3 z=0 None .data g_cAPI_Interface */ -cAPIGph_Mthd g_cAPI_Interface[6] = { - mDoGph_Create, mDoGph_BeforeOfDraw, mDoGph_AfterOfDraw, - mDoGph_Painter, mDoGph_BlankingON, mDoGph_BlankingOFF, +cAPIGph__Iface g_cAPI_Interface = { + &g_mDoGph_graphicInfo, + mDoGph_Create, + mDoGph_BeforeOfDraw, + mDoGph_AfterOfDraw, + mDoGph_Painter, + mDoGph_BlankingON, + mDoGph_BlankingOFF, }; diff --git a/src/SSystem/SComponent/c_API_graphic.cpp b/src/SSystem/SComponent/c_API_graphic.cpp index 492161d..ff559be 100644 --- a/src/SSystem/SComponent/c_API_graphic.cpp +++ b/src/SSystem/SComponent/c_API_graphic.cpp @@ -9,15 +9,15 @@ /* 8024135C-8024138C .text cAPIGph_Painter__Fv */ void cAPIGph_Painter(void) { - g_cAPI_Interface[4](); + g_cAPI_Interface.mpPainter(); } /* 8024138C-802413BC .text cAPIGph_BeforeOfDraw__Fv */ void cAPIGph_BeforeOfDraw(void) { - g_cAPI_Interface[2](); + g_cAPI_Interface.mpBeforeOfDraw(); } /* 802413BC-802413EC .text cAPIGph_AfterOfDraw__Fv */ void cAPIGph_AfterOfDraw(void) { - g_cAPI_Interface[3](); + g_cAPI_Interface.mpAfterOfDraw(); } diff --git a/src/SSystem/SComponent/c_bg_s_chk.cpp b/src/SSystem/SComponent/c_bg_s_chk.cpp index 2ebba90..506da04 100644 --- a/src/SSystem/SComponent/c_bg_s_chk.cpp +++ b/src/SSystem/SComponent/c_bg_s_chk.cpp @@ -8,10 +8,13 @@ /* 80247304-8024734C .text __dt__8cBgS_ChkFv */ cBgS_Chk::~cBgS_Chk() { - /* Nonmatching */ } /* 8024734C-8024738C .text ChkSameActorPid__8cBgS_ChkCFUi */ -void cBgS_Chk::ChkSameActorPid(unsigned int) const { - /* Nonmatching */ +bool cBgS_Chk::ChkSameActorPid(unsigned int pid) const { + if (mActorPid == -1 || pid == UINT32_MAX || unk_0x0C == 0) { + return 0; + } else { + return (mActorPid == pid) ? 1 : 0; + } } diff --git a/src/SSystem/SComponent/c_bg_s_gnd_chk.cpp b/src/SSystem/SComponent/c_bg_s_gnd_chk.cpp index 7205a4e..8356377 100644 --- a/src/SSystem/SComponent/c_bg_s_gnd_chk.cpp +++ b/src/SSystem/SComponent/c_bg_s_gnd_chk.cpp @@ -8,5 +8,7 @@ /* 8024738C-80247418 .text __ct__11cBgS_GndChkFv */ cBgS_GndChk::cBgS_GndChk() { - /* Nonmatching */ + m_pos = cXyz::Zero; + setActorPid(0xFFFFFFFF); + mFlags = 2; } diff --git a/src/SSystem/SComponent/c_bg_s_lin_chk.cpp b/src/SSystem/SComponent/c_bg_s_lin_chk.cpp index 29956a4..7a36a65 100644 --- a/src/SSystem/SComponent/c_bg_s_lin_chk.cpp +++ b/src/SSystem/SComponent/c_bg_s_lin_chk.cpp @@ -8,10 +8,20 @@ /* 80247418-80247480 .text ct__11cBgS_LinChkFv */ void cBgS_LinChk::ct() { - /* Nonmatching */ + mLin.mStart = cXyz::Zero; + mLin.mEnd = cXyz::Zero; + field_0x40 = cXyz::Zero ; + setActorPid(0xFFFFFFFF); + field_0x4c = 0; + mFrontFlag = 1; + mBackFlag = 0; } /* 80247480-80247500 .text Set2__11cBgS_LinChkFP4cXyzP4cXyzUi */ -void cBgS_LinChk::Set2(cXyz*, cXyz*, unsigned int) { - /* Nonmatching */ +void cBgS_LinChk::Set2(cXyz* pStart, cXyz* pEnd, unsigned int actorPid) { + mLin.SetStartEnd(*pStart, *pEnd); + field_0x40 = *pEnd; + setActorPid(actorPid); + field_0x4c &= ~0x10; + ClearPi(); } diff --git a/src/SSystem/SComponent/c_data_tbl.cpp b/src/SSystem/SComponent/c_data_tbl.cpp index add736f..2f17a6b 100644 --- a/src/SSystem/SComponent/c_data_tbl.cpp +++ b/src/SSystem/SComponent/c_data_tbl.cpp @@ -4,84 +4,91 @@ // #include "SSystem/SComponent/c_data_tbl.h" -#include "dolphin/types.h" +#include "MSL_C/string.h" /* 80254974-80254990 .text __ct__12cDT_NamePTblFv */ cDT_NamePTbl::cDT_NamePTbl() { - /* Nonmatching */ + mCount = NULL; + mpNames = NULL; } /* 80254990-802549D8 .text __dt__12cDT_NamePTblFv */ cDT_NamePTbl::~cDT_NamePTbl() { - /* Nonmatching */ } /* 802549D8-802549E4 .text Set__12cDT_NamePTblFUlPPc */ -void cDT_NamePTbl::Set(unsigned long, char**) { - /* Nonmatching */ +void cDT_NamePTbl::Set(u32 count, char** pNames) { + mCount = count; + mpNames = pNames; } /* 802549E4-80254A5C .text GetIndex__12cDT_NamePTblCFPCci */ -void cDT_NamePTbl::GetIndex(const char*, int) const { - /* Nonmatching */ +int cDT_NamePTbl::GetIndex(const char* pName, int idx) const { + for (; idx < mCount; idx++) + if (strcmp(pName, mpNames[idx]) == 0) + return idx; + + return -1; } /* 80254A5C-80254A98 .text __ct__10cDT_FormatFv */ cDT_Format::cDT_Format() { - /* Nonmatching */ } /* 80254A98-80254AF8 .text __dt__10cDT_FormatFv */ cDT_Format::~cDT_Format() { - /* Nonmatching */ } /* 80254AF8-80254B34 .text __ct__8cDT_NameFv */ cDT_Name::cDT_Name() { - /* Nonmatching */ } /* 80254B34-80254B94 .text __dt__8cDT_NameFv */ cDT_Name::~cDT_Name() { - /* Nonmatching */ } /* 80254B94-80254BB4 .text __ct__11cDT_DataSrcFv */ cDT_DataSrc::cDT_DataSrc() { - /* Nonmatching */ + mRowNum = 0; + mColNum = 0; + mpData = NULL; } /* 80254BB4-80254BFC .text __dt__11cDT_DataSrcFv */ cDT_DataSrc::~cDT_DataSrc() { - /* Nonmatching */ } /* 80254BFC-80254C0C .text Set__11cDT_DataSrcFUlUlPUc */ -void cDT_DataSrc::Set(unsigned long, unsigned long, unsigned char*) { - /* Nonmatching */ +void cDT_DataSrc::Set(u32 rowNum, u32 colNum, u8* pData) { + mRowNum = rowNum; + mColNum = colNum; + mpData = pData; } /* 80254C0C-80254C50 .text GetInf__11cDT_DataSrcCFii */ -void cDT_DataSrc::GetInf(int, int) const { - /* Nonmatching */ +u8 cDT_DataSrc::GetInf(int row, int col) const { + if (row < 0 || row >= mRowNum || col < 0 || col >= mColNum) + return 0xFF; + + return mpData[row + col * mRowNum]; } /* 80254C50-80254C90 .text __ct__3cDTFv */ cDT::cDT() { - /* Nonmatching */ } /* 80254C90-80254D00 .text __dt__3cDTFv */ cDT::~cDT() { - /* Nonmatching */ } /* 80254D00-80254D68 .text Set__3cDTFUlPPcUlPPcPUc */ -void cDT::Set(unsigned long, char**, unsigned long, char**, unsigned char*) { - /* Nonmatching */ +void cDT::Set(u32 fmtCount, char** pFmt, u32 nameCount, char** pName, u8* pData) { + mFmt.Set(fmtCount, pFmt); + mName.Set(nameCount, pName); + mSrc.Set(fmtCount, nameCount, pData); } /* 80254D68-80254D8C .text GetInf__3cDTCFii */ -void cDT::GetInf(int, int) const { - /* Nonmatching */ +u8 cDT::GetInf(int row, int col) const { + return mSrc.GetInf(row, col); } diff --git a/src/SSystem/SComponent/c_m2d.cpp b/src/SSystem/SComponent/c_m2d.cpp index c084453..d5da22b 100644 --- a/src/SSystem/SComponent/c_m2d.cpp +++ b/src/SSystem/SComponent/c_m2d.cpp @@ -4,9 +4,49 @@ // #include "SSystem/SComponent/c_m2d.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_m3d.h" +#include "SSystem/SComponent/c_m3d_g_cir.h" /* 80249DAC-8024A0E0 .text cM2d_CrossCirLin__FR8cM2dGCirffffPfPf */ -void cM2d_CrossCirLin(cM2dGCir&, float, float, float, float, float*, float*) { - /* Nonmatching */ +void cM2d_CrossCirLin(cM2dGCir& param_0, f32 param_1, f32 param_2, f32 param_3, f32 param_4, + f32* param_5, f32* param_6) { + f32 fVar1 = param_1 - param_0.GetCx(); + f32 fVar15 = param_2 - param_0.GetCy(); + f32 dVar13 = param_3 * param_3 + param_4 * param_4; + f32 dVar14 = 2.0f * ((param_3 * fVar1) + (param_4 * fVar15)); + f32 fVar3 = (fVar1 * fVar1 + fVar15 * fVar15) - (param_0.GetR() * param_0.GetR()); + f32 in_f31; + + if (cM3d_IsZero(dVar13)) { + if (!cM3d_IsZero(dVar14)) { + in_f31 = -fVar3 / dVar14; + } + } else { + f32 dVar10 = ((dVar14 * dVar14) - (4.0f * dVar13) * fVar3); + if (cM3d_IsZero(dVar10)) { + in_f31 =(-dVar14 / (2.0f * dVar13)); + } else { + if (dVar10 < 0.0f) { + } else { + f32 fVar2 = 1.0f / (2.0f * dVar13); + f32 fVar15 = sqrtf(dVar10); + fVar15 = fVar2 * (-dVar14 + fVar15); + f32 fVar16 = sqrtf(dVar10); + f32 fVar4 = fVar2 * (-dVar14 - fVar16); + if (fVar15 > fVar4) { + in_f31 = fVar15; + } else { + in_f31 = fVar4; + } + } + } + } + + if (cM3d_IsZero(in_f31)) { + *param_5 = param_1; + *param_6 = param_2; + } else { + *param_5 = param_1 + (in_f31 * param_3); + *param_6 = param_2 + (in_f31 * param_4); + } } diff --git a/src/SSystem/SComponent/c_m2d_g_box.cpp b/src/SSystem/SComponent/c_m2d_g_box.cpp index 0ee60ad..2ae0d97 100644 --- a/src/SSystem/SComponent/c_m2d_g_box.cpp +++ b/src/SSystem/SComponent/c_m2d_g_box.cpp @@ -4,14 +4,24 @@ // #include "SSystem/SComponent/c_m2d_g_box.h" +#include "MSL_C/math.h" #include "dolphin/types.h" /* 8024A0E0-8024A104 .text Set__8cM2dGBoxFR3cXyR3cXy */ -void cM2dGBox::Set(cXy&, cXy&) { - /* Nonmatching */ +void cM2dGBox::Set(cXy& p0, cXy& p1) { + mP0 = p0; + mP1 = p1; } /* 8024A104-8024A400 .text GetLen__8cM2dGBoxCFRC3cXy */ -void cM2dGBox::GetLen(const cXy&) const { - /* Nonmatching */ +f32 cM2dGBox::GetLen(const cXy& p) const { + // inside the box + if (p.x >= mP0.x && p.x <= mP1.x && p.y >= mP0.y && p.y <= mP1.y) + return 0.0f; + + // TODO: other checks + + float distX = abs(mP0.x - p.x); + float distY = abs(mP0.y - p.y); + return distX < distY ? distX : distY; } diff --git a/src/SSystem/SComponent/c_m3d_g_aab.cpp b/src/SSystem/SComponent/c_m3d_g_aab.cpp index 36525ac..80d2519 100644 --- a/src/SSystem/SComponent/c_m3d_g_aab.cpp +++ b/src/SSystem/SComponent/c_m3d_g_aab.cpp @@ -7,16 +7,17 @@ #include "dolphin/types.h" /* 80251CC4-80251D08 .text SetMinMax__8cM3dGAabFRC4cXyz */ -void cM3dGAab::SetMinMax(const cXyz&) { - /* Nonmatching */ +void cM3dGAab::SetMinMax(const cXyz& pMinMax) { + this->SetMin(pMinMax); + this->SetMax(pMinMax); } /* 80251D08-80251D48 .text SetMin__8cM3dGAabFRC4cXyz */ -void cM3dGAab::SetMin(const cXyz&) { - /* Nonmatching */ +void cM3dGAab::SetMin(const cXyz& pMin) { + mMin.setMin(pMin); } /* 80251D48-80251D88 .text SetMax__8cM3dGAabFRC4cXyz */ -void cM3dGAab::SetMax(const cXyz&) { - /* Nonmatching */ +void cM3dGAab::SetMax(const cXyz& pMax) { + mMax.setMax(pMax); } diff --git a/src/SSystem/SComponent/c_m3d_g_cyl.cpp b/src/SSystem/SComponent/c_m3d_g_cyl.cpp index 83ff595..a964323 100644 --- a/src/SSystem/SComponent/c_m3d_g_cyl.cpp +++ b/src/SSystem/SComponent/c_m3d_g_cyl.cpp @@ -4,39 +4,54 @@ // #include "SSystem/SComponent/c_m3d_g_cyl.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_m3d.h" +#include "JSystem/JUtility/JUTAssert.h" +#include "MSL_C/float.h" + +#define CHECK_FLOAT_CLASS(x) !(((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : __fpclassifyd( (double)(x)) ) == 1) +#define CHECK_FLOAT_RANGE(x) -1.0e32f < x && x < 1.0e32f /* 80251D88-80252020 .text SetC__8cM3dGCylFRC4cXyz */ -void cM3dGCyl::SetC(const cXyz&) { - /* Nonmatching */ +void cM3dGCyl::SetC(const cXyz& pos) { + JUT_ASSERT("c_m3d_g_cyl.cpp", 21, CHECK_FLOAT_CLASS(pos.x)); + JUT_ASSERT("c_m3d_g_cyl.cpp", 22, CHECK_FLOAT_CLASS(pos.y)); + JUT_ASSERT("c_m3d_g_cyl.cpp", 23, CHECK_FLOAT_CLASS(pos.z)); + JUT_ASSERT("c_m3d_g_cyl.cpp", 26, CHECK_FLOAT_RANGE(pos.x) && CHECK_FLOAT_RANGE(pos.y) && CHECK_FLOAT_RANGE(pos.z)); + mCenter = pos; } /* 80252020-8025214C .text SetH__8cM3dGCylFf */ -void cM3dGCyl::SetH(float) { - /* Nonmatching */ +void cM3dGCyl::SetH(f32 h) { + JUT_ASSERT("c_m3d_g_cyl.cpp", 36, CHECK_FLOAT_CLASS(h)); + JUT_ASSERT("c_m3d_g_cyl.cpp", 37, CHECK_FLOAT_RANGE(h)); + mHeight = h; } /* 8025214C-80252278 .text SetR__8cM3dGCylFf */ -void cM3dGCyl::SetR(float) { - /* Nonmatching */ +void cM3dGCyl::SetR(f32 r) { + JUT_ASSERT("c_m3d_g_cyl.cpp", 48, CHECK_FLOAT_CLASS(r)); + JUT_ASSERT("c_m3d_g_cyl.cpp", 49, CHECK_FLOAT_RANGE(r)); + mRadius = r; } /* 80252278-8025229C .text cross__8cM3dGCylCFPC8cM3dGSphP4cXyz */ -void cM3dGCyl::cross(const cM3dGSph*, cXyz*) const { - /* Nonmatching */ +bool cM3dGCyl::cross(const cM3dGSph* pOther, cXyz* pOut) const { + f32 f; + return cM3d_Cross_CylSph(this, pOther, pOut, &f); } /* 8025229C-802522BC .text cross__8cM3dGCylCFPC8cM3dGCylPf */ -void cM3dGCyl::cross(const cM3dGCyl*, float*) const { - /* Nonmatching */ +bool cM3dGCyl::cross(const cM3dGCyl* pOther, f32* pOut) const { + return cM3d_Cross_CylCyl(this, pOther, pOut); } /* 802522BC-802522DC .text cross__8cM3dGCylCFPC8cM3dGCylP4cXyz */ -void cM3dGCyl::cross(const cM3dGCyl*, cXyz*) const { - /* Nonmatching */ +bool cM3dGCyl::cross(const cM3dGCyl* pOther, cXyz* pOut) const { + return cM3d_Cross_CylCyl(this, pOther, pOut); } /* 802522DC-80252304 .text cross__8cM3dGCylCFPC8cM3dGSphPf */ -void cM3dGCyl::cross(const cM3dGSph*, float*) const { - /* Nonmatching */ +bool cM3dGCyl::cross(const cM3dGSph* pOther, f32* pOut) const { + cXyz xyz; + return cM3d_Cross_CylSph(this, pOther, &xyz, pOut); } diff --git a/src/SSystem/SComponent/c_m3d_g_pla.cpp b/src/SSystem/SComponent/c_m3d_g_pla.cpp index 5ce7702..157b787 100644 --- a/src/SSystem/SComponent/c_m3d_g_pla.cpp +++ b/src/SSystem/SComponent/c_m3d_g_pla.cpp @@ -4,14 +4,16 @@ // #include "SSystem/SComponent/c_m3d_g_pla.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_m3d.h" /* 80252304-80252324 .text CalcAngleXz__8cM3dGPlaCFPsPs */ -void cM3dGPla::CalcAngleXz(short*, short*) const { - /* Nonmatching */ +void cM3dGPla::CalcAngleXz(short* pAngleX, short* pAngleY) const { + cM3d_CalcVecAngle(mNormal, pAngleX, pAngleY); } /* 80252324-8025238C .text SetupNP0__8cM3dGPlaFRC3VecRC3Vec */ -void cM3dGPla::SetupNP0(const Vec&, const Vec&) { - /* Nonmatching */ +void cM3dGPla::SetupNP0(const Vec& pNormal, const Vec& pPoint) { + mNormal = pNormal; + VECNormalize(&mNormal, &mNormal); + mD = -VECDotProduct(&mNormal, &pPoint); } diff --git a/src/SSystem/SComponent/c_m3d_g_sph.cpp b/src/SSystem/SComponent/c_m3d_g_sph.cpp index 375f6fb..ff501dc 100644 --- a/src/SSystem/SComponent/c_m3d_g_sph.cpp +++ b/src/SSystem/SComponent/c_m3d_g_sph.cpp @@ -4,29 +4,41 @@ // #include "SSystem/SComponent/c_m3d_g_sph.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_m3d.h" +#include "JSystem/JUtility/JUTAssert.h" +#include "MSL_C/float.h" + +#define CHECK_FLOAT_CLASS(x) !(((sizeof(x) == sizeof(float)) ? __fpclassifyf((float)(x)) : __fpclassifyd( (double)(x)) ) == 1) +#define CHECK_FLOAT_RANGE(x) -1.0e32f < x && x < 1.0e32f /* 8025238C-80252624 .text SetC__8cM3dGSphFRC4cXyz */ -void cM3dGSph::SetC(const cXyz&) { - /* Nonmatching */ +void cM3dGSph::SetC(const cXyz& pos) { + JUT_ASSERT("c_m3d_g_cyl.cpp", 21, CHECK_FLOAT_CLASS(pos.x)); + JUT_ASSERT("c_m3d_g_cyl.cpp", 22, CHECK_FLOAT_CLASS(pos.y)); + JUT_ASSERT("c_m3d_g_cyl.cpp", 23, CHECK_FLOAT_CLASS(pos.z)); + JUT_ASSERT("c_m3d_g_cyl.cpp", 26, CHECK_FLOAT_RANGE(pos.x) && CHECK_FLOAT_RANGE(pos.y) && CHECK_FLOAT_RANGE(pos.z)); + mCenter = pos; } /* 80252624-80252750 .text SetR__8cM3dGSphFf */ -void cM3dGSph::SetR(float) { - /* Nonmatching */ +void cM3dGSph::SetR(float r) { + JUT_ASSERT("c_m3d_g_cyl.cpp", 23, CHECK_FLOAT_CLASS(r)); + JUT_ASSERT("c_m3d_g_cyl.cpp", 26, CHECK_FLOAT_RANGE(r)); } /* 80252750-8025277C .text cross__8cM3dGSphCFPC8cM3dGSphP4cXyz */ -void cM3dGSph::cross(const cM3dGSph*, cXyz*) const { - /* Nonmatching */ +bool cM3dGSph::cross(const cM3dGSph* pOther, cXyz* pOut) const { + return cM3d_Cross_SphSph(pOther, this, pOut); } /* 8025277C-802527AC .text cross__8cM3dGSphCFPC8cM3dGCylP4cXyz */ -void cM3dGSph::cross(const cM3dGCyl*, cXyz*) const { - /* Nonmatching */ +bool cM3dGSph::cross(const cM3dGCyl* pOther, cXyz* pOut) const { + f32 f; + return cM3d_Cross_CylSph(pOther, this, pOut, &f); } /* 802527AC-802527D4 .text cross__8cM3dGSphCFPC8cM3dGSphPf */ -void cM3dGSph::cross(const cM3dGSph*, float*) const { - /* Nonmatching */ +bool cM3dGSph::cross(const cM3dGSph* pOther, f32* pOut) const { + f32 f; + return cM3d_Cross_SphSph(this, pOther, &f, pOut); } diff --git a/src/SSystem/SComponent/c_m3d_g_tri.cpp b/src/SSystem/SComponent/c_m3d_g_tri.cpp index 3bf54b0..5228eec 100644 --- a/src/SSystem/SComponent/c_m3d_g_tri.cpp +++ b/src/SSystem/SComponent/c_m3d_g_tri.cpp @@ -4,14 +4,18 @@ // #include "SSystem/SComponent/c_m3d_g_tri.h" +#include "SSystem/SComponent/c_m3d.h" #include "dolphin/types.h" /* 802527D4-80252878 .text __ct__8cM3dGTriFPC3VecPC3VecPC3Vec */ -cM3dGTri::cM3dGTri(const Vec*, const Vec*, const Vec*) { - /* Nonmatching */ +cM3dGTri::cM3dGTri(const Vec* pA, const Vec* pB, const Vec* pC) { + mA = *pA; + mB = *pB; + mC = *pC; + cM3d_CalcPla(&mA, &mB, &mC, &mNormal, &mD); } /* 80252878-802528A4 .text cross__8cM3dGTriCFPC8cM3dGCylP3Vec */ -void cM3dGTri::cross(const cM3dGCyl*, Vec*) const { - /* Nonmatching */ +bool cM3dGTri::cross(const cM3dGCyl* pOther, Vec* pOut) const { + return cM3d_Cross_CylTri(pOther, this, pOut); } diff --git a/src/d/d_resorce.cpp b/src/d/d_resorce.cpp index e233080..f285645 100644 --- a/src/d/d_resorce.cpp +++ b/src/d/d_resorce.cpp @@ -7,27 +7,56 @@ #include "dolphin/types.h" /* 8006D804-8006D824 .text __ct__11dRes_info_cFv */ -dRes_info_c::dRes_info_c() { - /* Nonmatching */ +dRes_info_c::dRes_info_c() + : mCount(0) + , mpDMCommand(NULL) + , mpArchive(NULL) + , mpParentHeap(NULL) + , mpDataHeap(NULL) + , mpRes(NULL) +{ } /* 8006D824-8006D8F4 .text __dt__11dRes_info_cFv */ dRes_info_c::~dRes_info_c() { - /* Nonmatching */ + if (mpDMCommand != NULL) { + delete mpDMCommand; + mpDMCommand = NULL; + } else if (mpArchive != NULL) { + deleteArchiveRes(); + if (mpDataHeap != NULL) { + mDoExt_destroySolidHeap(mpDataHeap); + mpDataHeap = NULL; + mpArchive->unmount(); + } + mpRes = NULL; + mpArchive = NULL; + } } /* 8006D8F4-8006D990 .text set__11dRes_info_cFPCcPCcUcP7JKRHeap */ -void dRes_info_c::set(const char*, const char*, unsigned char, JKRHeap*) { - /* Nonmatching */ +int dRes_info_c::set(char const* pArcName, char const* pArcPath, u8 param_2, JKRHeap* pHeap) { + char path[40]; + + if (*pArcPath != NULL) { + snprintf(path, 40, "%s%s.arc", pArcPath, pArcName); + mDMCommand = mDoDvdThd_mountArchive_c::create(path, param_2, pHeap); + + if (mDMCommand == NULL) { + return false; + } + } + strncpy(mArchiveName, pArcName, 10); + return true; } /* 8006D990-8006DCEC .text setToonTex__FP12J3DModelData */ -void setToonTex(J3DModelData*) { +static void setToonTex(J3DModelData* pModel) { /* Nonmatching */ } /* 8006DCEC-8006DFD4 .text setToonTex__FP16J3DMaterialTable */ -void setToonTex(J3DMaterialTable*) { +static void setToonTex(J3DMaterialTable* pMaterial) { /* Nonmatching */ } @@ -57,13 +86,70 @@ J3DAnmBase::~J3DAnmBase() { } /* 8006E8FC-8006EBD0 .text setRes__11dRes_info_cFv */ -void dRes_info_c::setRes() { - /* Nonmatching */ +int dRes_info_c::setRes() { + if (mpArchive == NULL) { + if (mpDMCommand == NULL) { + return -1; + } + if ((int)mpDMCommand->mIsDone == 0) { + return 1; + } + + mpArchive = mpDMCommand->getArchive(); + mpParentHeap = mpDMCommand->getHeap(); + + delete mpDMCommand; + mpDMCommand = NULL; + + if (mpArchive == NULL) { + OSReport_Error("<%s.arc> setRes: archive mount error !!\n", mArchiveName); + return -1; + } + if (mpParentHeap != NULL) { + mpParentHeap->lock(); + mpDataHeap = mDoExt_createSolidHeapToCurrent(0, mpParentHeap, 0x20); + + int rt = loadResource(); + mDoExt_restoreCurrentHeap(); + mDoExt_adjustSolidHeap(mpDataHeap); + heap->unlock(); + + if (rt < 0) { + return -1; + } + } else { + mpDataHeap = mDoExt_createSolidHeapFromGameToCurrent(0, 0); + if (mpDataHeap == NULL) { + OSReport_Error("<%s.arc> mDMCommandsetRes: can't alloc memory\n", mArchiveName); + return -1; + } + int rt = loadResource(); + mDoExt_restoreCurrentHeap(); + mDoExt_adjustSolidHeap(mpDataHeap); + + if (rt < 0) { + return -1; + } + } + + u32 heapSize = mpDataHeap->getHeapSize(); + void* heapStartAddr = mpDataHeap->getStartAddr(); + DCStoreRangeNoSync(heapStartAddr, heapSize); + } + + return 0; } /* 8006EBD0-8006EBF8 .text getArcHeader__FP10JKRArchive */ -void getArcHeader(JKRArchive*) { - /* Nonmatching */ +static SArcHeader* getArcHeader(JKRArchive* pArchive) { + if (pArchive != NULL) { + switch (pArchive->getMountMode()) { + case JKRArchive::MOUNT_MEM: + return ((JKRMemArchive*)pArchive)->getArcHeader(); + } + } + + return NULL; } /* 8006EBF8-8006ECF4 .text dump_long__11dRes_info_cFP11dRes_info_ci */ @@ -87,58 +173,149 @@ void dRes_control_c::setRes(const char*, dRes_info_c*, int, const char*, unsigne } /* 8006F01C-8006F074 .text syncRes__14dRes_control_cFPCcP11dRes_info_ci */ -void dRes_control_c::syncRes(const char*, dRes_info_c*, int) { - /* Nonmatching */ +int dRes_control_c::syncRes(char const* arcName, dRes_info_c* pInfo, int infoSize) { + dRes_info_c* resInfo = getResInfo(arcName, pInfo, infoSize); + + if (resInfo == NULL) { + return -1; + } else { + return resInfo->setRes(); + } } /* 8006F074-8006F0E8 .text deleteRes__14dRes_control_cFPCcP11dRes_info_ci */ -void dRes_control_c::deleteRes(const char*, dRes_info_c*, int) { - /* Nonmatching */ +int dRes_control_c::deleteRes(char const* arcName, dRes_info_c* pInfo, int infoSize) { + dRes_info_c* resInfo = getResInfo(arcName, pInfo, infoSize); + + if (resInfo == NULL) { + return 0; + } else { + if (resInfo->decCount() == 0) { + resInfo->~dRes_info_c(); + } + return 1; + } } /* 8006F0E8-8006F164 .text getResInfo__14dRes_control_cFPCcP11dRes_info_ci */ -void dRes_control_c::getResInfo(const char*, dRes_info_c*, int) { - /* Nonmatching */ +dRes_info_c* dRes_control_c::getResInfo(char const* pArcName, dRes_info_c* pResInfo, int infoSize) { + for (int i = 0; i < infoSize; i++) { + if (pResInfo->getCount() != 0) { + if (!stricmp(pArcName, pResInfo->getArchiveName())) { + return pResInfo; + } + } + pResInfo++; + } + return NULL; } /* 8006F164-8006F18C .text newResInfo__14dRes_control_cFP11dRes_info_ci */ -void dRes_control_c::newResInfo(dRes_info_c*, int) { - /* Nonmatching */ +dRes_info_c* dRes_control_c::newResInfo(dRes_info_c* pResInfo, int infoSize) { + for (int i = 0; i < infoSize; i++) { + if (pResInfo->getCount() == 0) { + return pResInfo; + } + pResInfo++; + } + return NULL; } /* 8006F18C-8006F208 .text getResInfoLoaded__14dRes_control_cFPCcP11dRes_info_ci */ -void dRes_control_c::getResInfoLoaded(const char*, dRes_info_c*, int) { - /* Nonmatching */ +dRes_info_c* dRes_control_c::getResInfoLoaded(char const* arcName, dRes_info_c* pResInfo, + int infoSize) { + dRes_info_c* resInfo = getResInfo(arcName, pResInfo, infoSize); + + if (resInfo == NULL) { + resInfo = NULL; + } else if (resInfo->getArchive() == NULL) { + OSReport_Warning("<%s.arc> getRes: res during reading !!\n", arcName); + resInfo = NULL; + } + return resInfo; } /* 8006F208-8006F298 .text getRes__14dRes_control_cFPCclP11dRes_info_ci */ -void dRes_control_c::getRes(const char*, long, dRes_info_c*, int) { - /* Nonmatching */ +void* dRes_control_c::getRes(char const* arcName, s32 resIdx, dRes_info_c* pInfo, int infoSize) { + dRes_info_c* resInfo = getResInfoLoaded(arcName, pInfo, infoSize); + + if (resInfo == NULL) { + return resInfo; + } + JKRArchive* archive = resInfo->getArchive(); + u32 fileCount = archive->countFile(); + + if (resIdx >= (int)fileCount) { + OSReport_Error("<%s.arc> getRes: res index over !! index=%d count=%d\n", arcName, resIdx, + fileCount); + return NULL; + } + return resInfo->getRes(resIdx); } /* 8006F298-8006F34C .text getRes__14dRes_control_cFPCcPCcP11dRes_info_ci */ -void dRes_control_c::getRes(const char*, const char*, dRes_info_c*, int) { - /* Nonmatching */ +void* dRes_control_c::getRes(char const* arcName, char const* resName, dRes_info_c* pInfo, int infoSize) { + dRes_info_c* resInfo = getResInfoLoaded(arcName, pInfo, infoSize); + + if (resInfo == NULL) { + return resInfo; + } + + JKRArchive* archive = resInfo->getArchive(); + JKRArchive::SDIFileEntry* entry = archive->findNameResource(resName); + + if (entry != NULL) { + return resInfo->getRes(entry - archive->mFiles); + } else { + return NULL; + } } /* 8006F34C-8006F3BC .text getIDRes__14dRes_control_cFPCcUsP11dRes_info_ci */ -void dRes_control_c::getIDRes(const char*, unsigned short, dRes_info_c*, int) { - /* Nonmatching */ +void* dRes_control_c::getIDRes(char const* arcName, u16 param_1, dRes_info_c* pInfo, int infoSize) { + dRes_info_c* resInfo = getResInfoLoaded(arcName, pInfo, infoSize); + + if (resInfo == NULL) { + return resInfo; + } + + JKRArchive* archive = resInfo->getArchive(); + int index = mDoExt_resIDToIndex(archive, param_1); + + if (index < 0) { + return 0; + } + + return resInfo->getRes(index); } /* 8006F3BC-8006F430 .text syncAllRes__14dRes_control_cFP11dRes_info_ci */ -void dRes_control_c::syncAllRes(dRes_info_c*, int) { - /* Nonmatching */ +int dRes_control_c::syncAllRes(dRes_info_c* pInfo, int infoSize) { + for (int i = 0; i < infoSize; i++) { + if (pInfo->getDMCommand() != NULL && pInfo->setRes() > 0) { + return 1; + } + pInfo++; + } + return 0; } /* 8006F430-8006F500 .text setStageRes__14dRes_control_cFPCcP7JKRHeap */ -void dRes_control_c::setStageRes(const char*, JKRHeap*) { - /* Nonmatching */ +int dRes_control_c::setStageRes(char const* arcName, JKRHeap* pHeap) { + char path[20]; + snprintf(path, 20, "/res/Stage/%s/", dComIfGp_getStartStageName()); + return setRes(arcName, &mStageInfo[0], 0x40, path, 1, pHeap); } /* 8006F500-8006F580 .text dump__14dRes_control_cFv */ void dRes_control_c::dump() { - /* Nonmatching */ + JUTReportConsole_f("\ndRes_control_c::dump mObjectInfo\n"); + dRes_info_c::dump(&mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); + dRes_info_c::dump_long(&mObjectInfo[0], ARRAY_SIZE(mObjectInfo)); + + JUTReportConsole_f("\ndRes_control_c::dump mStageInfo\n"); + dRes_info_c::dump(&mStageInfo[0], ARRAY_SIZE(mStageInfo)); + dRes_info_c::dump_long(&mStageInfo[0], ARRAY_SIZE(mStageInfo)); } /* 8006F580-8006F5FC .text __dt__18mDoExt_transAnmBasFv */ @@ -150,4 +327,3 @@ mDoExt_transAnmBas::~mDoExt_transAnmBas() { void J3DAnmTransformKey::getTransform(unsigned short, J3DTransformInfo*) const { /* Nonmatching */ } - diff --git a/src/f_pc/f_pc_draw_priority.cpp b/src/f_pc/f_pc_draw_priority.cpp index 67b3008..4836b94 100644 --- a/src/f_pc/f_pc_draw_priority.cpp +++ b/src/f_pc/f_pc_draw_priority.cpp @@ -6,7 +6,7 @@ #include "f_pc/f_pc_draw_priority.h" /* 8003D580-8003D588 .text fpcDwPi_Get__FP19draw_priority_class */ -s16 fpcDwPi_Get(const draw_priority_class* i_drawPrioClass) { +s16 fpcDwPi_Get(draw_priority_class* i_drawPrioClass) { return i_drawPrioClass->mPriority; } diff --git a/src/f_pc/f_pc_leaf.cpp b/src/f_pc/f_pc_leaf.cpp index f896f3d..b23ffef 100644 --- a/src/f_pc/f_pc_leaf.cpp +++ b/src/f_pc/f_pc_leaf.cpp @@ -6,7 +6,7 @@ #include "f_pc/f_pc_leaf.h" /* 8003DC78-8003DC9C .text fpcLf_GetPriority__FP14leafdraw_class */ -s16 fpcLf_GetPriority(const leafdraw_class* i_leaf) { +s16 fpcLf_GetPriority(leafdraw_class* i_leaf) { return fpcDwPi_Get(&i_leaf->mDwPi); } diff --git a/src/m_Do/m_Do_controller_pad.cpp b/src/m_Do/m_Do_controller_pad.cpp index 1c89338..2290e68 100644 --- a/src/m_Do/m_Do_controller_pad.cpp +++ b/src/m_Do/m_Do_controller_pad.cpp @@ -4,19 +4,113 @@ // #include "m_Do/m_Do_controller_pad.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_API_controller_pad.h" +#include "SSystem/SComponent/c_lib.h" +#include "JSystem/JUtility/JUTGamePad.h" +#include "m_Do/m_Do_main.h" +#include "m_Do/m_Do_Reset.h" + +JUTGamePad* g_mDoCPd_gamePad[4]; +interface_of_controller_pad g_mDoCPd_cpadInfo[4]; + +inline void mDoCPd_ANALOG_CONV(u8 analog, f32& param_1) { + param_1 = analog * (1.0f / 15.0f); + if (param_1 > 1.0f) { + param_1 = 1.0f; + } +} + +inline void mDoCPd_TRIGGER_CONV(u8 analog, f32& param_1) { + param_1 = analog * 0.0071428571827709675f; + if (param_1 > 1.0f) { + param_1 = 1.0f; + } +} /* 80007598-800078C0 .text mDoCPd_Convert__FP27interface_of_controller_padP10JUTGamePad */ -void mDoCPd_Convert(interface_of_controller_pad*, JUTGamePad*) { - /* Nonmatching */ +static s32 mDoCPd_Convert(interface_of_controller_pad* pInterface, JUTGamePad* pPad) { + pInterface->mButtonFlags = pPad->getButton(); + pInterface->mMainStickPosX = pPad->getMainStickX(); + pInterface->mMainStickPosY = pPad->getMainStickY(); + pInterface->mMainStickValue = pPad->getMainStickValue(); + pInterface->mMainStickAngle = pPad->getMainStickAngle(); + pInterface->mCStickPosX = pPad->getSubStickX(); + pInterface->mCStickPosY = pPad->getSubStickY(); + pInterface->mCStickValue = pPad->getSubStickValue(); + pInterface->mCStickAngle = pPad->getSubStickAngle(); + + mDoCPd_ANALOG_CONV(pPad->getAnalogA(), pInterface->mAnalogA); + mDoCPd_ANALOG_CONV(pPad->getAnalogB(), pInterface->mAnalogB); + mDoCPd_TRIGGER_CONV(pPad->getAnalogL(), pInterface->mTriggerLeft); + mDoCPd_TRIGGER_CONV(pPad->getAnalogR(), pInterface->mTriggerRight); + + pInterface->mGamepadErrorFlags = pPad->getErrorStatus(); + return 1; } /* 800078C0-80007A70 .text mDoCPd_Read__Fv */ -void mDoCPd_Read() { - /* Nonmatching */ +void mDoCPd_Read(void) { + JUTGamePad::read(); + + if (!mDoRst::isReset() && mDoRst::is3ButtonReset()) { + JUTGamePad* pad = JUTGamePad::getGamePad(mDoRst::get3ButtonResetPort()); + + if (!pad->isPushing3ButtonReset()) { + mDoRst::off3ButtonReset(); + } + } + + JUTGamePad** pad = g_mDoCPd_gamePad; + interface_of_controller_pad* interface = g_mDoCPd_cpadInfo; + + for (u32 i = 0; i < 4; i++) { + if (*pad == NULL) { + cLib_memSet(interface, 0, sizeof(interface_of_controller_pad)); + } else { + mDoCPd_Convert(interface, *pad); + } + + pad++; + interface++; + } + + for (u32 i = 0; i < 4; i++) { + g_mDoCPd_cpadInfo[i].mTrigLockL = false; + g_mDoCPd_cpadInfo[i].mTrigLockR = false; + } } /* 80007A70-80007BBC .text mDoCPd_Create__Fv */ -void mDoCPd_Create() { - /* Nonmatching */ +void mDoCPd_Create(void) { + JUTGamePad::sSuppressPadReset = 1; + + JUTGamePad* pad = new JUTGamePad(JUTGamePad::Port_1); + g_mDoCPd_gamePad[0] = pad; + g_mDoCPd_gamePad[1] = NULL; + + if (mDoMain::developmentMode != 0) { + g_mDoCPd_gamePad[2] = new JUTGamePad(JUTGamePad::Port_3); + g_mDoCPd_gamePad[3] = new JUTGamePad(JUTGamePad::Port_4); + } else { + g_mDoCPd_gamePad[2] = NULL; + g_mDoCPd_gamePad[3] = NULL; + } + + JUTGamePad::setAnalogMode(3); + if (!mDoRst::isReset()) { + JUTGamePad::clearResetOccurred(); + JUTGamePad::setResetCallback(mDoRst_resetCallBack, NULL); + } + + // JUTGba::create(); + // mDoGaC_Initial(); + + interface_of_controller_pad* cpad = &g_mDoCPd_cpadInfo[0]; + for (int i = 0; i < 4; i++) { + cpad->mTrigLockL = false; + cpad->mHoldLockL = false; + cpad->mTrigLockR = false; + cpad->mHoldLockR = false; + cpad++; + } } From 3034b051520ed01f3907d66b12557763070fed1f Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 9 Sep 2023 16:31:58 -0700 Subject: [PATCH 3/4] restructure d/ --- config/GZLE01/rels/d_a_acorn_leaf/splits.txt | 2 +- config/GZLE01/rels/d_a_agbsw0/splits.txt | 2 +- config/GZLE01/rels/d_a_alldie/splits.txt | 2 +- config/GZLE01/rels/d_a_am/splits.txt | 2 +- config/GZLE01/rels/d_a_am2/splits.txt | 2 +- config/GZLE01/rels/d_a_amiprop/splits.txt | 2 +- config/GZLE01/rels/d_a_andsw0/splits.txt | 2 +- config/GZLE01/rels/d_a_andsw2/splits.txt | 2 +- .../GZLE01/rels/d_a_arrow_iceeff/splits.txt | 2 +- .../GZLE01/rels/d_a_arrow_lighteff/splits.txt | 2 +- config/GZLE01/rels/d_a_atdoor/splits.txt | 2 +- config/GZLE01/rels/d_a_att/splits.txt | 2 +- config/GZLE01/rels/d_a_auction/splits.txt | 2 +- config/GZLE01/rels/d_a_bb/splits.txt | 2 +- config/GZLE01/rels/d_a_bdk/splits.txt | 2 +- config/GZLE01/rels/d_a_bdkobj/splits.txt | 2 +- config/GZLE01/rels/d_a_beam/splits.txt | 2 +- config/GZLE01/rels/d_a_bflower/splits.txt | 2 +- config/GZLE01/rels/d_a_bgn/splits.txt | 2 +- config/GZLE01/rels/d_a_bgn2/splits.txt | 2 +- config/GZLE01/rels/d_a_bgn3/splits.txt | 2 +- config/GZLE01/rels/d_a_bigelf/splits.txt | 2 +- config/GZLE01/rels/d_a_bita/splits.txt | 2 +- config/GZLE01/rels/d_a_bk/splits.txt | 2 +- config/GZLE01/rels/d_a_bl/splits.txt | 2 +- config/GZLE01/rels/d_a_bmd/splits.txt | 2 +- config/GZLE01/rels/d_a_bmdfoot/splits.txt | 2 +- config/GZLE01/rels/d_a_bmdhand/splits.txt | 2 +- config/GZLE01/rels/d_a_bo/splits.txt | 2 +- config/GZLE01/rels/d_a_boko/splits.txt | 2 +- config/GZLE01/rels/d_a_boss_item/splits.txt | 2 +- config/GZLE01/rels/d_a_bpw/splits.txt | 2 +- config/GZLE01/rels/d_a_branch/splits.txt | 2 +- config/GZLE01/rels/d_a_bridge/splits.txt | 2 +- config/GZLE01/rels/d_a_bst/splits.txt | 2 +- config/GZLE01/rels/d_a_btd/splits.txt | 2 +- config/GZLE01/rels/d_a_bwd/splits.txt | 2 +- config/GZLE01/rels/d_a_bwdg/splits.txt | 2 +- config/GZLE01/rels/d_a_bwds/splits.txt | 2 +- config/GZLE01/rels/d_a_canon/splits.txt | 2 +- config/GZLE01/rels/d_a_cc/splits.txt | 2 +- config/GZLE01/rels/d_a_coming2/splits.txt | 2 +- config/GZLE01/rels/d_a_coming3/splits.txt | 2 +- config/GZLE01/rels/d_a_dai/splits.txt | 2 +- config/GZLE01/rels/d_a_daiocta/splits.txt | 2 +- config/GZLE01/rels/d_a_daiocta_eye/splits.txt | 2 +- config/GZLE01/rels/d_a_deku_item/splits.txt | 2 +- config/GZLE01/rels/d_a_demo_dk/splits.txt | 2 +- config/GZLE01/rels/d_a_demo_item/splits.txt | 2 +- config/GZLE01/rels/d_a_demo_kmm/splits.txt | 2 +- config/GZLE01/rels/d_a_dk/splits.txt | 2 +- config/GZLE01/rels/d_a_door10/splits.txt | 2 +- config/GZLE01/rels/d_a_door12/splits.txt | 2 +- config/GZLE01/rels/d_a_dr/splits.txt | 2 +- config/GZLE01/rels/d_a_dr2/splits.txt | 2 +- config/GZLE01/rels/d_a_dummy/splits.txt | 2 +- config/GZLE01/rels/d_a_ep/splits.txt | 2 +- config/GZLE01/rels/d_a_fallrock/splits.txt | 2 +- .../GZLE01/rels/d_a_fallrock_tag/splits.txt | 2 +- config/GZLE01/rels/d_a_fan/splits.txt | 2 +- config/GZLE01/rels/d_a_ff/splits.txt | 2 +- config/GZLE01/rels/d_a_fganon/splits.txt | 2 +- config/GZLE01/rels/d_a_fgmahou/splits.txt | 2 +- config/GZLE01/rels/d_a_fire/splits.txt | 2 +- config/GZLE01/rels/d_a_floor/splits.txt | 2 +- config/GZLE01/rels/d_a_fm/splits.txt | 2 +- config/GZLE01/rels/d_a_ghostship/splits.txt | 2 +- config/GZLE01/rels/d_a_gm/splits.txt | 2 +- config/GZLE01/rels/d_a_gnd/splits.txt | 2 +- config/GZLE01/rels/d_a_goal_flag/splits.txt | 2 +- config/GZLE01/rels/d_a_grass/splits.txt | 2 +- config/GZLE01/rels/d_a_gy/splits.txt | 2 +- config/GZLE01/rels/d_a_gy_ctrl/splits.txt | 2 +- config/GZLE01/rels/d_a_himo3/splits.txt | 2 +- config/GZLE01/rels/d_a_hitobj/splits.txt | 2 +- config/GZLE01/rels/d_a_hmlif/splits.txt | 2 +- config/GZLE01/rels/d_a_hot_floor/splits.txt | 2 +- config/GZLE01/rels/d_a_hys/splits.txt | 2 +- config/GZLE01/rels/d_a_icelift/splits.txt | 2 +- config/GZLE01/rels/d_a_ikari/splits.txt | 2 +- config/GZLE01/rels/d_a_jbo/splits.txt | 2 +- config/GZLE01/rels/d_a_kaji/splits.txt | 2 +- config/GZLE01/rels/d_a_kamome/splits.txt | 2 +- config/GZLE01/rels/d_a_kanban/splits.txt | 2 +- config/GZLE01/rels/d_a_kantera/splits.txt | 2 +- config/GZLE01/rels/d_a_kb/splits.txt | 2 +- config/GZLE01/rels/d_a_kddoor/splits.txt | 2 +- config/GZLE01/rels/d_a_ki/splits.txt | 2 +- config/GZLE01/rels/d_a_kita/splits.txt | 2 +- config/GZLE01/rels/d_a_klft/splits.txt | 2 +- config/GZLE01/rels/d_a_kmon/splits.txt | 2 +- config/GZLE01/rels/d_a_kn/splits.txt | 2 +- config/GZLE01/rels/d_a_knob00/splits.txt | 2 +- config/GZLE01/rels/d_a_kokiie/splits.txt | 2 +- config/GZLE01/rels/d_a_komore/splits.txt | 2 +- config/GZLE01/rels/d_a_ks/splits.txt | 2 +- config/GZLE01/rels/d_a_kt/splits.txt | 2 +- config/GZLE01/rels/d_a_kui/splits.txt | 2 +- config/GZLE01/rels/d_a_kytag00/splits.txt | 2 +- config/GZLE01/rels/d_a_kytag01/splits.txt | 2 +- config/GZLE01/rels/d_a_kytag02/splits.txt | 2 +- config/GZLE01/rels/d_a_kytag03/splits.txt | 2 +- config/GZLE01/rels/d_a_kytag04/splits.txt | 2 +- config/GZLE01/rels/d_a_kytag05/splits.txt | 2 +- config/GZLE01/rels/d_a_kytag06/splits.txt | 2 +- config/GZLE01/rels/d_a_kytag07/splits.txt | 2 +- config/GZLE01/rels/d_a_lamp/splits.txt | 2 +- config/GZLE01/rels/d_a_lbridge/splits.txt | 2 +- config/GZLE01/rels/d_a_leaflift/splits.txt | 2 +- config/GZLE01/rels/d_a_lod_bg/splits.txt | 2 +- config/GZLE01/rels/d_a_lstair/splits.txt | 2 +- config/GZLE01/rels/d_a_lwood/splits.txt | 2 +- config/GZLE01/rels/d_a_machine/splits.txt | 2 +- config/GZLE01/rels/d_a_magma/splits.txt | 2 +- config/GZLE01/rels/d_a_majuu_flag/splits.txt | 2 +- config/GZLE01/rels/d_a_mant/splits.txt | 2 +- config/GZLE01/rels/d_a_mbdoor/splits.txt | 2 +- config/GZLE01/rels/d_a_mdoor/splits.txt | 2 +- config/GZLE01/rels/d_a_mflft/splits.txt | 2 +- config/GZLE01/rels/d_a_mgameboard/splits.txt | 2 +- config/GZLE01/rels/d_a_mmusic/splits.txt | 2 +- config/GZLE01/rels/d_a_mo2/splits.txt | 2 +- .../GZLE01/rels/d_a_movie_player/splits.txt | 2 +- config/GZLE01/rels/d_a_mozo/splits.txt | 2 +- config/GZLE01/rels/d_a_msw/splits.txt | 2 +- config/GZLE01/rels/d_a_mt/splits.txt | 2 +- config/GZLE01/rels/d_a_mtoge/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_ac1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_ah/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_aj1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_auction/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_ba1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_bj1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_bm1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_bmcon1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_bms1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_bmsw/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_bs1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_btsw/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_btsw2/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_cb1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_co1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_de1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_ds1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_gk1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_gp1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_hi1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_ho/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_hr/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_jb1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_ji1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_kamome/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_kf1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_kg1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_kg2/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_kk1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_km1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_ko1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_kp1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_ls1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_md/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_mk/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_mn/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_mt/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_nz/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_ob1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_os/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_p1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_p2/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_people/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_pf1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_photo/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_pm1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_roten/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_rsh1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_sarace/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_so/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_sv/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_tc/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_tt/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_uk/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_ym1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_yw1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_zk1/splits.txt | 2 +- config/GZLE01/rels/d_a_npc_zl1/splits.txt | 2 +- config/GZLE01/rels/d_a_nz/splits.txt | 2 +- config/GZLE01/rels/d_a_nzg/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_AjavW/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_Itnak/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_Vds/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_Vteng/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_YLzou/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_Yboil/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_Ygush00/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_adnno/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ajav/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_akabe/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_apzl/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ashut/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_auzu/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_aygr/splits.txt | 2 +- .../rels/d_a_obj_balancelift/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_barrel/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_barrel2/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_barrier/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_bemos/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_bscurtain/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_buoyflag/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_buoyrace/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_cafelmp/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_canon/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_coming/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_correct/splits.txt | 2 +- .../rels/d_a_obj_demo_barrel/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_dmgroom/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_doguu/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_doguu_demo/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_dragonhead/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_drift/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_eayogn/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ebomzo/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_eff/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ekskz/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_eskban/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ferris/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_figure/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_firewall/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_flame/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ftree/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_ganonbed/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_gaship/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_gaship2/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_gnnbtltaki/splits.txt | 2 +- .../rels/d_a_obj_gnndemotakie/splits.txt | 2 +- .../rels/d_a_obj_gnndemotakis/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_gong/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_gryw00/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_gtaki/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hami2/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hami3/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hami4/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hat/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hbrf1/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hcbh/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hfuck1/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hha/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hlift/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hole/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_homen/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_homensmoke/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_hsehi1/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_htetu1/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ice/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_iceisland/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ikada/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_jump/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_kanat/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_kanoke/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ladder/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_leaves/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_light/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_lpalm/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_magmarock/splits.txt | 2 +- .../rels/d_a_obj_majyuu_door/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_mkie/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_mkiek/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_mknjd/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_mmrr/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_monument/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_movebox/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_msdan/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_msdan2/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_msdan_sub/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_msdan_sub2/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_mshokki/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_mtest/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_nest/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ohatch/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ojtree/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_ospbox/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_otble/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_paper/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_pbco/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_pbka/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_pfall/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_pirateship/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_plant/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_quake/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_rcloud/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_rflw/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_rforce/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_roten/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_shelf/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_shmrgrd/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_smplbg/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_stair/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_swflat/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_swhammer/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_swheavy/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_swlight/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_swpush/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_table/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_tapestry/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_tenmado/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_tide/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_timer/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_tntrap/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_toripost/splits.txt | 2 +- .../GZLE01/rels/d_a_obj_tousekiki/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_tower/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_trap/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_tribox/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_try/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_usovmc/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_vfan/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_vgnfd/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_vmc/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_vmsdz/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_vmsms/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_volcano/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_vtil/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_vyasi/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_warpt/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_wood/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_xfuta/splits.txt | 2 +- config/GZLE01/rels/d_a_obj_zouK/splits.txt | 2 +- config/GZLE01/rels/d_a_oq/splits.txt | 2 +- config/GZLE01/rels/d_a_oship/splits.txt | 2 +- config/GZLE01/rels/d_a_pedestal/splits.txt | 2 +- config/GZLE01/rels/d_a_ph/splits.txt | 2 +- config/GZLE01/rels/d_a_pirate_flag/splits.txt | 2 +- config/GZLE01/rels/d_a_pt/splits.txt | 2 +- config/GZLE01/rels/d_a_pw/splits.txt | 2 +- config/GZLE01/rels/d_a_pz/splits.txt | 2 +- config/GZLE01/rels/d_a_race_item/splits.txt | 2 +- config/GZLE01/rels/d_a_rd/splits.txt | 2 +- config/GZLE01/rels/d_a_rectangle/splits.txt | 2 +- config/GZLE01/rels/d_a_sail/splits.txt | 2 +- config/GZLE01/rels/d_a_saku/splits.txt | 2 +- config/GZLE01/rels/d_a_salvage/splits.txt | 2 +- .../GZLE01/rels/d_a_salvage_tbox/splits.txt | 2 +- config/GZLE01/rels/d_a_sbox/splits.txt | 2 +- .../GZLE01/rels/d_a_scene_change/splits.txt | 2 +- config/GZLE01/rels/d_a_seatag/splits.txt | 2 +- config/GZLE01/rels/d_a_shand/splits.txt | 2 +- config/GZLE01/rels/d_a_ship/splits.txt | 2 +- config/GZLE01/rels/d_a_shop_item/splits.txt | 2 +- config/GZLE01/rels/d_a_shutter/splits.txt | 2 +- config/GZLE01/rels/d_a_shutter2/splits.txt | 2 +- config/GZLE01/rels/d_a_sie_flag/splits.txt | 2 +- config/GZLE01/rels/d_a_sitem/splits.txt | 2 +- config/GZLE01/rels/d_a_sk/splits.txt | 2 +- config/GZLE01/rels/d_a_sk2/splits.txt | 2 +- config/GZLE01/rels/d_a_spotbox/splits.txt | 2 +- config/GZLE01/rels/d_a_ss/splits.txt | 2 +- config/GZLE01/rels/d_a_ssk/splits.txt | 2 +- config/GZLE01/rels/d_a_sss/splits.txt | 2 +- config/GZLE01/rels/d_a_st/splits.txt | 2 +- config/GZLE01/rels/d_a_steam_tag/splits.txt | 2 +- config/GZLE01/rels/d_a_stone/splits.txt | 2 +- config/GZLE01/rels/d_a_stone2/splits.txt | 2 +- config/GZLE01/rels/d_a_swattack/splits.txt | 2 +- config/GZLE01/rels/d_a_swc00/splits.txt | 2 +- config/GZLE01/rels/d_a_swhit0/splits.txt | 2 +- config/GZLE01/rels/d_a_switem/splits.txt | 2 +- config/GZLE01/rels/d_a_swpropeller/splits.txt | 2 +- config/GZLE01/rels/d_a_swtact/splits.txt | 2 +- config/GZLE01/rels/d_a_swtdoor/splits.txt | 2 +- config/GZLE01/rels/d_a_syan/splits.txt | 2 +- .../GZLE01/rels/d_a_tag_attention/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_ba1/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_etc/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_event/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_evsw/splits.txt | 2 +- .../GZLE01/rels/d_a_tag_ghostship/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_hint/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_island/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_kb_item/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_kf1/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_kk1/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_light/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_md_cb/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_mk/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_msg/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_photo/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_ret/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_so/splits.txt | 2 +- config/GZLE01/rels/d_a_tag_volcano/splits.txt | 2 +- .../GZLE01/rels/d_a_tag_waterlevel/splits.txt | 2 +- config/GZLE01/rels/d_a_tama/splits.txt | 2 +- config/GZLE01/rels/d_a_tbox/splits.txt | 2 +- config/GZLE01/rels/d_a_title/splits.txt | 2 +- config/GZLE01/rels/d_a_tn/splits.txt | 2 +- config/GZLE01/rels/d_a_toge/splits.txt | 2 +- config/GZLE01/rels/d_a_tori_flag/splits.txt | 2 +- config/GZLE01/rels/d_a_tornado/splits.txt | 2 +- config/GZLE01/rels/d_a_tpota/splits.txt | 2 +- config/GZLE01/rels/d_a_tsubo/splits.txt | 2 +- config/GZLE01/rels/d_a_wall/splits.txt | 2 +- config/GZLE01/rels/d_a_warpdm20/splits.txt | 2 +- config/GZLE01/rels/d_a_warpf/splits.txt | 2 +- config/GZLE01/rels/d_a_warpfout/splits.txt | 2 +- config/GZLE01/rels/d_a_warpgn/splits.txt | 2 +- config/GZLE01/rels/d_a_warphr/splits.txt | 2 +- config/GZLE01/rels/d_a_warpls/splits.txt | 2 +- config/GZLE01/rels/d_a_warpmj/splits.txt | 2 +- config/GZLE01/rels/d_a_waterfall/splits.txt | 2 +- config/GZLE01/rels/d_a_wbird/splits.txt | 2 +- config/GZLE01/rels/d_a_wind_tag/splits.txt | 2 +- config/GZLE01/rels/d_a_windmill/splits.txt | 2 +- config/GZLE01/rels/d_a_wz/splits.txt | 2 +- config/GZLE01/rels/d_a_ygcwp/splits.txt | 2 +- config/GZLE01/rels/d_a_ykgr/splits.txt | 2 +- config/GZLE01/rels/d_a_yougan/splits.txt | 2 +- config/GZLE01/splits.txt | 196 +++++++++--------- config/GZLJ01/rels/d_a_acorn_leaf/splits.txt | 2 +- config/GZLJ01/rels/d_a_agbsw0/splits.txt | 2 +- config/GZLJ01/rels/d_a_alldie/splits.txt | 2 +- config/GZLJ01/rels/d_a_am/splits.txt | 2 +- config/GZLJ01/rels/d_a_am2/splits.txt | 2 +- config/GZLJ01/rels/d_a_amiprop/splits.txt | 2 +- config/GZLJ01/rels/d_a_andsw0/splits.txt | 2 +- config/GZLJ01/rels/d_a_andsw2/splits.txt | 2 +- .../GZLJ01/rels/d_a_arrow_iceeff/splits.txt | 2 +- .../GZLJ01/rels/d_a_arrow_lighteff/splits.txt | 2 +- config/GZLJ01/rels/d_a_atdoor/splits.txt | 2 +- config/GZLJ01/rels/d_a_att/splits.txt | 2 +- config/GZLJ01/rels/d_a_auction/splits.txt | 2 +- config/GZLJ01/rels/d_a_bb/splits.txt | 2 +- config/GZLJ01/rels/d_a_bdk/splits.txt | 2 +- config/GZLJ01/rels/d_a_bdkobj/splits.txt | 2 +- config/GZLJ01/rels/d_a_beam/splits.txt | 2 +- config/GZLJ01/rels/d_a_bflower/splits.txt | 2 +- config/GZLJ01/rels/d_a_bgn/splits.txt | 2 +- config/GZLJ01/rels/d_a_bgn2/splits.txt | 2 +- config/GZLJ01/rels/d_a_bgn3/splits.txt | 2 +- config/GZLJ01/rels/d_a_bigelf/splits.txt | 2 +- config/GZLJ01/rels/d_a_bita/splits.txt | 2 +- config/GZLJ01/rels/d_a_bk/splits.txt | 2 +- config/GZLJ01/rels/d_a_bl/splits.txt | 2 +- config/GZLJ01/rels/d_a_bmd/splits.txt | 2 +- config/GZLJ01/rels/d_a_bmdfoot/splits.txt | 2 +- config/GZLJ01/rels/d_a_bmdhand/splits.txt | 2 +- config/GZLJ01/rels/d_a_bo/splits.txt | 2 +- config/GZLJ01/rels/d_a_boko/splits.txt | 2 +- config/GZLJ01/rels/d_a_boss_item/splits.txt | 2 +- config/GZLJ01/rels/d_a_bpw/splits.txt | 2 +- config/GZLJ01/rels/d_a_branch/splits.txt | 2 +- config/GZLJ01/rels/d_a_bridge/splits.txt | 2 +- config/GZLJ01/rels/d_a_bst/splits.txt | 2 +- config/GZLJ01/rels/d_a_btd/splits.txt | 2 +- config/GZLJ01/rels/d_a_bwd/splits.txt | 2 +- config/GZLJ01/rels/d_a_bwdg/splits.txt | 2 +- config/GZLJ01/rels/d_a_bwds/splits.txt | 2 +- config/GZLJ01/rels/d_a_canon/splits.txt | 2 +- config/GZLJ01/rels/d_a_cc/splits.txt | 2 +- config/GZLJ01/rels/d_a_coming2/splits.txt | 2 +- config/GZLJ01/rels/d_a_coming3/splits.txt | 2 +- config/GZLJ01/rels/d_a_dai/splits.txt | 2 +- config/GZLJ01/rels/d_a_daiocta/splits.txt | 2 +- config/GZLJ01/rels/d_a_daiocta_eye/splits.txt | 2 +- config/GZLJ01/rels/d_a_deku_item/splits.txt | 2 +- config/GZLJ01/rels/d_a_demo_dk/splits.txt | 2 +- config/GZLJ01/rels/d_a_demo_item/splits.txt | 2 +- config/GZLJ01/rels/d_a_demo_kmm/splits.txt | 2 +- config/GZLJ01/rels/d_a_dk/splits.txt | 2 +- config/GZLJ01/rels/d_a_door10/splits.txt | 2 +- config/GZLJ01/rels/d_a_door12/splits.txt | 2 +- config/GZLJ01/rels/d_a_dr/splits.txt | 2 +- config/GZLJ01/rels/d_a_dr2/splits.txt | 2 +- config/GZLJ01/rels/d_a_dummy/splits.txt | 2 +- config/GZLJ01/rels/d_a_ep/splits.txt | 2 +- config/GZLJ01/rels/d_a_fallrock/splits.txt | 2 +- .../GZLJ01/rels/d_a_fallrock_tag/splits.txt | 2 +- config/GZLJ01/rels/d_a_fan/splits.txt | 2 +- config/GZLJ01/rels/d_a_ff/splits.txt | 2 +- config/GZLJ01/rels/d_a_fganon/splits.txt | 2 +- config/GZLJ01/rels/d_a_fgmahou/splits.txt | 2 +- config/GZLJ01/rels/d_a_fire/splits.txt | 2 +- config/GZLJ01/rels/d_a_floor/splits.txt | 2 +- config/GZLJ01/rels/d_a_fm/splits.txt | 2 +- config/GZLJ01/rels/d_a_ghostship/splits.txt | 2 +- config/GZLJ01/rels/d_a_gm/splits.txt | 2 +- config/GZLJ01/rels/d_a_gnd/splits.txt | 2 +- config/GZLJ01/rels/d_a_goal_flag/splits.txt | 2 +- config/GZLJ01/rels/d_a_grass/splits.txt | 2 +- config/GZLJ01/rels/d_a_gy/splits.txt | 2 +- config/GZLJ01/rels/d_a_gy_ctrl/splits.txt | 2 +- config/GZLJ01/rels/d_a_himo3/splits.txt | 2 +- config/GZLJ01/rels/d_a_hitobj/splits.txt | 2 +- config/GZLJ01/rels/d_a_hmlif/splits.txt | 2 +- config/GZLJ01/rels/d_a_hot_floor/splits.txt | 2 +- config/GZLJ01/rels/d_a_hys/splits.txt | 2 +- config/GZLJ01/rels/d_a_icelift/splits.txt | 2 +- config/GZLJ01/rels/d_a_ikari/splits.txt | 2 +- config/GZLJ01/rels/d_a_jbo/splits.txt | 2 +- config/GZLJ01/rels/d_a_kaji/splits.txt | 2 +- config/GZLJ01/rels/d_a_kamome/splits.txt | 2 +- config/GZLJ01/rels/d_a_kanban/splits.txt | 2 +- config/GZLJ01/rels/d_a_kantera/splits.txt | 2 +- config/GZLJ01/rels/d_a_kb/splits.txt | 2 +- config/GZLJ01/rels/d_a_kddoor/splits.txt | 2 +- config/GZLJ01/rels/d_a_ki/splits.txt | 2 +- config/GZLJ01/rels/d_a_kita/splits.txt | 2 +- config/GZLJ01/rels/d_a_klft/splits.txt | 2 +- config/GZLJ01/rels/d_a_kmon/splits.txt | 2 +- config/GZLJ01/rels/d_a_kn/splits.txt | 2 +- config/GZLJ01/rels/d_a_knob00/splits.txt | 2 +- config/GZLJ01/rels/d_a_kokiie/splits.txt | 2 +- config/GZLJ01/rels/d_a_komore/splits.txt | 2 +- config/GZLJ01/rels/d_a_ks/splits.txt | 2 +- config/GZLJ01/rels/d_a_kt/splits.txt | 2 +- config/GZLJ01/rels/d_a_kui/splits.txt | 2 +- config/GZLJ01/rels/d_a_kytag00/splits.txt | 2 +- config/GZLJ01/rels/d_a_kytag01/splits.txt | 2 +- config/GZLJ01/rels/d_a_kytag02/splits.txt | 2 +- config/GZLJ01/rels/d_a_kytag03/splits.txt | 2 +- config/GZLJ01/rels/d_a_kytag04/splits.txt | 2 +- config/GZLJ01/rels/d_a_kytag05/splits.txt | 2 +- config/GZLJ01/rels/d_a_kytag06/splits.txt | 2 +- config/GZLJ01/rels/d_a_kytag07/splits.txt | 2 +- config/GZLJ01/rels/d_a_lamp/splits.txt | 2 +- config/GZLJ01/rels/d_a_lbridge/splits.txt | 2 +- config/GZLJ01/rels/d_a_leaflift/splits.txt | 2 +- config/GZLJ01/rels/d_a_lod_bg/splits.txt | 2 +- config/GZLJ01/rels/d_a_lstair/splits.txt | 2 +- config/GZLJ01/rels/d_a_lwood/splits.txt | 2 +- config/GZLJ01/rels/d_a_machine/splits.txt | 2 +- config/GZLJ01/rels/d_a_magma/splits.txt | 2 +- config/GZLJ01/rels/d_a_majuu_flag/splits.txt | 2 +- config/GZLJ01/rels/d_a_mant/splits.txt | 2 +- config/GZLJ01/rels/d_a_mbdoor/splits.txt | 2 +- config/GZLJ01/rels/d_a_mdoor/splits.txt | 2 +- config/GZLJ01/rels/d_a_mflft/splits.txt | 2 +- config/GZLJ01/rels/d_a_mgameboard/splits.txt | 2 +- config/GZLJ01/rels/d_a_mmusic/splits.txt | 2 +- config/GZLJ01/rels/d_a_mo2/splits.txt | 2 +- .../GZLJ01/rels/d_a_movie_player/splits.txt | 2 +- config/GZLJ01/rels/d_a_mozo/splits.txt | 2 +- config/GZLJ01/rels/d_a_msw/splits.txt | 2 +- config/GZLJ01/rels/d_a_mt/splits.txt | 2 +- config/GZLJ01/rels/d_a_mtoge/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_ac1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_ah/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_aj1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_auction/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_ba1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_bj1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_bm1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_bmcon1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_bms1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_bmsw/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_bs1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_btsw/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_btsw2/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_cb1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_co1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_de1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_ds1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_gk1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_gp1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_hi1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_ho/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_hr/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_jb1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_ji1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_kamome/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_kf1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_kg1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_kg2/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_kk1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_km1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_ko1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_kp1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_ls1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_md/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_mk/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_mn/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_mt/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_nz/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_ob1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_os/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_p1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_p2/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_people/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_pf1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_photo/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_pm1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_roten/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_rsh1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_sarace/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_so/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_sv/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_tc/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_tt/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_uk/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_ym1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_yw1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_zk1/splits.txt | 2 +- config/GZLJ01/rels/d_a_npc_zl1/splits.txt | 2 +- config/GZLJ01/rels/d_a_nz/splits.txt | 2 +- config/GZLJ01/rels/d_a_nzg/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_AjavW/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_Itnak/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_Vds/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_Vteng/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_YLzou/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_Yboil/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_Ygush00/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_adnno/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ajav/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_akabe/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_apzl/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ashut/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_auzu/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_aygr/splits.txt | 2 +- .../rels/d_a_obj_balancelift/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_barrel/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_barrel2/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_barrier/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_bemos/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_bscurtain/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_buoyflag/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_buoyrace/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_cafelmp/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_canon/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_coming/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_correct/splits.txt | 2 +- .../rels/d_a_obj_demo_barrel/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_dmgroom/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_doguu/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_doguu_demo/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_dragonhead/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_drift/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_eayogn/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ebomzo/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_eff/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ekskz/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_eskban/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ferris/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_figure/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_firewall/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_flame/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ftree/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_ganonbed/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_gaship/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_gaship2/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_gnnbtltaki/splits.txt | 2 +- .../rels/d_a_obj_gnndemotakie/splits.txt | 2 +- .../rels/d_a_obj_gnndemotakis/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_gong/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_gryw00/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_gtaki/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hami2/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hami3/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hami4/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hat/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hbrf1/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hcbh/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hfuck1/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hha/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hlift/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hole/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_homen/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_homensmoke/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_hsehi1/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_htetu1/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ice/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_iceisland/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ikada/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_jump/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_kanat/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_kanoke/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ladder/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_leaves/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_light/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_lpalm/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_magmarock/splits.txt | 2 +- .../rels/d_a_obj_majyuu_door/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_mkie/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_mkiek/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_mknjd/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_mmrr/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_monument/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_movebox/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_msdan/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_msdan2/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_msdan_sub/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_msdan_sub2/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_mshokki/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_mtest/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_nest/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ohatch/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ojtree/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_ospbox/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_otble/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_paper/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_pbco/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_pbka/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_pfall/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_pirateship/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_plant/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_quake/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_rcloud/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_rflw/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_rforce/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_roten/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_shelf/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_shmrgrd/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_smplbg/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_stair/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_swflat/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_swhammer/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_swheavy/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_swlight/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_swpush/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_table/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_tapestry/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_tenmado/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_tide/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_timer/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_tntrap/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_toripost/splits.txt | 2 +- .../GZLJ01/rels/d_a_obj_tousekiki/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_tower/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_trap/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_tribox/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_try/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_usovmc/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_vfan/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_vgnfd/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_vmc/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_vmsdz/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_vmsms/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_volcano/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_vtil/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_vyasi/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_warpt/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_wood/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_xfuta/splits.txt | 2 +- config/GZLJ01/rels/d_a_obj_zouK/splits.txt | 2 +- config/GZLJ01/rels/d_a_oq/splits.txt | 2 +- config/GZLJ01/rels/d_a_oship/splits.txt | 2 +- config/GZLJ01/rels/d_a_pedestal/splits.txt | 2 +- config/GZLJ01/rels/d_a_ph/splits.txt | 2 +- config/GZLJ01/rels/d_a_pirate_flag/splits.txt | 2 +- config/GZLJ01/rels/d_a_pt/splits.txt | 2 +- config/GZLJ01/rels/d_a_pw/splits.txt | 2 +- config/GZLJ01/rels/d_a_pz/splits.txt | 2 +- config/GZLJ01/rels/d_a_race_item/splits.txt | 2 +- config/GZLJ01/rels/d_a_rd/splits.txt | 2 +- config/GZLJ01/rels/d_a_rectangle/splits.txt | 2 +- config/GZLJ01/rels/d_a_sail/splits.txt | 2 +- config/GZLJ01/rels/d_a_saku/splits.txt | 2 +- config/GZLJ01/rels/d_a_salvage/splits.txt | 2 +- .../GZLJ01/rels/d_a_salvage_tbox/splits.txt | 2 +- config/GZLJ01/rels/d_a_sbox/splits.txt | 2 +- .../GZLJ01/rels/d_a_scene_change/splits.txt | 2 +- config/GZLJ01/rels/d_a_seatag/splits.txt | 2 +- config/GZLJ01/rels/d_a_shand/splits.txt | 2 +- config/GZLJ01/rels/d_a_ship/splits.txt | 2 +- config/GZLJ01/rels/d_a_shop_item/splits.txt | 2 +- config/GZLJ01/rels/d_a_shutter/splits.txt | 2 +- config/GZLJ01/rels/d_a_shutter2/splits.txt | 2 +- config/GZLJ01/rels/d_a_sie_flag/splits.txt | 2 +- config/GZLJ01/rels/d_a_sitem/splits.txt | 2 +- config/GZLJ01/rels/d_a_sk/splits.txt | 2 +- config/GZLJ01/rels/d_a_sk2/splits.txt | 2 +- config/GZLJ01/rels/d_a_spotbox/splits.txt | 2 +- config/GZLJ01/rels/d_a_ss/splits.txt | 2 +- config/GZLJ01/rels/d_a_ssk/splits.txt | 2 +- config/GZLJ01/rels/d_a_sss/splits.txt | 2 +- config/GZLJ01/rels/d_a_st/splits.txt | 2 +- config/GZLJ01/rels/d_a_steam_tag/splits.txt | 2 +- config/GZLJ01/rels/d_a_stone/splits.txt | 2 +- config/GZLJ01/rels/d_a_stone2/splits.txt | 2 +- config/GZLJ01/rels/d_a_swattack/splits.txt | 2 +- config/GZLJ01/rels/d_a_swc00/splits.txt | 2 +- config/GZLJ01/rels/d_a_swhit0/splits.txt | 2 +- config/GZLJ01/rels/d_a_switem/splits.txt | 2 +- config/GZLJ01/rels/d_a_swpropeller/splits.txt | 2 +- config/GZLJ01/rels/d_a_swtact/splits.txt | 2 +- config/GZLJ01/rels/d_a_swtdoor/splits.txt | 2 +- config/GZLJ01/rels/d_a_syan/splits.txt | 2 +- .../GZLJ01/rels/d_a_tag_attention/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_ba1/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_etc/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_event/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_evsw/splits.txt | 2 +- .../GZLJ01/rels/d_a_tag_ghostship/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_hint/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_island/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_kb_item/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_kf1/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_kk1/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_light/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_md_cb/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_mk/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_msg/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_photo/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_ret/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_so/splits.txt | 2 +- config/GZLJ01/rels/d_a_tag_volcano/splits.txt | 2 +- .../GZLJ01/rels/d_a_tag_waterlevel/splits.txt | 2 +- config/GZLJ01/rels/d_a_tama/splits.txt | 2 +- config/GZLJ01/rels/d_a_tbox/splits.txt | 2 +- config/GZLJ01/rels/d_a_title/splits.txt | 2 +- config/GZLJ01/rels/d_a_tn/splits.txt | 2 +- config/GZLJ01/rels/d_a_toge/splits.txt | 2 +- config/GZLJ01/rels/d_a_tori_flag/splits.txt | 2 +- config/GZLJ01/rels/d_a_tornado/splits.txt | 2 +- config/GZLJ01/rels/d_a_tpota/splits.txt | 2 +- config/GZLJ01/rels/d_a_tsubo/splits.txt | 2 +- config/GZLJ01/rels/d_a_wall/splits.txt | 2 +- config/GZLJ01/rels/d_a_warpdm20/splits.txt | 2 +- config/GZLJ01/rels/d_a_warpf/splits.txt | 2 +- config/GZLJ01/rels/d_a_warpfout/splits.txt | 2 +- config/GZLJ01/rels/d_a_warpgn/splits.txt | 2 +- config/GZLJ01/rels/d_a_warphr/splits.txt | 2 +- config/GZLJ01/rels/d_a_warpls/splits.txt | 2 +- config/GZLJ01/rels/d_a_warpmj/splits.txt | 2 +- config/GZLJ01/rels/d_a_waterfall/splits.txt | 2 +- config/GZLJ01/rels/d_a_wbird/splits.txt | 2 +- config/GZLJ01/rels/d_a_wind_tag/splits.txt | 2 +- config/GZLJ01/rels/d_a_windmill/splits.txt | 2 +- config/GZLJ01/rels/d_a_wz/splits.txt | 2 +- config/GZLJ01/rels/d_a_ygcwp/splits.txt | 2 +- config/GZLJ01/rels/d_a_ykgr/splits.txt | 2 +- config/GZLJ01/rels/d_a_yougan/splits.txt | 2 +- config/GZLJ01/splits.txt | 196 +++++++++--------- config/GZLP01/rels/d_a_acorn_leaf/splits.txt | 2 +- config/GZLP01/rels/d_a_agbsw0/splits.txt | 2 +- config/GZLP01/rels/d_a_alldie/splits.txt | 2 +- config/GZLP01/rels/d_a_am/splits.txt | 2 +- config/GZLP01/rels/d_a_am2/splits.txt | 2 +- config/GZLP01/rels/d_a_amiprop/splits.txt | 2 +- config/GZLP01/rels/d_a_andsw0/splits.txt | 2 +- config/GZLP01/rels/d_a_andsw2/splits.txt | 2 +- .../GZLP01/rels/d_a_arrow_iceeff/splits.txt | 2 +- .../GZLP01/rels/d_a_arrow_lighteff/splits.txt | 2 +- config/GZLP01/rels/d_a_atdoor/splits.txt | 2 +- config/GZLP01/rels/d_a_att/splits.txt | 2 +- config/GZLP01/rels/d_a_auction/splits.txt | 2 +- config/GZLP01/rels/d_a_bb/splits.txt | 2 +- config/GZLP01/rels/d_a_bdk/splits.txt | 2 +- config/GZLP01/rels/d_a_bdkobj/splits.txt | 2 +- config/GZLP01/rels/d_a_beam/splits.txt | 2 +- config/GZLP01/rels/d_a_bflower/splits.txt | 2 +- config/GZLP01/rels/d_a_bgn/splits.txt | 2 +- config/GZLP01/rels/d_a_bgn2/splits.txt | 2 +- config/GZLP01/rels/d_a_bgn3/splits.txt | 2 +- config/GZLP01/rels/d_a_bigelf/splits.txt | 2 +- config/GZLP01/rels/d_a_bita/splits.txt | 2 +- config/GZLP01/rels/d_a_bk/splits.txt | 2 +- config/GZLP01/rels/d_a_bl/splits.txt | 2 +- config/GZLP01/rels/d_a_bmd/splits.txt | 2 +- config/GZLP01/rels/d_a_bmdfoot/splits.txt | 2 +- config/GZLP01/rels/d_a_bmdhand/splits.txt | 2 +- config/GZLP01/rels/d_a_bo/splits.txt | 2 +- config/GZLP01/rels/d_a_boko/splits.txt | 2 +- config/GZLP01/rels/d_a_boss_item/splits.txt | 2 +- config/GZLP01/rels/d_a_bpw/splits.txt | 2 +- config/GZLP01/rels/d_a_branch/splits.txt | 2 +- config/GZLP01/rels/d_a_bridge/splits.txt | 2 +- config/GZLP01/rels/d_a_bst/splits.txt | 2 +- config/GZLP01/rels/d_a_btd/splits.txt | 2 +- config/GZLP01/rels/d_a_bwd/splits.txt | 2 +- config/GZLP01/rels/d_a_bwdg/splits.txt | 2 +- config/GZLP01/rels/d_a_bwds/splits.txt | 2 +- config/GZLP01/rels/d_a_canon/splits.txt | 2 +- config/GZLP01/rels/d_a_cc/splits.txt | 2 +- config/GZLP01/rels/d_a_coming2/splits.txt | 2 +- config/GZLP01/rels/d_a_coming3/splits.txt | 2 +- config/GZLP01/rels/d_a_dai/splits.txt | 2 +- config/GZLP01/rels/d_a_daiocta/splits.txt | 2 +- config/GZLP01/rels/d_a_daiocta_eye/splits.txt | 2 +- config/GZLP01/rels/d_a_deku_item/splits.txt | 2 +- config/GZLP01/rels/d_a_demo_dk/splits.txt | 2 +- config/GZLP01/rels/d_a_demo_item/splits.txt | 2 +- config/GZLP01/rels/d_a_demo_kmm/splits.txt | 2 +- config/GZLP01/rels/d_a_dk/splits.txt | 2 +- config/GZLP01/rels/d_a_door10/splits.txt | 2 +- config/GZLP01/rels/d_a_door12/splits.txt | 2 +- config/GZLP01/rels/d_a_dr/splits.txt | 2 +- config/GZLP01/rels/d_a_dr2/splits.txt | 2 +- config/GZLP01/rels/d_a_dummy/splits.txt | 2 +- config/GZLP01/rels/d_a_ep/splits.txt | 2 +- config/GZLP01/rels/d_a_fallrock/splits.txt | 2 +- .../GZLP01/rels/d_a_fallrock_tag/splits.txt | 2 +- config/GZLP01/rels/d_a_fan/splits.txt | 2 +- config/GZLP01/rels/d_a_ff/splits.txt | 2 +- config/GZLP01/rels/d_a_fganon/splits.txt | 2 +- config/GZLP01/rels/d_a_fgmahou/splits.txt | 2 +- config/GZLP01/rels/d_a_fire/splits.txt | 2 +- config/GZLP01/rels/d_a_floor/splits.txt | 2 +- config/GZLP01/rels/d_a_fm/splits.txt | 2 +- config/GZLP01/rels/d_a_ghostship/splits.txt | 2 +- config/GZLP01/rels/d_a_gm/splits.txt | 2 +- config/GZLP01/rels/d_a_gnd/splits.txt | 2 +- config/GZLP01/rels/d_a_goal_flag/splits.txt | 2 +- config/GZLP01/rels/d_a_grass/splits.txt | 2 +- config/GZLP01/rels/d_a_gy/splits.txt | 2 +- config/GZLP01/rels/d_a_gy_ctrl/splits.txt | 2 +- config/GZLP01/rels/d_a_himo3/splits.txt | 2 +- config/GZLP01/rels/d_a_hitobj/splits.txt | 2 +- config/GZLP01/rels/d_a_hmlif/splits.txt | 2 +- config/GZLP01/rels/d_a_hot_floor/splits.txt | 2 +- config/GZLP01/rels/d_a_hys/splits.txt | 2 +- config/GZLP01/rels/d_a_icelift/splits.txt | 2 +- config/GZLP01/rels/d_a_ikari/splits.txt | 2 +- config/GZLP01/rels/d_a_jbo/splits.txt | 2 +- config/GZLP01/rels/d_a_kaji/splits.txt | 2 +- config/GZLP01/rels/d_a_kamome/splits.txt | 2 +- config/GZLP01/rels/d_a_kanban/splits.txt | 2 +- config/GZLP01/rels/d_a_kantera/splits.txt | 2 +- config/GZLP01/rels/d_a_kb/splits.txt | 2 +- config/GZLP01/rels/d_a_kddoor/splits.txt | 2 +- config/GZLP01/rels/d_a_ki/splits.txt | 2 +- config/GZLP01/rels/d_a_kita/splits.txt | 2 +- config/GZLP01/rels/d_a_klft/splits.txt | 2 +- config/GZLP01/rels/d_a_kmon/splits.txt | 2 +- config/GZLP01/rels/d_a_kn/splits.txt | 2 +- config/GZLP01/rels/d_a_knob00/splits.txt | 2 +- config/GZLP01/rels/d_a_kokiie/splits.txt | 2 +- config/GZLP01/rels/d_a_komore/splits.txt | 2 +- config/GZLP01/rels/d_a_ks/splits.txt | 2 +- config/GZLP01/rels/d_a_kt/splits.txt | 2 +- config/GZLP01/rels/d_a_kui/splits.txt | 2 +- config/GZLP01/rels/d_a_kytag00/splits.txt | 2 +- config/GZLP01/rels/d_a_kytag01/splits.txt | 2 +- config/GZLP01/rels/d_a_kytag02/splits.txt | 2 +- config/GZLP01/rels/d_a_kytag03/splits.txt | 2 +- config/GZLP01/rels/d_a_kytag04/splits.txt | 2 +- config/GZLP01/rels/d_a_kytag05/splits.txt | 2 +- config/GZLP01/rels/d_a_kytag06/splits.txt | 2 +- config/GZLP01/rels/d_a_kytag07/splits.txt | 2 +- config/GZLP01/rels/d_a_lamp/splits.txt | 2 +- config/GZLP01/rels/d_a_lbridge/splits.txt | 2 +- config/GZLP01/rels/d_a_leaflift/splits.txt | 2 +- config/GZLP01/rels/d_a_lod_bg/splits.txt | 2 +- config/GZLP01/rels/d_a_lstair/splits.txt | 2 +- config/GZLP01/rels/d_a_lwood/splits.txt | 2 +- config/GZLP01/rels/d_a_machine/splits.txt | 2 +- config/GZLP01/rels/d_a_magma/splits.txt | 2 +- config/GZLP01/rels/d_a_majuu_flag/splits.txt | 2 +- config/GZLP01/rels/d_a_mant/splits.txt | 2 +- config/GZLP01/rels/d_a_mbdoor/splits.txt | 2 +- config/GZLP01/rels/d_a_mdoor/splits.txt | 2 +- config/GZLP01/rels/d_a_mflft/splits.txt | 2 +- config/GZLP01/rels/d_a_mgameboard/splits.txt | 2 +- config/GZLP01/rels/d_a_mmusic/splits.txt | 2 +- config/GZLP01/rels/d_a_mo2/splits.txt | 2 +- .../GZLP01/rels/d_a_movie_player/splits.txt | 2 +- config/GZLP01/rels/d_a_mozo/splits.txt | 2 +- config/GZLP01/rels/d_a_msw/splits.txt | 2 +- config/GZLP01/rels/d_a_mt/splits.txt | 2 +- config/GZLP01/rels/d_a_mtoge/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_ac1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_ah/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_aj1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_auction/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_ba1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_bj1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_bm1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_bmcon1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_bms1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_bmsw/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_bs1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_btsw/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_btsw2/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_cb1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_co1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_de1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_ds1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_gk1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_gp1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_hi1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_ho/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_hr/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_jb1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_ji1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_kamome/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_kf1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_kg1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_kg2/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_kk1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_km1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_ko1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_kp1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_ls1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_md/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_mk/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_mn/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_mt/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_nz/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_ob1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_os/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_p1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_p2/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_people/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_pf1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_photo/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_pm1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_roten/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_rsh1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_sarace/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_so/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_sv/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_tc/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_tt/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_uk/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_ym1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_yw1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_zk1/splits.txt | 2 +- config/GZLP01/rels/d_a_npc_zl1/splits.txt | 2 +- config/GZLP01/rels/d_a_nz/splits.txt | 2 +- config/GZLP01/rels/d_a_nzg/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_AjavW/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_Itnak/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_Vds/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_Vteng/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_YLzou/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_Yboil/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_Ygush00/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_adnno/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ajav/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_akabe/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_apzl/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ashut/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_auzu/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_aygr/splits.txt | 2 +- .../rels/d_a_obj_balancelift/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_barrel/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_barrel2/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_barrier/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_bemos/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_bscurtain/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_buoyflag/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_buoyrace/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_cafelmp/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_canon/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_coming/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_correct/splits.txt | 2 +- .../rels/d_a_obj_demo_barrel/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_dmgroom/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_doguu/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_doguu_demo/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_dragonhead/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_drift/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_eayogn/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ebomzo/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_eff/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ekskz/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_eskban/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ferris/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_figure/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_firewall/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_flame/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ftree/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_ganonbed/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_gaship/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_gaship2/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_gnnbtltaki/splits.txt | 2 +- .../rels/d_a_obj_gnndemotakie/splits.txt | 2 +- .../rels/d_a_obj_gnndemotakis/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_gong/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_gryw00/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_gtaki/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hami2/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hami3/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hami4/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hat/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hbrf1/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hcbh/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hfuck1/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hha/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hlift/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hole/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_homen/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_homensmoke/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_hsehi1/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_htetu1/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ice/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_iceisland/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ikada/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_jump/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_kanat/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_kanoke/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ladder/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_leaves/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_light/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_lpalm/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_magmarock/splits.txt | 2 +- .../rels/d_a_obj_majyuu_door/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_mkie/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_mkiek/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_mknjd/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_mmrr/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_monument/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_movebox/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_msdan/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_msdan2/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_msdan_sub/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_msdan_sub2/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_mshokki/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_mtest/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_nest/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ohatch/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ojtree/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_ospbox/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_otble/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_paper/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_pbco/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_pbka/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_pfall/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_pirateship/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_plant/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_quake/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_rcloud/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_rflw/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_rforce/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_roten/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_shelf/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_shmrgrd/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_smplbg/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_stair/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_swflat/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_swhammer/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_swheavy/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_swlight/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_swpush/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_table/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_tapestry/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_tenmado/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_tide/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_timer/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_tntrap/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_toripost/splits.txt | 2 +- .../GZLP01/rels/d_a_obj_tousekiki/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_tower/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_trap/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_tribox/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_try/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_usovmc/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_vfan/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_vgnfd/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_vmc/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_vmsdz/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_vmsms/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_volcano/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_vtil/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_vyasi/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_warpt/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_wood/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_xfuta/splits.txt | 2 +- config/GZLP01/rels/d_a_obj_zouK/splits.txt | 2 +- config/GZLP01/rels/d_a_oq/splits.txt | 2 +- config/GZLP01/rels/d_a_oship/splits.txt | 2 +- config/GZLP01/rels/d_a_pedestal/splits.txt | 2 +- config/GZLP01/rels/d_a_ph/splits.txt | 2 +- config/GZLP01/rels/d_a_pirate_flag/splits.txt | 2 +- config/GZLP01/rels/d_a_pt/splits.txt | 2 +- config/GZLP01/rels/d_a_pw/splits.txt | 2 +- config/GZLP01/rels/d_a_pz/splits.txt | 2 +- config/GZLP01/rels/d_a_race_item/splits.txt | 2 +- config/GZLP01/rels/d_a_rd/splits.txt | 2 +- config/GZLP01/rels/d_a_rectangle/splits.txt | 2 +- config/GZLP01/rels/d_a_sail/splits.txt | 2 +- config/GZLP01/rels/d_a_saku/splits.txt | 2 +- config/GZLP01/rels/d_a_salvage/splits.txt | 2 +- .../GZLP01/rels/d_a_salvage_tbox/splits.txt | 2 +- config/GZLP01/rels/d_a_sbox/splits.txt | 2 +- .../GZLP01/rels/d_a_scene_change/splits.txt | 2 +- config/GZLP01/rels/d_a_seatag/splits.txt | 2 +- config/GZLP01/rels/d_a_shand/splits.txt | 2 +- config/GZLP01/rels/d_a_ship/splits.txt | 2 +- config/GZLP01/rels/d_a_shop_item/splits.txt | 2 +- config/GZLP01/rels/d_a_shutter/splits.txt | 2 +- config/GZLP01/rels/d_a_shutter2/splits.txt | 2 +- config/GZLP01/rels/d_a_sie_flag/splits.txt | 2 +- config/GZLP01/rels/d_a_sitem/splits.txt | 2 +- config/GZLP01/rels/d_a_sk/splits.txt | 2 +- config/GZLP01/rels/d_a_sk2/splits.txt | 2 +- config/GZLP01/rels/d_a_spotbox/splits.txt | 2 +- config/GZLP01/rels/d_a_ss/splits.txt | 2 +- config/GZLP01/rels/d_a_ssk/splits.txt | 2 +- config/GZLP01/rels/d_a_sss/splits.txt | 2 +- config/GZLP01/rels/d_a_st/splits.txt | 2 +- config/GZLP01/rels/d_a_steam_tag/splits.txt | 2 +- config/GZLP01/rels/d_a_stone/splits.txt | 2 +- config/GZLP01/rels/d_a_stone2/splits.txt | 2 +- config/GZLP01/rels/d_a_swattack/splits.txt | 2 +- config/GZLP01/rels/d_a_swc00/splits.txt | 2 +- config/GZLP01/rels/d_a_swhit0/splits.txt | 2 +- config/GZLP01/rels/d_a_switem/splits.txt | 2 +- config/GZLP01/rels/d_a_swpropeller/splits.txt | 2 +- config/GZLP01/rels/d_a_swtact/splits.txt | 2 +- config/GZLP01/rels/d_a_swtdoor/splits.txt | 2 +- config/GZLP01/rels/d_a_syan/splits.txt | 2 +- .../GZLP01/rels/d_a_tag_attention/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_ba1/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_etc/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_event/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_evsw/splits.txt | 2 +- .../GZLP01/rels/d_a_tag_ghostship/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_hint/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_island/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_kb_item/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_kf1/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_kk1/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_light/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_md_cb/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_mk/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_msg/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_photo/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_ret/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_so/splits.txt | 2 +- config/GZLP01/rels/d_a_tag_volcano/splits.txt | 2 +- .../GZLP01/rels/d_a_tag_waterlevel/splits.txt | 2 +- config/GZLP01/rels/d_a_tama/splits.txt | 2 +- config/GZLP01/rels/d_a_tbox/splits.txt | 2 +- config/GZLP01/rels/d_a_title/splits.txt | 2 +- config/GZLP01/rels/d_a_tn/splits.txt | 2 +- config/GZLP01/rels/d_a_toge/splits.txt | 2 +- config/GZLP01/rels/d_a_tori_flag/splits.txt | 2 +- config/GZLP01/rels/d_a_tornado/splits.txt | 2 +- config/GZLP01/rels/d_a_tpota/splits.txt | 2 +- config/GZLP01/rels/d_a_tsubo/splits.txt | 2 +- config/GZLP01/rels/d_a_wall/splits.txt | 2 +- config/GZLP01/rels/d_a_warpdm20/splits.txt | 2 +- config/GZLP01/rels/d_a_warpf/splits.txt | 2 +- config/GZLP01/rels/d_a_warpfout/splits.txt | 2 +- config/GZLP01/rels/d_a_warpgn/splits.txt | 2 +- config/GZLP01/rels/d_a_warphr/splits.txt | 2 +- config/GZLP01/rels/d_a_warpls/splits.txt | 2 +- config/GZLP01/rels/d_a_warpmj/splits.txt | 2 +- config/GZLP01/rels/d_a_waterfall/splits.txt | 2 +- config/GZLP01/rels/d_a_wbird/splits.txt | 2 +- config/GZLP01/rels/d_a_wind_tag/splits.txt | 2 +- config/GZLP01/rels/d_a_windmill/splits.txt | 2 +- config/GZLP01/rels/d_a_wz/splits.txt | 2 +- config/GZLP01/rels/d_a_ygcwp/splits.txt | 2 +- config/GZLP01/rels/d_a_ykgr/splits.txt | 2 +- config/GZLP01/rels/d_a_yougan/splits.txt | 2 +- config/GZLP01/splits.txt | 196 +++++++++--------- src/d/{a => actor}/d_a_acorn_leaf.cpp | 0 src/d/{a => actor}/d_a_agb.cpp | 0 src/d/{a => actor}/d_a_agbsw0.cpp | 0 src/d/{a => actor}/d_a_alldie.cpp | 0 src/d/{a => actor}/d_a_am.cpp | 0 src/d/{a => actor}/d_a_am2.cpp | 0 src/d/{a => actor}/d_a_amiprop.cpp | 0 src/d/{a => actor}/d_a_andsw0.cpp | 0 src/d/{a => actor}/d_a_andsw2.cpp | 0 src/d/{a => actor}/d_a_arrow.cpp | 0 src/d/{a => actor}/d_a_arrow_iceeff.cpp | 0 src/d/{a => actor}/d_a_arrow_lighteff.cpp | 0 src/d/{a => actor}/d_a_atdoor.cpp | 0 src/d/{a => actor}/d_a_att.cpp | 0 src/d/{a => actor}/d_a_auction.cpp | 0 src/d/{a => actor}/d_a_bb.cpp | 0 src/d/{a => actor}/d_a_bdk.cpp | 0 src/d/{a => actor}/d_a_bdkobj.cpp | 0 src/d/{a => actor}/d_a_beam.cpp | 0 src/d/{a => actor}/d_a_bflower.cpp | 0 src/d/{a => actor}/d_a_bg.cpp | 0 src/d/{a => actor}/d_a_bgn.cpp | 0 src/d/{a => actor}/d_a_bgn2.cpp | 0 src/d/{a => actor}/d_a_bgn3.cpp | 0 src/d/{a => actor}/d_a_bigelf.cpp | 0 src/d/{a => actor}/d_a_bita.cpp | 0 src/d/{a => actor}/d_a_bk.cpp | 0 src/d/{a => actor}/d_a_bl.cpp | 0 src/d/{a => actor}/d_a_bmd.cpp | 0 src/d/{a => actor}/d_a_bmdfoot.cpp | 0 src/d/{a => actor}/d_a_bmdhand.cpp | 0 src/d/{a => actor}/d_a_bo.cpp | 0 src/d/{a => actor}/d_a_boko.cpp | 0 src/d/{a => actor}/d_a_boko_static.cpp | 0 src/d/{a => actor}/d_a_bomb.cpp | 0 src/d/{a => actor}/d_a_bomb2.cpp | 0 src/d/{a => actor}/d_a_bomb_static.cpp | 0 src/d/{a => actor}/d_a_boomerang.cpp | 0 src/d/{a => actor}/d_a_boss_item.cpp | 0 src/d/{a => actor}/d_a_bpw.cpp | 0 src/d/{a => actor}/d_a_branch.cpp | 0 src/d/{a => actor}/d_a_branch_static.cpp | 0 src/d/{a => actor}/d_a_bridge.cpp | 0 src/d/{a => actor}/d_a_bst.cpp | 0 src/d/{a => actor}/d_a_btd.cpp | 0 src/d/{a => actor}/d_a_bwd.cpp | 0 src/d/{a => actor}/d_a_bwdg.cpp | 0 src/d/{a => actor}/d_a_bwds.cpp | 0 src/d/{a => actor}/d_a_canon.cpp | 0 src/d/{a => actor}/d_a_cc.cpp | 0 src/d/{a => actor}/d_a_coming2.cpp | 0 src/d/{a => actor}/d_a_coming3.cpp | 0 src/d/{a => actor}/d_a_dai.cpp | 0 src/d/{a => actor}/d_a_dai_item.cpp | 0 src/d/{a => actor}/d_a_daiocta.cpp | 0 src/d/{a => actor}/d_a_daiocta_eye.cpp | 0 src/d/{a => actor}/d_a_deku_item.cpp | 0 src/d/{a => actor}/d_a_demo00.cpp | 0 src/d/{a => actor}/d_a_demo_dk.cpp | 0 src/d/{a => actor}/d_a_demo_item.cpp | 0 src/d/{a => actor}/d_a_demo_kmm.cpp | 0 src/d/{a => actor}/d_a_disappear.cpp | 0 src/d/{a => actor}/d_a_dk.cpp | 0 src/d/{a => actor}/d_a_door10.cpp | 0 src/d/{a => actor}/d_a_door12.cpp | 0 src/d/{a => actor}/d_a_dr.cpp | 0 src/d/{a => actor}/d_a_dr2.cpp | 0 src/d/{a => actor}/d_a_dummy.cpp | 0 src/d/{a => actor}/d_a_ep.cpp | 0 src/d/{a => actor}/d_a_esa.cpp | 0 src/d/{a => actor}/d_a_fallrock.cpp | 0 src/d/{a => actor}/d_a_fallrock_tag.cpp | 0 src/d/{a => actor}/d_a_fan.cpp | 0 src/d/{a => actor}/d_a_ff.cpp | 0 src/d/{a => actor}/d_a_fganon.cpp | 0 src/d/{a => actor}/d_a_fgmahou.cpp | 0 src/d/{a => actor}/d_a_fire.cpp | 0 src/d/{a => actor}/d_a_floor.cpp | 0 src/d/{a => actor}/d_a_fm.cpp | 0 src/d/{a => actor}/d_a_ghostship.cpp | 0 src/d/{a => actor}/d_a_gm.cpp | 0 src/d/{a => actor}/d_a_gnd.cpp | 0 src/d/{a => actor}/d_a_goal_flag.cpp | 0 src/d/{a => actor}/d_a_grass.cpp | 0 src/d/{a => actor}/d_a_grid.cpp | 0 src/d/{a => actor}/d_a_gy.cpp | 0 src/d/{a => actor}/d_a_gy_ctrl.cpp | 0 src/d/{a => actor}/d_a_himo2.cpp | 0 src/d/{a => actor}/d_a_himo3.cpp | 0 src/d/{a => actor}/d_a_hitobj.cpp | 0 src/d/{a => actor}/d_a_hmlif.cpp | 0 src/d/{a => actor}/d_a_hookshot.cpp | 0 src/d/{a => actor}/d_a_hot_floor.cpp | 0 src/d/{a => actor}/d_a_hys.cpp | 0 src/d/{a => actor}/d_a_ib.cpp | 0 src/d/{a => actor}/d_a_icelift.cpp | 0 src/d/{a => actor}/d_a_ikari.cpp | 0 src/d/{a => actor}/d_a_item.cpp | 0 src/d/{a => actor}/d_a_item_static.cpp | 0 src/d/{a => actor}/d_a_itembase.cpp | 0 src/d/{a => actor}/d_a_itembase_static.cpp | 0 src/d/{a => actor}/d_a_jbo.cpp | 0 src/d/{a => actor}/d_a_kaji.cpp | 0 src/d/{a => actor}/d_a_kamome.cpp | 0 src/d/{a => actor}/d_a_kanban.cpp | 0 src/d/{a => actor}/d_a_kantera.cpp | 0 src/d/{a => actor}/d_a_kb.cpp | 0 src/d/{a => actor}/d_a_kddoor.cpp | 0 src/d/{a => actor}/d_a_ki.cpp | 0 src/d/{a => actor}/d_a_kita.cpp | 0 src/d/{a => actor}/d_a_klft.cpp | 0 src/d/{a => actor}/d_a_kmon.cpp | 0 src/d/{a => actor}/d_a_kn.cpp | 0 src/d/{a => actor}/d_a_knob00.cpp | 0 src/d/{a => actor}/d_a_kokiie.cpp | 0 src/d/{a => actor}/d_a_komore.cpp | 0 src/d/{a => actor}/d_a_ks.cpp | 0 src/d/{a => actor}/d_a_kt.cpp | 0 src/d/{a => actor}/d_a_kui.cpp | 0 src/d/{a => actor}/d_a_kytag00.cpp | 0 src/d/{a => actor}/d_a_kytag01.cpp | 0 src/d/{a => actor}/d_a_kytag02.cpp | 0 src/d/{a => actor}/d_a_kytag03.cpp | 0 src/d/{a => actor}/d_a_kytag04.cpp | 0 src/d/{a => actor}/d_a_kytag05.cpp | 0 src/d/{a => actor}/d_a_kytag06.cpp | 0 src/d/{a => actor}/d_a_kytag07.cpp | 0 src/d/{a => actor}/d_a_lamp.cpp | 0 src/d/{a => actor}/d_a_lbridge.cpp | 0 src/d/{a => actor}/d_a_leaflift.cpp | 0 src/d/{a => actor}/d_a_leaflift_static.cpp | 0 src/d/{a => actor}/d_a_lod_bg.cpp | 0 src/d/{a => actor}/d_a_lstair.cpp | 0 src/d/{a => actor}/d_a_lwood.cpp | 0 src/d/{a => actor}/d_a_machine.cpp | 0 src/d/{a => actor}/d_a_magma.cpp | 0 src/d/{a => actor}/d_a_majuu_flag.cpp | 0 src/d/{a => actor}/d_a_mant.cpp | 0 src/d/{a => actor}/d_a_mbdoor.cpp | 0 src/d/{a => actor}/d_a_mdoor.cpp | 0 src/d/{a => actor}/d_a_mflft.cpp | 0 src/d/{a => actor}/d_a_mgameboard.cpp | 0 src/d/{a => actor}/d_a_mgameboard_static.cpp | 0 src/d/{a => actor}/d_a_mmusic.cpp | 0 src/d/{a => actor}/d_a_mo2.cpp | 0 src/d/{a => actor}/d_a_movie_player.cpp | 0 src/d/{a => actor}/d_a_mozo.cpp | 0 src/d/{a => actor}/d_a_msw.cpp | 0 src/d/{a => actor}/d_a_mt.cpp | 0 src/d/{a => actor}/d_a_mtoge.cpp | 0 src/d/{a => actor}/d_a_nh.cpp | 0 src/d/{a => actor}/d_a_npc_ac1.cpp | 0 src/d/{a => actor}/d_a_npc_ah.cpp | 0 src/d/{a => actor}/d_a_npc_aj1.cpp | 0 src/d/{a => actor}/d_a_npc_auction.cpp | 0 src/d/{a => actor}/d_a_npc_ba1.cpp | 0 src/d/{a => actor}/d_a_npc_bj1.cpp | 0 src/d/{a => actor}/d_a_npc_bm1.cpp | 0 src/d/{a => actor}/d_a_npc_bmcon1.cpp | 0 src/d/{a => actor}/d_a_npc_bms1.cpp | 0 src/d/{a => actor}/d_a_npc_bmsw.cpp | 0 src/d/{a => actor}/d_a_npc_bs1.cpp | 0 src/d/{a => actor}/d_a_npc_btsw.cpp | 0 src/d/{a => actor}/d_a_npc_btsw2.cpp | 0 src/d/{a => actor}/d_a_npc_cb1.cpp | 0 src/d/{a => actor}/d_a_npc_cb1_static.cpp | 0 src/d/{a => actor}/d_a_npc_co1.cpp | 0 src/d/{a => actor}/d_a_npc_de1.cpp | 0 src/d/{a => actor}/d_a_npc_ds1.cpp | 0 src/d/{a => actor}/d_a_npc_fa1.cpp | 0 src/d/{a => actor}/d_a_npc_gk1.cpp | 0 src/d/{a => actor}/d_a_npc_gp1.cpp | 0 src/d/{a => actor}/d_a_npc_hi1.cpp | 0 src/d/{a => actor}/d_a_npc_ho.cpp | 0 src/d/{a => actor}/d_a_npc_hr.cpp | 0 src/d/{a => actor}/d_a_npc_jb1.cpp | 0 src/d/{a => actor}/d_a_npc_ji1.cpp | 0 src/d/{a => actor}/d_a_npc_kamome.cpp | 0 src/d/{a => actor}/d_a_npc_kf1.cpp | 0 src/d/{a => actor}/d_a_npc_kg1.cpp | 0 src/d/{a => actor}/d_a_npc_kg2.cpp | 0 src/d/{a => actor}/d_a_npc_kk1.cpp | 0 src/d/{a => actor}/d_a_npc_km1.cpp | 0 src/d/{a => actor}/d_a_npc_ko1.cpp | 0 src/d/{a => actor}/d_a_npc_kp1.cpp | 0 src/d/{a => actor}/d_a_npc_ls1.cpp | 0 src/d/{a => actor}/d_a_npc_md.cpp | 0 src/d/{a => actor}/d_a_npc_mk.cpp | 0 src/d/{a => actor}/d_a_npc_mk_static.cpp | 0 src/d/{a => actor}/d_a_npc_mn.cpp | 0 src/d/{a => actor}/d_a_npc_mt.cpp | 0 src/d/{a => actor}/d_a_npc_nz.cpp | 0 src/d/{a => actor}/d_a_npc_ob1.cpp | 0 src/d/{a => actor}/d_a_npc_os.cpp | 0 src/d/{a => actor}/d_a_npc_p1.cpp | 0 src/d/{a => actor}/d_a_npc_p2.cpp | 0 src/d/{a => actor}/d_a_npc_people.cpp | 0 src/d/{a => actor}/d_a_npc_pf1.cpp | 0 src/d/{a => actor}/d_a_npc_photo.cpp | 0 src/d/{a => actor}/d_a_npc_pm1.cpp | 0 src/d/{a => actor}/d_a_npc_roten.cpp | 0 src/d/{a => actor}/d_a_npc_rsh1.cpp | 0 src/d/{a => actor}/d_a_npc_sarace.cpp | 0 src/d/{a => actor}/d_a_npc_so.cpp | 0 src/d/{a => actor}/d_a_npc_sv.cpp | 0 src/d/{a => actor}/d_a_npc_tc.cpp | 0 src/d/{a => actor}/d_a_npc_tt.cpp | 0 src/d/{a => actor}/d_a_npc_uk.cpp | 0 src/d/{a => actor}/d_a_npc_ym1.cpp | 0 src/d/{a => actor}/d_a_npc_yw1.cpp | 0 src/d/{a => actor}/d_a_npc_zk1.cpp | 0 src/d/{a => actor}/d_a_npc_zl1.cpp | 0 src/d/{a => actor}/d_a_nz.cpp | 0 src/d/{a => actor}/d_a_nzg.cpp | 0 src/d/{a => actor}/d_a_obj.cpp | 0 src/d/{a => actor}/d_a_obj_AjavW.cpp | 0 src/d/{a => actor}/d_a_obj_Itnak.cpp | 0 src/d/{a => actor}/d_a_obj_Vds.cpp | 0 src/d/{a => actor}/d_a_obj_Vteng.cpp | 0 src/d/{a => actor}/d_a_obj_YLzou.cpp | 0 src/d/{a => actor}/d_a_obj_Yboil.cpp | 0 src/d/{a => actor}/d_a_obj_Ygush00.cpp | 0 src/d/{a => actor}/d_a_obj_adnno.cpp | 0 src/d/{a => actor}/d_a_obj_ajav.cpp | 0 src/d/{a => actor}/d_a_obj_akabe.cpp | 0 src/d/{a => actor}/d_a_obj_apzl.cpp | 0 src/d/{a => actor}/d_a_obj_ashut.cpp | 0 src/d/{a => actor}/d_a_obj_auzu.cpp | 0 src/d/{a => actor}/d_a_obj_aygr.cpp | 0 src/d/{a => actor}/d_a_obj_balancelift.cpp | 0 src/d/{a => actor}/d_a_obj_barrel.cpp | 0 src/d/{a => actor}/d_a_obj_barrel2.cpp | 0 src/d/{a => actor}/d_a_obj_barrier.cpp | 0 src/d/{a => actor}/d_a_obj_bemos.cpp | 0 src/d/{a => actor}/d_a_obj_bscurtain.cpp | 0 src/d/{a => actor}/d_a_obj_buoyflag.cpp | 0 src/d/{a => actor}/d_a_obj_buoyrace.cpp | 0 src/d/{a => actor}/d_a_obj_cafelmp.cpp | 0 src/d/{a => actor}/d_a_obj_canon.cpp | 0 src/d/{a => actor}/d_a_obj_coming.cpp | 0 src/d/{a => actor}/d_a_obj_correct.cpp | 0 src/d/{a => actor}/d_a_obj_demo_barrel.cpp | 0 src/d/{a => actor}/d_a_obj_dmgroom.cpp | 0 src/d/{a => actor}/d_a_obj_doguu.cpp | 0 src/d/{a => actor}/d_a_obj_doguu_demo.cpp | 0 src/d/{a => actor}/d_a_obj_dragonhead.cpp | 0 src/d/{a => actor}/d_a_obj_drift.cpp | 0 src/d/{a => actor}/d_a_obj_eayogn.cpp | 0 src/d/{a => actor}/d_a_obj_ebomzo.cpp | 0 src/d/{a => actor}/d_a_obj_eff.cpp | 0 src/d/{a => actor}/d_a_obj_ekskz.cpp | 0 src/d/{a => actor}/d_a_obj_eskban.cpp | 0 src/d/{a => actor}/d_a_obj_ferris.cpp | 0 src/d/{a => actor}/d_a_obj_figure.cpp | 0 src/d/{a => actor}/d_a_obj_firewall.cpp | 0 src/d/{a => actor}/d_a_obj_flame.cpp | 0 src/d/{a => actor}/d_a_obj_ftree.cpp | 0 src/d/{a => actor}/d_a_obj_ganonbed.cpp | 0 src/d/{a => actor}/d_a_obj_gaship.cpp | 0 src/d/{a => actor}/d_a_obj_gaship2.cpp | 0 src/d/{a => actor}/d_a_obj_gnnbtltaki.cpp | 0 src/d/{a => actor}/d_a_obj_gnndemotakie.cpp | 0 src/d/{a => actor}/d_a_obj_gnndemotakis.cpp | 0 src/d/{a => actor}/d_a_obj_gong.cpp | 0 src/d/{a => actor}/d_a_obj_gryw00.cpp | 0 src/d/{a => actor}/d_a_obj_gtaki.cpp | 0 src/d/{a => actor}/d_a_obj_hami2.cpp | 0 src/d/{a => actor}/d_a_obj_hami3.cpp | 0 src/d/{a => actor}/d_a_obj_hami4.cpp | 0 src/d/{a => actor}/d_a_obj_hat.cpp | 0 src/d/{a => actor}/d_a_obj_hbrf1.cpp | 0 src/d/{a => actor}/d_a_obj_hcbh.cpp | 0 src/d/{a => actor}/d_a_obj_hfuck1.cpp | 0 src/d/{a => actor}/d_a_obj_hha.cpp | 0 src/d/{a => actor}/d_a_obj_hlift.cpp | 0 src/d/{a => actor}/d_a_obj_hole.cpp | 0 src/d/{a => actor}/d_a_obj_homen.cpp | 0 src/d/{a => actor}/d_a_obj_homensmoke.cpp | 0 src/d/{a => actor}/d_a_obj_hsehi1.cpp | 0 src/d/{a => actor}/d_a_obj_htetu1.cpp | 0 src/d/{a => actor}/d_a_obj_ice.cpp | 0 src/d/{a => actor}/d_a_obj_iceisland.cpp | 0 src/d/{a => actor}/d_a_obj_ikada.cpp | 0 src/d/{a => actor}/d_a_obj_jump.cpp | 0 src/d/{a => actor}/d_a_obj_kanat.cpp | 0 src/d/{a => actor}/d_a_obj_kanoke.cpp | 0 src/d/{a => actor}/d_a_obj_ladder.cpp | 0 src/d/{a => actor}/d_a_obj_leaves.cpp | 0 src/d/{a => actor}/d_a_obj_light.cpp | 0 src/d/{a => actor}/d_a_obj_lpalm.cpp | 0 src/d/{a => actor}/d_a_obj_magmarock.cpp | 0 src/d/{a => actor}/d_a_obj_majyuu_door.cpp | 0 src/d/{a => actor}/d_a_obj_mkie.cpp | 0 src/d/{a => actor}/d_a_obj_mkiek.cpp | 0 src/d/{a => actor}/d_a_obj_mknjd.cpp | 0 src/d/{a => actor}/d_a_obj_mmrr.cpp | 0 src/d/{a => actor}/d_a_obj_monument.cpp | 0 src/d/{a => actor}/d_a_obj_movebox.cpp | 0 src/d/{a => actor}/d_a_obj_msdan.cpp | 0 src/d/{a => actor}/d_a_obj_msdan2.cpp | 0 src/d/{a => actor}/d_a_obj_msdan_sub.cpp | 0 src/d/{a => actor}/d_a_obj_msdan_sub2.cpp | 0 src/d/{a => actor}/d_a_obj_mshokki.cpp | 0 src/d/{a => actor}/d_a_obj_mtest.cpp | 0 src/d/{a => actor}/d_a_obj_nest.cpp | 0 src/d/{a => actor}/d_a_obj_ohatch.cpp | 0 src/d/{a => actor}/d_a_obj_ojtree.cpp | 0 src/d/{a => actor}/d_a_obj_ospbox.cpp | 0 src/d/{a => actor}/d_a_obj_otble.cpp | 0 src/d/{a => actor}/d_a_obj_paper.cpp | 0 src/d/{a => actor}/d_a_obj_pbco.cpp | 0 src/d/{a => actor}/d_a_obj_pbka.cpp | 0 src/d/{a => actor}/d_a_obj_pfall.cpp | 0 src/d/{a => actor}/d_a_obj_pirateship.cpp | 0 src/d/{a => actor}/d_a_obj_plant.cpp | 0 src/d/{a => actor}/d_a_obj_quake.cpp | 0 src/d/{a => actor}/d_a_obj_rcloud.cpp | 0 src/d/{a => actor}/d_a_obj_rflw.cpp | 0 src/d/{a => actor}/d_a_obj_rforce.cpp | 0 src/d/{a => actor}/d_a_obj_roten.cpp | 0 src/d/{a => actor}/d_a_obj_search.cpp | 0 src/d/{a => actor}/d_a_obj_shelf.cpp | 0 src/d/{a => actor}/d_a_obj_shmrgrd.cpp | 0 src/d/{a => actor}/d_a_obj_smplbg.cpp | 0 src/d/{a => actor}/d_a_obj_stair.cpp | 0 src/d/{a => actor}/d_a_obj_swflat.cpp | 0 src/d/{a => actor}/d_a_obj_swhammer.cpp | 0 src/d/{a => actor}/d_a_obj_swheavy.cpp | 0 src/d/{a => actor}/d_a_obj_swlight.cpp | 0 src/d/{a => actor}/d_a_obj_swpush.cpp | 0 src/d/{a => actor}/d_a_obj_table.cpp | 0 src/d/{a => actor}/d_a_obj_tapestry.cpp | 0 src/d/{a => actor}/d_a_obj_tenmado.cpp | 0 src/d/{a => actor}/d_a_obj_tide.cpp | 0 src/d/{a => actor}/d_a_obj_timer.cpp | 0 src/d/{a => actor}/d_a_obj_tntrap.cpp | 0 src/d/{a => actor}/d_a_obj_toripost.cpp | 0 src/d/{a => actor}/d_a_obj_tousekiki.cpp | 0 src/d/{a => actor}/d_a_obj_tower.cpp | 0 src/d/{a => actor}/d_a_obj_trap.cpp | 0 src/d/{a => actor}/d_a_obj_tribox.cpp | 0 src/d/{a => actor}/d_a_obj_tribox_static.cpp | 0 src/d/{a => actor}/d_a_obj_try.cpp | 0 src/d/{a => actor}/d_a_obj_usovmc.cpp | 0 src/d/{a => actor}/d_a_obj_vfan.cpp | 0 src/d/{a => actor}/d_a_obj_vgnfd.cpp | 0 src/d/{a => actor}/d_a_obj_vmc.cpp | 0 src/d/{a => actor}/d_a_obj_vmsdz.cpp | 0 src/d/{a => actor}/d_a_obj_vmsms.cpp | 0 src/d/{a => actor}/d_a_obj_volcano.cpp | 0 src/d/{a => actor}/d_a_obj_vtil.cpp | 0 src/d/{a => actor}/d_a_obj_vyasi.cpp | 0 src/d/{a => actor}/d_a_obj_warpt.cpp | 0 src/d/{a => actor}/d_a_obj_wood.cpp | 0 src/d/{a => actor}/d_a_obj_xfuta.cpp | 0 src/d/{a => actor}/d_a_obj_zouK.cpp | 0 src/d/{a => actor}/d_a_oq.cpp | 0 src/d/{a => actor}/d_a_oship.cpp | 0 src/d/{a => actor}/d_a_pedestal.cpp | 0 src/d/{a => actor}/d_a_ph.cpp | 0 src/d/{a => actor}/d_a_pirate_flag.cpp | 0 src/d/{a => actor}/d_a_player.cpp | 0 src/d/{a => actor}/d_a_player_main.cpp | 0 src/d/{a => actor}/d_a_player_npc.cpp | 0 src/d/{a => actor}/d_a_pt.cpp | 0 src/d/{a => actor}/d_a_pw.cpp | 0 src/d/{a => actor}/d_a_pz.cpp | 0 src/d/{a => actor}/d_a_race_item.cpp | 0 src/d/{a => actor}/d_a_race_item_static.cpp | 0 src/d/{a => actor}/d_a_rd.cpp | 0 src/d/{a => actor}/d_a_rectangle.cpp | 0 src/d/{a => actor}/d_a_sail.cpp | 0 src/d/{a => actor}/d_a_saku.cpp | 0 src/d/{a => actor}/d_a_salvage.cpp | 0 src/d/{a => actor}/d_a_salvage_tbox.cpp | 0 src/d/{a => actor}/d_a_sbox.cpp | 0 src/d/{a => actor}/d_a_scene_change.cpp | 0 src/d/{a => actor}/d_a_sea.cpp | 0 src/d/{a => actor}/d_a_seatag.cpp | 0 src/d/{a => actor}/d_a_shand.cpp | 0 src/d/{a => actor}/d_a_ship.cpp | 0 src/d/{a => actor}/d_a_ship_static.cpp | 0 src/d/{a => actor}/d_a_shop_item.cpp | 0 src/d/{a => actor}/d_a_shop_item_static.cpp | 0 src/d/{a => actor}/d_a_shutter.cpp | 0 src/d/{a => actor}/d_a_shutter2.cpp | 0 src/d/{a => actor}/d_a_sie_flag.cpp | 0 src/d/{a => actor}/d_a_sitem.cpp | 0 src/d/{a => actor}/d_a_sk.cpp | 0 src/d/{a => actor}/d_a_sk2.cpp | 0 src/d/{a => actor}/d_a_spc_item01.cpp | 0 src/d/{a => actor}/d_a_spotbox.cpp | 0 src/d/{a => actor}/d_a_ss.cpp | 0 src/d/{a => actor}/d_a_ssk.cpp | 0 src/d/{a => actor}/d_a_sss.cpp | 0 src/d/{a => actor}/d_a_st.cpp | 0 src/d/{a => actor}/d_a_steam_tag.cpp | 0 src/d/{a => actor}/d_a_stone.cpp | 0 src/d/{a => actor}/d_a_stone2.cpp | 0 src/d/{a => actor}/d_a_swattack.cpp | 0 src/d/{a => actor}/d_a_swc00.cpp | 0 src/d/{a => actor}/d_a_swhit0.cpp | 0 src/d/{a => actor}/d_a_switem.cpp | 0 src/d/{a => actor}/d_a_swpropeller.cpp | 0 src/d/{a => actor}/d_a_swtact.cpp | 0 src/d/{a => actor}/d_a_swtdoor.cpp | 0 src/d/{a => actor}/d_a_syan.cpp | 0 src/d/{a => actor}/d_a_tag_attention.cpp | 0 src/d/{a => actor}/d_a_tag_ba1.cpp | 0 src/d/{a => actor}/d_a_tag_etc.cpp | 0 src/d/{a => actor}/d_a_tag_event.cpp | 0 src/d/{a => actor}/d_a_tag_evsw.cpp | 0 src/d/{a => actor}/d_a_tag_ghostship.cpp | 0 src/d/{a => actor}/d_a_tag_hint.cpp | 0 src/d/{a => actor}/d_a_tag_island.cpp | 0 src/d/{a => actor}/d_a_tag_kb_item.cpp | 0 src/d/{a => actor}/d_a_tag_kf1.cpp | 0 src/d/{a => actor}/d_a_tag_kk1.cpp | 0 src/d/{a => actor}/d_a_tag_light.cpp | 0 src/d/{a => actor}/d_a_tag_md_cb.cpp | 0 src/d/{a => actor}/d_a_tag_mk.cpp | 0 src/d/{a => actor}/d_a_tag_msg.cpp | 0 src/d/{a => actor}/d_a_tag_photo.cpp | 0 src/d/{a => actor}/d_a_tag_ret.cpp | 0 src/d/{a => actor}/d_a_tag_so.cpp | 0 src/d/{a => actor}/d_a_tag_volcano.cpp | 0 src/d/{a => actor}/d_a_tag_waterlevel.cpp | 0 src/d/{a => actor}/d_a_tama.cpp | 0 src/d/{a => actor}/d_a_tbox.cpp | 0 src/d/{a => actor}/d_a_title.cpp | 0 src/d/{a => actor}/d_a_tn.cpp | 0 src/d/{a => actor}/d_a_toge.cpp | 0 src/d/{a => actor}/d_a_tori_flag.cpp | 0 src/d/{a => actor}/d_a_tornado.cpp | 0 src/d/{a => actor}/d_a_tpota.cpp | 0 src/d/{a => actor}/d_a_tsubo.cpp | 0 src/d/{a => actor}/d_a_vrbox.cpp | 0 src/d/{a => actor}/d_a_vrbox2.cpp | 0 src/d/{a => actor}/d_a_wall.cpp | 0 src/d/{a => actor}/d_a_warpdm20.cpp | 0 src/d/{a => actor}/d_a_warpf.cpp | 0 src/d/{a => actor}/d_a_warpfout.cpp | 0 src/d/{a => actor}/d_a_warpgn.cpp | 0 src/d/{a => actor}/d_a_warphr.cpp | 0 src/d/{a => actor}/d_a_warpls.cpp | 0 src/d/{a => actor}/d_a_warpmj.cpp | 0 src/d/{a => actor}/d_a_waterfall.cpp | 0 src/d/{a => actor}/d_a_wbird.cpp | 0 src/d/{a => actor}/d_a_wind_tag.cpp | 0 src/d/{a => actor}/d_a_windmill.cpp | 0 src/d/{a => actor}/d_a_wz.cpp | 0 src/d/{a => actor}/d_a_ygcwp.cpp | 0 src/d/{a => actor}/d_a_ykgr.cpp | 0 src/d/{a => actor}/d_a_yougan.cpp | 0 src/d/{bg => }/d_bg_s.cpp | 0 src/d/{bg => }/d_bg_s_acch.cpp | 0 src/d/{bg => }/d_bg_s_func.cpp | 0 src/d/{bg => }/d_bg_s_lin_chk.cpp | 0 src/d/{bg => }/d_bg_s_movebg_actor.cpp | 0 src/d/{bg => }/d_bg_s_spl_grp_chk.cpp | 0 src/d/{bg => }/d_bg_s_wtr_chk.cpp | 0 src/d/{bg => }/d_bg_w.cpp | 0 src/d/{bg => }/d_bg_w_deform.cpp | 0 src/d/{bg => }/d_bg_w_hf.cpp | 0 src/d/{bg => }/d_bg_w_sv.cpp | 0 src/d/{cc => }/d_cc_d.cpp | 0 src/d/{cc => }/d_cc_mass_s.cpp | 0 src/d/{cc => }/d_cc_s.cpp | 0 src/d/{cc => }/d_cc_uty.cpp | 0 src/d/{com => }/d_com_inf_game.cpp | 0 src/d/{com => }/d_com_lib_game.cpp | 0 src/d/{com => }/d_com_static.cpp | 0 src/d/{event => }/d_event_data.cpp | 0 src/d/{event => }/d_event_manager.cpp | 0 src/d/{file => }/d_file_error.cpp | 0 src/d/{file => }/d_file_select.cpp | 0 src/d/{kankyo => }/d_kankyo.cpp | 0 src/d/{kankyo => }/d_kankyo_data.cpp | 0 src/d/{kankyo => }/d_kankyo_demo.cpp | 0 src/d/{kankyo => }/d_kankyo_rain.cpp | 0 src/d/{kankyo => }/d_kankyo_wether.cpp | 0 src/d/{map => }/d_map.cpp | 0 src/d/{menu => }/d_menu_cloth.cpp | 0 src/d/{menu => }/d_menu_collect.cpp | 0 src/d/{menu => }/d_menu_dmap.cpp | 0 src/d/{menu => }/d_menu_fmap.cpp | 0 src/d/{menu => }/d_menu_fmap2.cpp | 0 src/d/{menu => }/d_menu_item.cpp | 0 src/d/{menu => }/d_menu_option.cpp | 0 src/d/{menu => }/d_menu_save.cpp | 0 src/d/{menu => }/d_menu_window.cpp | 0 src/d/{message => }/d_message.cpp | 0 src/d/{message => }/d_message_paper.cpp | 0 src/d/{minigame => }/d_minigame_starter.cpp | 0 .../{minigame => }/d_minigame_terminater.cpp | 0 src/d/{ovlp => }/d_ovlp_fade.cpp | 0 src/d/{ovlp => }/d_ovlp_fade2.cpp | 0 src/d/{ovlp => }/d_ovlp_fade3.cpp | 0 src/d/{ovlp => }/d_ovlp_fade4.cpp | 0 src/d/{particle => }/d_particle.cpp | 0 src/d/{particle => }/d_particle_name.cpp | 0 src/d/{s => }/d_s_actor_data_mng.cpp | 0 src/d/{s => }/d_s_logo.cpp | 0 src/d/{s => }/d_s_menu.cpp | 0 src/d/{s => }/d_s_name.cpp | 0 src/d/{s => }/d_s_open.cpp | 0 src/d/{s => }/d_s_open_sub.cpp | 0 src/d/{s => }/d_s_play.cpp | 0 src/d/{s => }/d_s_room.cpp | 0 src/d/{s => }/d_s_title.cpp | 0 src/d/{save => }/d_save.cpp | 0 src/d/{save => }/d_save_init.cpp | 0 1757 files changed, 1536 insertions(+), 1536 deletions(-) rename src/d/{a => actor}/d_a_acorn_leaf.cpp (100%) rename src/d/{a => actor}/d_a_agb.cpp (100%) rename src/d/{a => actor}/d_a_agbsw0.cpp (100%) rename src/d/{a => actor}/d_a_alldie.cpp (100%) rename src/d/{a => actor}/d_a_am.cpp (100%) rename src/d/{a => actor}/d_a_am2.cpp (100%) rename src/d/{a => actor}/d_a_amiprop.cpp (100%) rename src/d/{a => actor}/d_a_andsw0.cpp (100%) rename src/d/{a => actor}/d_a_andsw2.cpp (100%) rename src/d/{a => actor}/d_a_arrow.cpp (100%) rename src/d/{a => actor}/d_a_arrow_iceeff.cpp (100%) rename src/d/{a => actor}/d_a_arrow_lighteff.cpp (100%) rename src/d/{a => actor}/d_a_atdoor.cpp (100%) rename src/d/{a => actor}/d_a_att.cpp (100%) rename src/d/{a => actor}/d_a_auction.cpp (100%) rename src/d/{a => actor}/d_a_bb.cpp (100%) rename src/d/{a => actor}/d_a_bdk.cpp (100%) rename src/d/{a => actor}/d_a_bdkobj.cpp (100%) rename src/d/{a => actor}/d_a_beam.cpp (100%) rename src/d/{a => actor}/d_a_bflower.cpp (100%) rename src/d/{a => actor}/d_a_bg.cpp (100%) rename src/d/{a => actor}/d_a_bgn.cpp (100%) rename src/d/{a => actor}/d_a_bgn2.cpp (100%) rename src/d/{a => actor}/d_a_bgn3.cpp (100%) rename src/d/{a => actor}/d_a_bigelf.cpp (100%) rename src/d/{a => actor}/d_a_bita.cpp (100%) rename src/d/{a => actor}/d_a_bk.cpp (100%) rename src/d/{a => actor}/d_a_bl.cpp (100%) rename src/d/{a => actor}/d_a_bmd.cpp (100%) rename src/d/{a => actor}/d_a_bmdfoot.cpp (100%) rename src/d/{a => actor}/d_a_bmdhand.cpp (100%) rename src/d/{a => actor}/d_a_bo.cpp (100%) rename src/d/{a => actor}/d_a_boko.cpp (100%) rename src/d/{a => actor}/d_a_boko_static.cpp (100%) rename src/d/{a => actor}/d_a_bomb.cpp (100%) rename src/d/{a => actor}/d_a_bomb2.cpp (100%) rename src/d/{a => actor}/d_a_bomb_static.cpp (100%) rename src/d/{a => actor}/d_a_boomerang.cpp (100%) rename src/d/{a => actor}/d_a_boss_item.cpp (100%) rename src/d/{a => actor}/d_a_bpw.cpp (100%) rename src/d/{a => actor}/d_a_branch.cpp (100%) rename src/d/{a => actor}/d_a_branch_static.cpp (100%) rename src/d/{a => actor}/d_a_bridge.cpp (100%) rename src/d/{a => actor}/d_a_bst.cpp (100%) rename src/d/{a => actor}/d_a_btd.cpp (100%) rename src/d/{a => actor}/d_a_bwd.cpp (100%) rename src/d/{a => actor}/d_a_bwdg.cpp (100%) rename src/d/{a => actor}/d_a_bwds.cpp (100%) rename src/d/{a => actor}/d_a_canon.cpp (100%) rename src/d/{a => actor}/d_a_cc.cpp (100%) rename src/d/{a => actor}/d_a_coming2.cpp (100%) rename src/d/{a => actor}/d_a_coming3.cpp (100%) rename src/d/{a => actor}/d_a_dai.cpp (100%) rename src/d/{a => actor}/d_a_dai_item.cpp (100%) rename src/d/{a => actor}/d_a_daiocta.cpp (100%) rename src/d/{a => actor}/d_a_daiocta_eye.cpp (100%) rename src/d/{a => actor}/d_a_deku_item.cpp (100%) rename src/d/{a => actor}/d_a_demo00.cpp (100%) rename src/d/{a => actor}/d_a_demo_dk.cpp (100%) rename src/d/{a => actor}/d_a_demo_item.cpp (100%) rename src/d/{a => actor}/d_a_demo_kmm.cpp (100%) rename src/d/{a => actor}/d_a_disappear.cpp (100%) rename src/d/{a => actor}/d_a_dk.cpp (100%) rename src/d/{a => actor}/d_a_door10.cpp (100%) rename src/d/{a => actor}/d_a_door12.cpp (100%) rename src/d/{a => actor}/d_a_dr.cpp (100%) rename src/d/{a => actor}/d_a_dr2.cpp (100%) rename src/d/{a => actor}/d_a_dummy.cpp (100%) rename src/d/{a => actor}/d_a_ep.cpp (100%) rename src/d/{a => actor}/d_a_esa.cpp (100%) rename src/d/{a => actor}/d_a_fallrock.cpp (100%) rename src/d/{a => actor}/d_a_fallrock_tag.cpp (100%) rename src/d/{a => actor}/d_a_fan.cpp (100%) rename src/d/{a => actor}/d_a_ff.cpp (100%) rename src/d/{a => actor}/d_a_fganon.cpp (100%) rename src/d/{a => actor}/d_a_fgmahou.cpp (100%) rename src/d/{a => actor}/d_a_fire.cpp (100%) rename src/d/{a => actor}/d_a_floor.cpp (100%) rename src/d/{a => actor}/d_a_fm.cpp (100%) rename src/d/{a => actor}/d_a_ghostship.cpp (100%) rename src/d/{a => actor}/d_a_gm.cpp (100%) rename src/d/{a => actor}/d_a_gnd.cpp (100%) rename src/d/{a => actor}/d_a_goal_flag.cpp (100%) rename src/d/{a => actor}/d_a_grass.cpp (100%) rename src/d/{a => actor}/d_a_grid.cpp (100%) rename src/d/{a => actor}/d_a_gy.cpp (100%) rename src/d/{a => actor}/d_a_gy_ctrl.cpp (100%) rename src/d/{a => actor}/d_a_himo2.cpp (100%) rename src/d/{a => actor}/d_a_himo3.cpp (100%) rename src/d/{a => actor}/d_a_hitobj.cpp (100%) rename src/d/{a => actor}/d_a_hmlif.cpp (100%) rename src/d/{a => actor}/d_a_hookshot.cpp (100%) rename src/d/{a => actor}/d_a_hot_floor.cpp (100%) rename src/d/{a => actor}/d_a_hys.cpp (100%) rename src/d/{a => actor}/d_a_ib.cpp (100%) rename src/d/{a => actor}/d_a_icelift.cpp (100%) rename src/d/{a => actor}/d_a_ikari.cpp (100%) rename src/d/{a => actor}/d_a_item.cpp (100%) rename src/d/{a => actor}/d_a_item_static.cpp (100%) rename src/d/{a => actor}/d_a_itembase.cpp (100%) rename src/d/{a => actor}/d_a_itembase_static.cpp (100%) rename src/d/{a => actor}/d_a_jbo.cpp (100%) rename src/d/{a => actor}/d_a_kaji.cpp (100%) rename src/d/{a => actor}/d_a_kamome.cpp (100%) rename src/d/{a => actor}/d_a_kanban.cpp (100%) rename src/d/{a => actor}/d_a_kantera.cpp (100%) rename src/d/{a => actor}/d_a_kb.cpp (100%) rename src/d/{a => actor}/d_a_kddoor.cpp (100%) rename src/d/{a => actor}/d_a_ki.cpp (100%) rename src/d/{a => actor}/d_a_kita.cpp (100%) rename src/d/{a => actor}/d_a_klft.cpp (100%) rename src/d/{a => actor}/d_a_kmon.cpp (100%) rename src/d/{a => actor}/d_a_kn.cpp (100%) rename src/d/{a => actor}/d_a_knob00.cpp (100%) rename src/d/{a => actor}/d_a_kokiie.cpp (100%) rename src/d/{a => actor}/d_a_komore.cpp (100%) rename src/d/{a => actor}/d_a_ks.cpp (100%) rename src/d/{a => actor}/d_a_kt.cpp (100%) rename src/d/{a => actor}/d_a_kui.cpp (100%) rename src/d/{a => actor}/d_a_kytag00.cpp (100%) rename src/d/{a => actor}/d_a_kytag01.cpp (100%) rename src/d/{a => actor}/d_a_kytag02.cpp (100%) rename src/d/{a => actor}/d_a_kytag03.cpp (100%) rename src/d/{a => actor}/d_a_kytag04.cpp (100%) rename src/d/{a => actor}/d_a_kytag05.cpp (100%) rename src/d/{a => actor}/d_a_kytag06.cpp (100%) rename src/d/{a => actor}/d_a_kytag07.cpp (100%) rename src/d/{a => actor}/d_a_lamp.cpp (100%) rename src/d/{a => actor}/d_a_lbridge.cpp (100%) rename src/d/{a => actor}/d_a_leaflift.cpp (100%) rename src/d/{a => actor}/d_a_leaflift_static.cpp (100%) rename src/d/{a => actor}/d_a_lod_bg.cpp (100%) rename src/d/{a => actor}/d_a_lstair.cpp (100%) rename src/d/{a => actor}/d_a_lwood.cpp (100%) rename src/d/{a => actor}/d_a_machine.cpp (100%) rename src/d/{a => actor}/d_a_magma.cpp (100%) rename src/d/{a => actor}/d_a_majuu_flag.cpp (100%) rename src/d/{a => actor}/d_a_mant.cpp (100%) rename src/d/{a => actor}/d_a_mbdoor.cpp (100%) rename src/d/{a => actor}/d_a_mdoor.cpp (100%) rename src/d/{a => actor}/d_a_mflft.cpp (100%) rename src/d/{a => actor}/d_a_mgameboard.cpp (100%) rename src/d/{a => actor}/d_a_mgameboard_static.cpp (100%) rename src/d/{a => actor}/d_a_mmusic.cpp (100%) rename src/d/{a => actor}/d_a_mo2.cpp (100%) rename src/d/{a => actor}/d_a_movie_player.cpp (100%) rename src/d/{a => actor}/d_a_mozo.cpp (100%) rename src/d/{a => actor}/d_a_msw.cpp (100%) rename src/d/{a => actor}/d_a_mt.cpp (100%) rename src/d/{a => actor}/d_a_mtoge.cpp (100%) rename src/d/{a => actor}/d_a_nh.cpp (100%) rename src/d/{a => actor}/d_a_npc_ac1.cpp (100%) rename src/d/{a => actor}/d_a_npc_ah.cpp (100%) rename src/d/{a => actor}/d_a_npc_aj1.cpp (100%) rename src/d/{a => actor}/d_a_npc_auction.cpp (100%) rename src/d/{a => actor}/d_a_npc_ba1.cpp (100%) rename src/d/{a => actor}/d_a_npc_bj1.cpp (100%) rename src/d/{a => actor}/d_a_npc_bm1.cpp (100%) rename src/d/{a => actor}/d_a_npc_bmcon1.cpp (100%) rename src/d/{a => actor}/d_a_npc_bms1.cpp (100%) rename src/d/{a => actor}/d_a_npc_bmsw.cpp (100%) rename src/d/{a => actor}/d_a_npc_bs1.cpp (100%) rename src/d/{a => actor}/d_a_npc_btsw.cpp (100%) rename src/d/{a => actor}/d_a_npc_btsw2.cpp (100%) rename src/d/{a => actor}/d_a_npc_cb1.cpp (100%) rename src/d/{a => actor}/d_a_npc_cb1_static.cpp (100%) rename src/d/{a => actor}/d_a_npc_co1.cpp (100%) rename src/d/{a => actor}/d_a_npc_de1.cpp (100%) rename src/d/{a => actor}/d_a_npc_ds1.cpp (100%) rename src/d/{a => actor}/d_a_npc_fa1.cpp (100%) rename src/d/{a => actor}/d_a_npc_gk1.cpp (100%) rename src/d/{a => actor}/d_a_npc_gp1.cpp (100%) rename src/d/{a => actor}/d_a_npc_hi1.cpp (100%) rename src/d/{a => actor}/d_a_npc_ho.cpp (100%) rename src/d/{a => actor}/d_a_npc_hr.cpp (100%) rename src/d/{a => actor}/d_a_npc_jb1.cpp (100%) rename src/d/{a => actor}/d_a_npc_ji1.cpp (100%) rename src/d/{a => actor}/d_a_npc_kamome.cpp (100%) rename src/d/{a => actor}/d_a_npc_kf1.cpp (100%) rename src/d/{a => actor}/d_a_npc_kg1.cpp (100%) rename src/d/{a => actor}/d_a_npc_kg2.cpp (100%) rename src/d/{a => actor}/d_a_npc_kk1.cpp (100%) rename src/d/{a => actor}/d_a_npc_km1.cpp (100%) rename src/d/{a => actor}/d_a_npc_ko1.cpp (100%) rename src/d/{a => actor}/d_a_npc_kp1.cpp (100%) rename src/d/{a => actor}/d_a_npc_ls1.cpp (100%) rename src/d/{a => actor}/d_a_npc_md.cpp (100%) rename src/d/{a => actor}/d_a_npc_mk.cpp (100%) rename src/d/{a => actor}/d_a_npc_mk_static.cpp (100%) rename src/d/{a => actor}/d_a_npc_mn.cpp (100%) rename src/d/{a => actor}/d_a_npc_mt.cpp (100%) rename src/d/{a => actor}/d_a_npc_nz.cpp (100%) rename src/d/{a => actor}/d_a_npc_ob1.cpp (100%) rename src/d/{a => actor}/d_a_npc_os.cpp (100%) rename src/d/{a => actor}/d_a_npc_p1.cpp (100%) rename src/d/{a => actor}/d_a_npc_p2.cpp (100%) rename src/d/{a => actor}/d_a_npc_people.cpp (100%) rename src/d/{a => actor}/d_a_npc_pf1.cpp (100%) rename src/d/{a => actor}/d_a_npc_photo.cpp (100%) rename src/d/{a => actor}/d_a_npc_pm1.cpp (100%) rename src/d/{a => actor}/d_a_npc_roten.cpp (100%) rename src/d/{a => actor}/d_a_npc_rsh1.cpp (100%) rename src/d/{a => actor}/d_a_npc_sarace.cpp (100%) rename src/d/{a => actor}/d_a_npc_so.cpp (100%) rename src/d/{a => actor}/d_a_npc_sv.cpp (100%) rename src/d/{a => actor}/d_a_npc_tc.cpp (100%) rename src/d/{a => actor}/d_a_npc_tt.cpp (100%) rename src/d/{a => actor}/d_a_npc_uk.cpp (100%) rename src/d/{a => actor}/d_a_npc_ym1.cpp (100%) rename src/d/{a => actor}/d_a_npc_yw1.cpp (100%) rename src/d/{a => actor}/d_a_npc_zk1.cpp (100%) rename src/d/{a => actor}/d_a_npc_zl1.cpp (100%) rename src/d/{a => actor}/d_a_nz.cpp (100%) rename src/d/{a => actor}/d_a_nzg.cpp (100%) rename src/d/{a => actor}/d_a_obj.cpp (100%) rename src/d/{a => actor}/d_a_obj_AjavW.cpp (100%) rename src/d/{a => actor}/d_a_obj_Itnak.cpp (100%) rename src/d/{a => actor}/d_a_obj_Vds.cpp (100%) rename src/d/{a => actor}/d_a_obj_Vteng.cpp (100%) rename src/d/{a => actor}/d_a_obj_YLzou.cpp (100%) rename src/d/{a => actor}/d_a_obj_Yboil.cpp (100%) rename src/d/{a => actor}/d_a_obj_Ygush00.cpp (100%) rename src/d/{a => actor}/d_a_obj_adnno.cpp (100%) rename src/d/{a => actor}/d_a_obj_ajav.cpp (100%) rename src/d/{a => actor}/d_a_obj_akabe.cpp (100%) rename src/d/{a => actor}/d_a_obj_apzl.cpp (100%) rename src/d/{a => actor}/d_a_obj_ashut.cpp (100%) rename src/d/{a => actor}/d_a_obj_auzu.cpp (100%) rename src/d/{a => actor}/d_a_obj_aygr.cpp (100%) rename src/d/{a => actor}/d_a_obj_balancelift.cpp (100%) rename src/d/{a => actor}/d_a_obj_barrel.cpp (100%) rename src/d/{a => actor}/d_a_obj_barrel2.cpp (100%) rename src/d/{a => actor}/d_a_obj_barrier.cpp (100%) rename src/d/{a => actor}/d_a_obj_bemos.cpp (100%) rename src/d/{a => actor}/d_a_obj_bscurtain.cpp (100%) rename src/d/{a => actor}/d_a_obj_buoyflag.cpp (100%) rename src/d/{a => actor}/d_a_obj_buoyrace.cpp (100%) rename src/d/{a => actor}/d_a_obj_cafelmp.cpp (100%) rename src/d/{a => actor}/d_a_obj_canon.cpp (100%) rename src/d/{a => actor}/d_a_obj_coming.cpp (100%) rename src/d/{a => actor}/d_a_obj_correct.cpp (100%) rename src/d/{a => actor}/d_a_obj_demo_barrel.cpp (100%) rename src/d/{a => actor}/d_a_obj_dmgroom.cpp (100%) rename src/d/{a => actor}/d_a_obj_doguu.cpp (100%) rename src/d/{a => actor}/d_a_obj_doguu_demo.cpp (100%) rename src/d/{a => actor}/d_a_obj_dragonhead.cpp (100%) rename src/d/{a => actor}/d_a_obj_drift.cpp (100%) rename src/d/{a => actor}/d_a_obj_eayogn.cpp (100%) rename src/d/{a => actor}/d_a_obj_ebomzo.cpp (100%) rename src/d/{a => actor}/d_a_obj_eff.cpp (100%) rename src/d/{a => actor}/d_a_obj_ekskz.cpp (100%) rename src/d/{a => actor}/d_a_obj_eskban.cpp (100%) rename src/d/{a => actor}/d_a_obj_ferris.cpp (100%) rename src/d/{a => actor}/d_a_obj_figure.cpp (100%) rename src/d/{a => actor}/d_a_obj_firewall.cpp (100%) rename src/d/{a => actor}/d_a_obj_flame.cpp (100%) rename src/d/{a => actor}/d_a_obj_ftree.cpp (100%) rename src/d/{a => actor}/d_a_obj_ganonbed.cpp (100%) rename src/d/{a => actor}/d_a_obj_gaship.cpp (100%) rename src/d/{a => actor}/d_a_obj_gaship2.cpp (100%) rename src/d/{a => actor}/d_a_obj_gnnbtltaki.cpp (100%) rename src/d/{a => actor}/d_a_obj_gnndemotakie.cpp (100%) rename src/d/{a => actor}/d_a_obj_gnndemotakis.cpp (100%) rename src/d/{a => actor}/d_a_obj_gong.cpp (100%) rename src/d/{a => actor}/d_a_obj_gryw00.cpp (100%) rename src/d/{a => actor}/d_a_obj_gtaki.cpp (100%) rename src/d/{a => actor}/d_a_obj_hami2.cpp (100%) rename src/d/{a => actor}/d_a_obj_hami3.cpp (100%) rename src/d/{a => actor}/d_a_obj_hami4.cpp (100%) rename src/d/{a => actor}/d_a_obj_hat.cpp (100%) rename src/d/{a => actor}/d_a_obj_hbrf1.cpp (100%) rename src/d/{a => actor}/d_a_obj_hcbh.cpp (100%) rename src/d/{a => actor}/d_a_obj_hfuck1.cpp (100%) rename src/d/{a => actor}/d_a_obj_hha.cpp (100%) rename src/d/{a => actor}/d_a_obj_hlift.cpp (100%) rename src/d/{a => actor}/d_a_obj_hole.cpp (100%) rename src/d/{a => actor}/d_a_obj_homen.cpp (100%) rename src/d/{a => actor}/d_a_obj_homensmoke.cpp (100%) rename src/d/{a => actor}/d_a_obj_hsehi1.cpp (100%) rename src/d/{a => actor}/d_a_obj_htetu1.cpp (100%) rename src/d/{a => actor}/d_a_obj_ice.cpp (100%) rename src/d/{a => actor}/d_a_obj_iceisland.cpp (100%) rename src/d/{a => actor}/d_a_obj_ikada.cpp (100%) rename src/d/{a => actor}/d_a_obj_jump.cpp (100%) rename src/d/{a => actor}/d_a_obj_kanat.cpp (100%) rename src/d/{a => actor}/d_a_obj_kanoke.cpp (100%) rename src/d/{a => actor}/d_a_obj_ladder.cpp (100%) rename src/d/{a => actor}/d_a_obj_leaves.cpp (100%) rename src/d/{a => actor}/d_a_obj_light.cpp (100%) rename src/d/{a => actor}/d_a_obj_lpalm.cpp (100%) rename src/d/{a => actor}/d_a_obj_magmarock.cpp (100%) rename src/d/{a => actor}/d_a_obj_majyuu_door.cpp (100%) rename src/d/{a => actor}/d_a_obj_mkie.cpp (100%) rename src/d/{a => actor}/d_a_obj_mkiek.cpp (100%) rename src/d/{a => actor}/d_a_obj_mknjd.cpp (100%) rename src/d/{a => actor}/d_a_obj_mmrr.cpp (100%) rename src/d/{a => actor}/d_a_obj_monument.cpp (100%) rename src/d/{a => actor}/d_a_obj_movebox.cpp (100%) rename src/d/{a => actor}/d_a_obj_msdan.cpp (100%) rename src/d/{a => actor}/d_a_obj_msdan2.cpp (100%) rename src/d/{a => actor}/d_a_obj_msdan_sub.cpp (100%) rename src/d/{a => actor}/d_a_obj_msdan_sub2.cpp (100%) rename src/d/{a => actor}/d_a_obj_mshokki.cpp (100%) rename src/d/{a => actor}/d_a_obj_mtest.cpp (100%) rename src/d/{a => actor}/d_a_obj_nest.cpp (100%) rename src/d/{a => actor}/d_a_obj_ohatch.cpp (100%) rename src/d/{a => actor}/d_a_obj_ojtree.cpp (100%) rename src/d/{a => actor}/d_a_obj_ospbox.cpp (100%) rename src/d/{a => actor}/d_a_obj_otble.cpp (100%) rename src/d/{a => actor}/d_a_obj_paper.cpp (100%) rename src/d/{a => actor}/d_a_obj_pbco.cpp (100%) rename src/d/{a => actor}/d_a_obj_pbka.cpp (100%) rename src/d/{a => actor}/d_a_obj_pfall.cpp (100%) rename src/d/{a => actor}/d_a_obj_pirateship.cpp (100%) rename src/d/{a => actor}/d_a_obj_plant.cpp (100%) rename src/d/{a => actor}/d_a_obj_quake.cpp (100%) rename src/d/{a => actor}/d_a_obj_rcloud.cpp (100%) rename src/d/{a => actor}/d_a_obj_rflw.cpp (100%) rename src/d/{a => actor}/d_a_obj_rforce.cpp (100%) rename src/d/{a => actor}/d_a_obj_roten.cpp (100%) rename src/d/{a => actor}/d_a_obj_search.cpp (100%) rename src/d/{a => actor}/d_a_obj_shelf.cpp (100%) rename src/d/{a => actor}/d_a_obj_shmrgrd.cpp (100%) rename src/d/{a => actor}/d_a_obj_smplbg.cpp (100%) rename src/d/{a => actor}/d_a_obj_stair.cpp (100%) rename src/d/{a => actor}/d_a_obj_swflat.cpp (100%) rename src/d/{a => actor}/d_a_obj_swhammer.cpp (100%) rename src/d/{a => actor}/d_a_obj_swheavy.cpp (100%) rename src/d/{a => actor}/d_a_obj_swlight.cpp (100%) rename src/d/{a => actor}/d_a_obj_swpush.cpp (100%) rename src/d/{a => actor}/d_a_obj_table.cpp (100%) rename src/d/{a => actor}/d_a_obj_tapestry.cpp (100%) rename src/d/{a => actor}/d_a_obj_tenmado.cpp (100%) rename src/d/{a => actor}/d_a_obj_tide.cpp (100%) rename src/d/{a => actor}/d_a_obj_timer.cpp (100%) rename src/d/{a => actor}/d_a_obj_tntrap.cpp (100%) rename src/d/{a => actor}/d_a_obj_toripost.cpp (100%) rename src/d/{a => actor}/d_a_obj_tousekiki.cpp (100%) rename src/d/{a => actor}/d_a_obj_tower.cpp (100%) rename src/d/{a => actor}/d_a_obj_trap.cpp (100%) rename src/d/{a => actor}/d_a_obj_tribox.cpp (100%) rename src/d/{a => actor}/d_a_obj_tribox_static.cpp (100%) rename src/d/{a => actor}/d_a_obj_try.cpp (100%) rename src/d/{a => actor}/d_a_obj_usovmc.cpp (100%) rename src/d/{a => actor}/d_a_obj_vfan.cpp (100%) rename src/d/{a => actor}/d_a_obj_vgnfd.cpp (100%) rename src/d/{a => actor}/d_a_obj_vmc.cpp (100%) rename src/d/{a => actor}/d_a_obj_vmsdz.cpp (100%) rename src/d/{a => actor}/d_a_obj_vmsms.cpp (100%) rename src/d/{a => actor}/d_a_obj_volcano.cpp (100%) rename src/d/{a => actor}/d_a_obj_vtil.cpp (100%) rename src/d/{a => actor}/d_a_obj_vyasi.cpp (100%) rename src/d/{a => actor}/d_a_obj_warpt.cpp (100%) rename src/d/{a => actor}/d_a_obj_wood.cpp (100%) rename src/d/{a => actor}/d_a_obj_xfuta.cpp (100%) rename src/d/{a => actor}/d_a_obj_zouK.cpp (100%) rename src/d/{a => actor}/d_a_oq.cpp (100%) rename src/d/{a => actor}/d_a_oship.cpp (100%) rename src/d/{a => actor}/d_a_pedestal.cpp (100%) rename src/d/{a => actor}/d_a_ph.cpp (100%) rename src/d/{a => actor}/d_a_pirate_flag.cpp (100%) rename src/d/{a => actor}/d_a_player.cpp (100%) rename src/d/{a => actor}/d_a_player_main.cpp (100%) rename src/d/{a => actor}/d_a_player_npc.cpp (100%) rename src/d/{a => actor}/d_a_pt.cpp (100%) rename src/d/{a => actor}/d_a_pw.cpp (100%) rename src/d/{a => actor}/d_a_pz.cpp (100%) rename src/d/{a => actor}/d_a_race_item.cpp (100%) rename src/d/{a => actor}/d_a_race_item_static.cpp (100%) rename src/d/{a => actor}/d_a_rd.cpp (100%) rename src/d/{a => actor}/d_a_rectangle.cpp (100%) rename src/d/{a => actor}/d_a_sail.cpp (100%) rename src/d/{a => actor}/d_a_saku.cpp (100%) rename src/d/{a => actor}/d_a_salvage.cpp (100%) rename src/d/{a => actor}/d_a_salvage_tbox.cpp (100%) rename src/d/{a => actor}/d_a_sbox.cpp (100%) rename src/d/{a => actor}/d_a_scene_change.cpp (100%) rename src/d/{a => actor}/d_a_sea.cpp (100%) rename src/d/{a => actor}/d_a_seatag.cpp (100%) rename src/d/{a => actor}/d_a_shand.cpp (100%) rename src/d/{a => actor}/d_a_ship.cpp (100%) rename src/d/{a => actor}/d_a_ship_static.cpp (100%) rename src/d/{a => actor}/d_a_shop_item.cpp (100%) rename src/d/{a => actor}/d_a_shop_item_static.cpp (100%) rename src/d/{a => actor}/d_a_shutter.cpp (100%) rename src/d/{a => actor}/d_a_shutter2.cpp (100%) rename src/d/{a => actor}/d_a_sie_flag.cpp (100%) rename src/d/{a => actor}/d_a_sitem.cpp (100%) rename src/d/{a => actor}/d_a_sk.cpp (100%) rename src/d/{a => actor}/d_a_sk2.cpp (100%) rename src/d/{a => actor}/d_a_spc_item01.cpp (100%) rename src/d/{a => actor}/d_a_spotbox.cpp (100%) rename src/d/{a => actor}/d_a_ss.cpp (100%) rename src/d/{a => actor}/d_a_ssk.cpp (100%) rename src/d/{a => actor}/d_a_sss.cpp (100%) rename src/d/{a => actor}/d_a_st.cpp (100%) rename src/d/{a => actor}/d_a_steam_tag.cpp (100%) rename src/d/{a => actor}/d_a_stone.cpp (100%) rename src/d/{a => actor}/d_a_stone2.cpp (100%) rename src/d/{a => actor}/d_a_swattack.cpp (100%) rename src/d/{a => actor}/d_a_swc00.cpp (100%) rename src/d/{a => actor}/d_a_swhit0.cpp (100%) rename src/d/{a => actor}/d_a_switem.cpp (100%) rename src/d/{a => actor}/d_a_swpropeller.cpp (100%) rename src/d/{a => actor}/d_a_swtact.cpp (100%) rename src/d/{a => actor}/d_a_swtdoor.cpp (100%) rename src/d/{a => actor}/d_a_syan.cpp (100%) rename src/d/{a => actor}/d_a_tag_attention.cpp (100%) rename src/d/{a => actor}/d_a_tag_ba1.cpp (100%) rename src/d/{a => actor}/d_a_tag_etc.cpp (100%) rename src/d/{a => actor}/d_a_tag_event.cpp (100%) rename src/d/{a => actor}/d_a_tag_evsw.cpp (100%) rename src/d/{a => actor}/d_a_tag_ghostship.cpp (100%) rename src/d/{a => actor}/d_a_tag_hint.cpp (100%) rename src/d/{a => actor}/d_a_tag_island.cpp (100%) rename src/d/{a => actor}/d_a_tag_kb_item.cpp (100%) rename src/d/{a => actor}/d_a_tag_kf1.cpp (100%) rename src/d/{a => actor}/d_a_tag_kk1.cpp (100%) rename src/d/{a => actor}/d_a_tag_light.cpp (100%) rename src/d/{a => actor}/d_a_tag_md_cb.cpp (100%) rename src/d/{a => actor}/d_a_tag_mk.cpp (100%) rename src/d/{a => actor}/d_a_tag_msg.cpp (100%) rename src/d/{a => actor}/d_a_tag_photo.cpp (100%) rename src/d/{a => actor}/d_a_tag_ret.cpp (100%) rename src/d/{a => actor}/d_a_tag_so.cpp (100%) rename src/d/{a => actor}/d_a_tag_volcano.cpp (100%) rename src/d/{a => actor}/d_a_tag_waterlevel.cpp (100%) rename src/d/{a => actor}/d_a_tama.cpp (100%) rename src/d/{a => actor}/d_a_tbox.cpp (100%) rename src/d/{a => actor}/d_a_title.cpp (100%) rename src/d/{a => actor}/d_a_tn.cpp (100%) rename src/d/{a => actor}/d_a_toge.cpp (100%) rename src/d/{a => actor}/d_a_tori_flag.cpp (100%) rename src/d/{a => actor}/d_a_tornado.cpp (100%) rename src/d/{a => actor}/d_a_tpota.cpp (100%) rename src/d/{a => actor}/d_a_tsubo.cpp (100%) rename src/d/{a => actor}/d_a_vrbox.cpp (100%) rename src/d/{a => actor}/d_a_vrbox2.cpp (100%) rename src/d/{a => actor}/d_a_wall.cpp (100%) rename src/d/{a => actor}/d_a_warpdm20.cpp (100%) rename src/d/{a => actor}/d_a_warpf.cpp (100%) rename src/d/{a => actor}/d_a_warpfout.cpp (100%) rename src/d/{a => actor}/d_a_warpgn.cpp (100%) rename src/d/{a => actor}/d_a_warphr.cpp (100%) rename src/d/{a => actor}/d_a_warpls.cpp (100%) rename src/d/{a => actor}/d_a_warpmj.cpp (100%) rename src/d/{a => actor}/d_a_waterfall.cpp (100%) rename src/d/{a => actor}/d_a_wbird.cpp (100%) rename src/d/{a => actor}/d_a_wind_tag.cpp (100%) rename src/d/{a => actor}/d_a_windmill.cpp (100%) rename src/d/{a => actor}/d_a_wz.cpp (100%) rename src/d/{a => actor}/d_a_ygcwp.cpp (100%) rename src/d/{a => actor}/d_a_ykgr.cpp (100%) rename src/d/{a => actor}/d_a_yougan.cpp (100%) rename src/d/{bg => }/d_bg_s.cpp (100%) rename src/d/{bg => }/d_bg_s_acch.cpp (100%) rename src/d/{bg => }/d_bg_s_func.cpp (100%) rename src/d/{bg => }/d_bg_s_lin_chk.cpp (100%) rename src/d/{bg => }/d_bg_s_movebg_actor.cpp (100%) rename src/d/{bg => }/d_bg_s_spl_grp_chk.cpp (100%) rename src/d/{bg => }/d_bg_s_wtr_chk.cpp (100%) rename src/d/{bg => }/d_bg_w.cpp (100%) rename src/d/{bg => }/d_bg_w_deform.cpp (100%) rename src/d/{bg => }/d_bg_w_hf.cpp (100%) rename src/d/{bg => }/d_bg_w_sv.cpp (100%) rename src/d/{cc => }/d_cc_d.cpp (100%) rename src/d/{cc => }/d_cc_mass_s.cpp (100%) rename src/d/{cc => }/d_cc_s.cpp (100%) rename src/d/{cc => }/d_cc_uty.cpp (100%) rename src/d/{com => }/d_com_inf_game.cpp (100%) rename src/d/{com => }/d_com_lib_game.cpp (100%) rename src/d/{com => }/d_com_static.cpp (100%) rename src/d/{event => }/d_event_data.cpp (100%) rename src/d/{event => }/d_event_manager.cpp (100%) rename src/d/{file => }/d_file_error.cpp (100%) rename src/d/{file => }/d_file_select.cpp (100%) rename src/d/{kankyo => }/d_kankyo.cpp (100%) rename src/d/{kankyo => }/d_kankyo_data.cpp (100%) rename src/d/{kankyo => }/d_kankyo_demo.cpp (100%) rename src/d/{kankyo => }/d_kankyo_rain.cpp (100%) rename src/d/{kankyo => }/d_kankyo_wether.cpp (100%) rename src/d/{map => }/d_map.cpp (100%) rename src/d/{menu => }/d_menu_cloth.cpp (100%) rename src/d/{menu => }/d_menu_collect.cpp (100%) rename src/d/{menu => }/d_menu_dmap.cpp (100%) rename src/d/{menu => }/d_menu_fmap.cpp (100%) rename src/d/{menu => }/d_menu_fmap2.cpp (100%) rename src/d/{menu => }/d_menu_item.cpp (100%) rename src/d/{menu => }/d_menu_option.cpp (100%) rename src/d/{menu => }/d_menu_save.cpp (100%) rename src/d/{menu => }/d_menu_window.cpp (100%) rename src/d/{message => }/d_message.cpp (100%) rename src/d/{message => }/d_message_paper.cpp (100%) rename src/d/{minigame => }/d_minigame_starter.cpp (100%) rename src/d/{minigame => }/d_minigame_terminater.cpp (100%) rename src/d/{ovlp => }/d_ovlp_fade.cpp (100%) rename src/d/{ovlp => }/d_ovlp_fade2.cpp (100%) rename src/d/{ovlp => }/d_ovlp_fade3.cpp (100%) rename src/d/{ovlp => }/d_ovlp_fade4.cpp (100%) rename src/d/{particle => }/d_particle.cpp (100%) rename src/d/{particle => }/d_particle_name.cpp (100%) rename src/d/{s => }/d_s_actor_data_mng.cpp (100%) rename src/d/{s => }/d_s_logo.cpp (100%) rename src/d/{s => }/d_s_menu.cpp (100%) rename src/d/{s => }/d_s_name.cpp (100%) rename src/d/{s => }/d_s_open.cpp (100%) rename src/d/{s => }/d_s_open_sub.cpp (100%) rename src/d/{s => }/d_s_play.cpp (100%) rename src/d/{s => }/d_s_room.cpp (100%) rename src/d/{s => }/d_s_title.cpp (100%) rename src/d/{save => }/d_save.cpp (100%) rename src/d/{save => }/d_save_init.cpp (100%) diff --git a/config/GZLE01/rels/d_a_acorn_leaf/splits.txt b/config/GZLE01/rels/d_a_acorn_leaf/splits.txt index ffad599..ca5d024 100644 --- a/config/GZLE01/rels/d_a_acorn_leaf/splits.txt +++ b/config/GZLE01/rels/d_a_acorn_leaf/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_acorn_leaf.cpp: +d/actor/d_a_acorn_leaf.cpp: .text start:0x000000EC end:0x00000E60 .text start:0x00000E60 end:0x00000E60 .text start:0x00000E60 end:0x00000EDC diff --git a/config/GZLE01/rels/d_a_agbsw0/splits.txt b/config/GZLE01/rels/d_a_agbsw0/splits.txt index 87fc1da..d6e09b8 100644 --- a/config/GZLE01/rels/d_a_agbsw0/splits.txt +++ b/config/GZLE01/rels/d_a_agbsw0/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_agbsw0.cpp: +d/actor/d_a_agbsw0.cpp: .text start:0x00000078 end:0x000057B0 .rodata start:0x00000000 end:0x0000009D .data start:0x00000000 end:0x00000574 diff --git a/config/GZLE01/rels/d_a_alldie/splits.txt b/config/GZLE01/rels/d_a_alldie/splits.txt index c8988cc..3cfa7a3 100644 --- a/config/GZLE01/rels/d_a_alldie/splits.txt +++ b/config/GZLE01/rels/d_a_alldie/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_alldie.cpp: +d/actor/d_a_alldie.cpp: .text start:0x00000078 end:0x000002CC .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_am/splits.txt b/config/GZLE01/rels/d_a_am/splits.txt index a303c64..d8dadb8 100644 --- a/config/GZLE01/rels/d_a_am/splits.txt +++ b/config/GZLE01/rels/d_a_am/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_am.cpp: +d/actor/d_a_am.cpp: .text start:0x00000078 end:0x00004B00 .rodata start:0x00000000 end:0x000000B8 .data start:0x00000000 end:0x000004C4 diff --git a/config/GZLE01/rels/d_a_am2/splits.txt b/config/GZLE01/rels/d_a_am2/splits.txt index 98277b4..fa230f6 100644 --- a/config/GZLE01/rels/d_a_am2/splits.txt +++ b/config/GZLE01/rels/d_a_am2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_am2.cpp: +d/actor/d_a_am2.cpp: .text start:0x00000078 end:0x00004DA8 .rodata start:0x00000000 end:0x000000C2 .data start:0x00000000 end:0x000004D4 diff --git a/config/GZLE01/rels/d_a_amiprop/splits.txt b/config/GZLE01/rels/d_a_amiprop/splits.txt index 4a5ba7f..76ad829 100644 --- a/config/GZLE01/rels/d_a_amiprop/splits.txt +++ b/config/GZLE01/rels/d_a_amiprop/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_amiprop.cpp: +d/actor/d_a_amiprop.cpp: .text start:0x00000078 end:0x00000AB4 .rodata start:0x00000000 end:0x00000048 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLE01/rels/d_a_andsw0/splits.txt b/config/GZLE01/rels/d_a_andsw0/splits.txt index 40d87a2..0dd7c47 100644 --- a/config/GZLE01/rels/d_a_andsw0/splits.txt +++ b/config/GZLE01/rels/d_a_andsw0/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_andsw0.cpp: +d/actor/d_a_andsw0.cpp: .text start:0x00000078 end:0x00000A64 .data start:0x00000000 end:0x000000CC .bss start:0x00000000 end:0x00000020 diff --git a/config/GZLE01/rels/d_a_andsw2/splits.txt b/config/GZLE01/rels/d_a_andsw2/splits.txt index b2a9a8d..9593e49 100644 --- a/config/GZLE01/rels/d_a_andsw2/splits.txt +++ b/config/GZLE01/rels/d_a_andsw2/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_andsw2.cpp: +d/actor/d_a_andsw2.cpp: .text start:0x00000078 end:0x00000724 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLE01/rels/d_a_arrow_iceeff/splits.txt b/config/GZLE01/rels/d_a_arrow_iceeff/splits.txt index 5ef62aa..5354e8a 100644 --- a/config/GZLE01/rels/d_a_arrow_iceeff/splits.txt +++ b/config/GZLE01/rels/d_a_arrow_iceeff/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_arrow_iceeff.cpp: +d/actor/d_a_arrow_iceeff.cpp: .text start:0x000000EC end:0x00001058 .rodata start:0x00000000 end:0x00000083 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLE01/rels/d_a_arrow_lighteff/splits.txt b/config/GZLE01/rels/d_a_arrow_lighteff/splits.txt index 725bff5..fb141a3 100644 --- a/config/GZLE01/rels/d_a_arrow_lighteff/splits.txt +++ b/config/GZLE01/rels/d_a_arrow_lighteff/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_arrow_lighteff.cpp: +d/actor/d_a_arrow_lighteff.cpp: .text start:0x00000078 end:0x000011AC .rodata start:0x00000000 end:0x000000AE .data start:0x00000000 end:0x00000074 diff --git a/config/GZLE01/rels/d_a_atdoor/splits.txt b/config/GZLE01/rels/d_a_atdoor/splits.txt index ee6272e..d88c39d 100644 --- a/config/GZLE01/rels/d_a_atdoor/splits.txt +++ b/config/GZLE01/rels/d_a_atdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_atdoor.cpp: +d/actor/d_a_atdoor.cpp: .text start:0x00000078 end:0x0000072C .rodata start:0x00000000 end:0x00000039 .data start:0x00000000 end:0x00000064 diff --git a/config/GZLE01/rels/d_a_att/splits.txt b/config/GZLE01/rels/d_a_att/splits.txt index f106be8..5a3280a 100644 --- a/config/GZLE01/rels/d_a_att/splits.txt +++ b/config/GZLE01/rels/d_a_att/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_att.cpp: +d/actor/d_a_att.cpp: .text start:0x000000EC end:0x00000CE4 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000018 diff --git a/config/GZLE01/rels/d_a_auction/splits.txt b/config/GZLE01/rels/d_a_auction/splits.txt index 8418460..16da51a 100644 --- a/config/GZLE01/rels/d_a_auction/splits.txt +++ b/config/GZLE01/rels/d_a_auction/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_auction.cpp: +d/actor/d_a_auction.cpp: .text start:0x000000EC end:0x00003C90 .text start:0x00003C90 end:0x0000416C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_bb/splits.txt b/config/GZLE01/rels/d_a_bb/splits.txt index 0d96fc2..a7ba300 100644 --- a/config/GZLE01/rels/d_a_bb/splits.txt +++ b/config/GZLE01/rels/d_a_bb/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bb.cpp: +d/actor/d_a_bb.cpp: .text start:0x000000EC end:0x00008DF8 .text start:0x00008DF8 end:0x00008DF8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_bdk/splits.txt b/config/GZLE01/rels/d_a_bdk/splits.txt index dc8eeed..c7df2c9 100644 --- a/config/GZLE01/rels/d_a_bdk/splits.txt +++ b/config/GZLE01/rels/d_a_bdk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bdk.cpp: +d/actor/d_a_bdk.cpp: .text start:0x000000EC end:0x0000DDB4 .text start:0x0000DDB4 end:0x0000DDB4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_bdkobj/splits.txt b/config/GZLE01/rels/d_a_bdkobj/splits.txt index 1e47aed..f72343d 100644 --- a/config/GZLE01/rels/d_a_bdkobj/splits.txt +++ b/config/GZLE01/rels/d_a_bdkobj/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bdkobj.cpp: +d/actor/d_a_bdkobj.cpp: .text start:0x000000EC end:0x00002FA0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000E3 diff --git a/config/GZLE01/rels/d_a_beam/splits.txt b/config/GZLE01/rels/d_a_beam/splits.txt index 86a5ce7..e63fe7c 100644 --- a/config/GZLE01/rels/d_a_beam/splits.txt +++ b/config/GZLE01/rels/d_a_beam/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_beam.cpp: +d/actor/d_a_beam.cpp: .text start:0x000000EC end:0x00002CA0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000B2 diff --git a/config/GZLE01/rels/d_a_bflower/splits.txt b/config/GZLE01/rels/d_a_bflower/splits.txt index 664ebae..c412938 100644 --- a/config/GZLE01/rels/d_a_bflower/splits.txt +++ b/config/GZLE01/rels/d_a_bflower/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bflower.cpp: +d/actor/d_a_bflower.cpp: .text start:0x000000EC end:0x00001DFC .text start:0x00001DFC end:0x00001DFC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_bgn/splits.txt b/config/GZLE01/rels/d_a_bgn/splits.txt index ad89f12..aaa0e77 100644 --- a/config/GZLE01/rels/d_a_bgn/splits.txt +++ b/config/GZLE01/rels/d_a_bgn/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bgn.cpp: +d/actor/d_a_bgn.cpp: .text start:0x000000EC end:0x0000EE68 .text start:0x0000EE68 end:0x0000EE68 .text start:0x0000EE68 end:0x0000EEC4 diff --git a/config/GZLE01/rels/d_a_bgn2/splits.txt b/config/GZLE01/rels/d_a_bgn2/splits.txt index 6ff0cc6..806e721 100644 --- a/config/GZLE01/rels/d_a_bgn2/splits.txt +++ b/config/GZLE01/rels/d_a_bgn2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bgn2.cpp: +d/actor/d_a_bgn2.cpp: .text start:0x000000EC end:0x000049C4 .text start:0x000049C4 end:0x000049C4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_bgn3/splits.txt b/config/GZLE01/rels/d_a_bgn3/splits.txt index e810fd5..7433e5a 100644 --- a/config/GZLE01/rels/d_a_bgn3/splits.txt +++ b/config/GZLE01/rels/d_a_bgn3/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bgn3.cpp: +d/actor/d_a_bgn3.cpp: .text start:0x000000EC end:0x000055D0 .text start:0x000055D0 end:0x000055D0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_bigelf/splits.txt b/config/GZLE01/rels/d_a_bigelf/splits.txt index b703342..fc894fc 100644 --- a/config/GZLE01/rels/d_a_bigelf/splits.txt +++ b/config/GZLE01/rels/d_a_bigelf/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bigelf.cpp: +d/actor/d_a_bigelf.cpp: .text start:0x00000078 end:0x00003890 .text start:0x00003890 end:0x000038C8 .rodata start:0x00000000 end:0x000001FD diff --git a/config/GZLE01/rels/d_a_bita/splits.txt b/config/GZLE01/rels/d_a_bita/splits.txt index 41af952..6569835 100644 --- a/config/GZLE01/rels/d_a_bita/splits.txt +++ b/config/GZLE01/rels/d_a_bita/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bita.cpp: +d/actor/d_a_bita.cpp: .text start:0x00000078 end:0x000010D8 .rodata start:0x00000000 end:0x0000007A .data start:0x00000000 end:0x00000208 diff --git a/config/GZLE01/rels/d_a_bk/splits.txt b/config/GZLE01/rels/d_a_bk/splits.txt index c84d1c7..f01fca4 100644 --- a/config/GZLE01/rels/d_a_bk/splits.txt +++ b/config/GZLE01/rels/d_a_bk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bk.cpp: +d/actor/d_a_bk.cpp: .text start:0x000000EC end:0x0000F940 .text start:0x0000F940 end:0x0000F940 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_bl/splits.txt b/config/GZLE01/rels/d_a_bl/splits.txt index 5fe5d46..043633f 100644 --- a/config/GZLE01/rels/d_a_bl/splits.txt +++ b/config/GZLE01/rels/d_a_bl/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bl.cpp: +d/actor/d_a_bl.cpp: .text start:0x00000078 end:0x00006840 .text start:0x00006840 end:0x00006898 .rodata start:0x00000000 end:0x000000F9 diff --git a/config/GZLE01/rels/d_a_bmd/splits.txt b/config/GZLE01/rels/d_a_bmd/splits.txt index a2873b2..28eb431 100644 --- a/config/GZLE01/rels/d_a_bmd/splits.txt +++ b/config/GZLE01/rels/d_a_bmd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bmd.cpp: +d/actor/d_a_bmd.cpp: .text start:0x000000EC end:0x000074CC .text start:0x000074CC end:0x000074CC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_bmdfoot/splits.txt b/config/GZLE01/rels/d_a_bmdfoot/splits.txt index 98b9c34..67f911e 100644 --- a/config/GZLE01/rels/d_a_bmdfoot/splits.txt +++ b/config/GZLE01/rels/d_a_bmdfoot/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bmdfoot.cpp: +d/actor/d_a_bmdfoot.cpp: .text start:0x000000EC end:0x0000348C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000CA diff --git a/config/GZLE01/rels/d_a_bmdhand/splits.txt b/config/GZLE01/rels/d_a_bmdhand/splits.txt index aa5fa7c..30534b8 100644 --- a/config/GZLE01/rels/d_a_bmdhand/splits.txt +++ b/config/GZLE01/rels/d_a_bmdhand/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bmdhand.cpp: +d/actor/d_a_bmdhand.cpp: .text start:0x000000EC end:0x0000389C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000C7 diff --git a/config/GZLE01/rels/d_a_bo/splits.txt b/config/GZLE01/rels/d_a_bo/splits.txt index 8999a8d..feafd3c 100644 --- a/config/GZLE01/rels/d_a_bo/splits.txt +++ b/config/GZLE01/rels/d_a_bo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bo.cpp: +d/actor/d_a_bo.cpp: .text start:0x000000EC end:0x00005D38 .text start:0x00005D38 end:0x00005D90 .text start:0x00005D90 end:0x00006404 diff --git a/config/GZLE01/rels/d_a_boko/splits.txt b/config/GZLE01/rels/d_a_boko/splits.txt index cae4200..6e22243 100644 --- a/config/GZLE01/rels/d_a_boko/splits.txt +++ b/config/GZLE01/rels/d_a_boko/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_boko.cpp: +d/actor/d_a_boko.cpp: .text start:0x000000EC end:0x00004378 .text start:0x00004378 end:0x00004378 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_boss_item/splits.txt b/config/GZLE01/rels/d_a_boss_item/splits.txt index 4c19f29..18e049a 100644 --- a/config/GZLE01/rels/d_a_boss_item/splits.txt +++ b/config/GZLE01/rels/d_a_boss_item/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_boss_item.cpp: +d/actor/d_a_boss_item.cpp: .text start:0x00000078 end:0x00000128 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_bpw/splits.txt b/config/GZLE01/rels/d_a_bpw/splits.txt index a9b90fc..52f64b3 100644 --- a/config/GZLE01/rels/d_a_bpw/splits.txt +++ b/config/GZLE01/rels/d_a_bpw/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bpw.cpp: +d/actor/d_a_bpw.cpp: .text start:0x00000078 end:0x0000E308 .text start:0x0000E308 end:0x0000E494 .text start:0x0000E494 end:0x0000E600 diff --git a/config/GZLE01/rels/d_a_branch/splits.txt b/config/GZLE01/rels/d_a_branch/splits.txt index 519bbfd..3686cfc 100644 --- a/config/GZLE01/rels/d_a_branch/splits.txt +++ b/config/GZLE01/rels/d_a_branch/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_branch.cpp: +d/actor/d_a_branch.cpp: .text start:0x00000078 end:0x0000080C .rodata start:0x00000000 end:0x00000060 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLE01/rels/d_a_bridge/splits.txt b/config/GZLE01/rels/d_a_bridge/splits.txt index c17c404..48e3c01 100644 --- a/config/GZLE01/rels/d_a_bridge/splits.txt +++ b/config/GZLE01/rels/d_a_bridge/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bridge.cpp: +d/actor/d_a_bridge.cpp: .text start:0x00000078 end:0x00004CB4 .text start:0x00004CB4 end:0x00004CB4 .rodata start:0x00000000 end:0x00000169 diff --git a/config/GZLE01/rels/d_a_bst/splits.txt b/config/GZLE01/rels/d_a_bst/splits.txt index abad9e3..162d351 100644 --- a/config/GZLE01/rels/d_a_bst/splits.txt +++ b/config/GZLE01/rels/d_a_bst/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bst.cpp: +d/actor/d_a_bst.cpp: .text start:0x000000EC end:0x0000C528 .text start:0x0000C528 end:0x0000C528 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_btd/splits.txt b/config/GZLE01/rels/d_a_btd/splits.txt index 9aa3676..289061c 100644 --- a/config/GZLE01/rels/d_a_btd/splits.txt +++ b/config/GZLE01/rels/d_a_btd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_btd.cpp: +d/actor/d_a_btd.cpp: .text start:0x000000EC end:0x00009DD4 .text start:0x00009DD4 end:0x00009DD4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_bwd/splits.txt b/config/GZLE01/rels/d_a_bwd/splits.txt index 5ddf393..b0fb0a4 100644 --- a/config/GZLE01/rels/d_a_bwd/splits.txt +++ b/config/GZLE01/rels/d_a_bwd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bwd.cpp: +d/actor/d_a_bwd.cpp: .text start:0x000000EC end:0x0000A8E0 .text start:0x0000A8E0 end:0x0000A8E0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_bwdg/splits.txt b/config/GZLE01/rels/d_a_bwdg/splits.txt index 42fc08d..051a85b 100644 --- a/config/GZLE01/rels/d_a_bwdg/splits.txt +++ b/config/GZLE01/rels/d_a_bwdg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bwdg.cpp: +d/actor/d_a_bwdg.cpp: .text start:0x00000078 end:0x00000B88 .text start:0x00000B88 end:0x00000B88 .text start:0x00000B88 end:0x00000C2C diff --git a/config/GZLE01/rels/d_a_bwds/splits.txt b/config/GZLE01/rels/d_a_bwds/splits.txt index c8a8737..714ab28 100644 --- a/config/GZLE01/rels/d_a_bwds/splits.txt +++ b/config/GZLE01/rels/d_a_bwds/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bwds.cpp: +d/actor/d_a_bwds.cpp: .text start:0x000000EC end:0x00004088 .text start:0x00004088 end:0x00004088 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_canon/splits.txt b/config/GZLE01/rels/d_a_canon/splits.txt index 0f22ea0..2493fda 100644 --- a/config/GZLE01/rels/d_a_canon/splits.txt +++ b/config/GZLE01/rels/d_a_canon/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_canon.cpp: +d/actor/d_a_canon.cpp: .text start:0x000000EC end:0x00002A10 .text start:0x00002A10 end:0x00002A10 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_cc/splits.txt b/config/GZLE01/rels/d_a_cc/splits.txt index de01957..f4f5865 100644 --- a/config/GZLE01/rels/d_a_cc/splits.txt +++ b/config/GZLE01/rels/d_a_cc/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_cc.cpp: +d/actor/d_a_cc.cpp: .text start:0x00000078 end:0x00007CD8 .text start:0x00007CD8 end:0x00007CF4 .text start:0x00007CF4 end:0x00007CF4 diff --git a/config/GZLE01/rels/d_a_coming2/splits.txt b/config/GZLE01/rels/d_a_coming2/splits.txt index 17d22c8..0073391 100644 --- a/config/GZLE01/rels/d_a_coming2/splits.txt +++ b/config/GZLE01/rels/d_a_coming2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_coming2.cpp: +d/actor/d_a_coming2.cpp: .text start:0x000000EC end:0x0000244C .text start:0x0000244C end:0x00002684 .rodata start:0x00000000 end:0x0000005C diff --git a/config/GZLE01/rels/d_a_coming3/splits.txt b/config/GZLE01/rels/d_a_coming3/splits.txt index 57444c5..4c9895f 100644 --- a/config/GZLE01/rels/d_a_coming3/splits.txt +++ b/config/GZLE01/rels/d_a_coming3/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_coming3.cpp: +d/actor/d_a_coming3.cpp: .text start:0x000000EC end:0x00001EDC .text start:0x00001EDC end:0x000021E4 .rodata start:0x00000000 end:0x000000EA diff --git a/config/GZLE01/rels/d_a_dai/splits.txt b/config/GZLE01/rels/d_a_dai/splits.txt index 4489407..c1fc7f4 100644 --- a/config/GZLE01/rels/d_a_dai/splits.txt +++ b/config/GZLE01/rels/d_a_dai/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_dai.cpp: +d/actor/d_a_dai.cpp: .text start:0x00000078 end:0x00001130 .text start:0x00001130 end:0x00001130 .text start:0x00001130 end:0x00001250 diff --git a/config/GZLE01/rels/d_a_daiocta/splits.txt b/config/GZLE01/rels/d_a_daiocta/splits.txt index 0954e4a..9c22ecf 100644 --- a/config/GZLE01/rels/d_a_daiocta/splits.txt +++ b/config/GZLE01/rels/d_a_daiocta/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_daiocta.cpp: +d/actor/d_a_daiocta.cpp: .text start:0x000000EC end:0x00005630 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000038F diff --git a/config/GZLE01/rels/d_a_daiocta_eye/splits.txt b/config/GZLE01/rels/d_a_daiocta_eye/splits.txt index 7f4dbe6..06a8b57 100644 --- a/config/GZLE01/rels/d_a_daiocta_eye/splits.txt +++ b/config/GZLE01/rels/d_a_daiocta_eye/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_daiocta_eye.cpp: +d/actor/d_a_daiocta_eye.cpp: .text start:0x000000EC end:0x00001AF0 .text start:0x00001AF0 end:0x00001B80 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_deku_item/splits.txt b/config/GZLE01/rels/d_a_deku_item/splits.txt index 8abc176..21cef64 100644 --- a/config/GZLE01/rels/d_a_deku_item/splits.txt +++ b/config/GZLE01/rels/d_a_deku_item/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_deku_item.cpp: +d/actor/d_a_deku_item.cpp: .text start:0x00000078 end:0x000011A0 .rodata start:0x00000000 end:0x0000006C .data start:0x00000000 end:0x0000029C diff --git a/config/GZLE01/rels/d_a_demo_dk/splits.txt b/config/GZLE01/rels/d_a_demo_dk/splits.txt index ebf13c9..7878a9d 100644 --- a/config/GZLE01/rels/d_a_demo_dk/splits.txt +++ b/config/GZLE01/rels/d_a_demo_dk/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_demo_dk.cpp: +d/actor/d_a_demo_dk.cpp: .text start:0x00000078 end:0x00000714 .rodata start:0x00000000 end:0x0000002C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_demo_item/splits.txt b/config/GZLE01/rels/d_a_demo_item/splits.txt index c76341e..4c0e585 100644 --- a/config/GZLE01/rels/d_a_demo_item/splits.txt +++ b/config/GZLE01/rels/d_a_demo_item/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_demo_item.cpp: +d/actor/d_a_demo_item.cpp: .text start:0x000000EC end:0x00000F98 .rodata start:0x00000000 end:0x00000024 .data start:0x00000000 end:0x0000028C diff --git a/config/GZLE01/rels/d_a_demo_kmm/splits.txt b/config/GZLE01/rels/d_a_demo_kmm/splits.txt index cb79332..e0cbd8a 100644 --- a/config/GZLE01/rels/d_a_demo_kmm/splits.txt +++ b/config/GZLE01/rels/d_a_demo_kmm/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_demo_kmm.cpp: +d/actor/d_a_demo_kmm.cpp: .text start:0x00000078 end:0x00000520 .rodata start:0x00000000 end:0x00000018 .data start:0x00000000 end:0x00000054 diff --git a/config/GZLE01/rels/d_a_dk/splits.txt b/config/GZLE01/rels/d_a_dk/splits.txt index ee4e379..f27471a 100644 --- a/config/GZLE01/rels/d_a_dk/splits.txt +++ b/config/GZLE01/rels/d_a_dk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_dk.cpp: +d/actor/d_a_dk.cpp: .text start:0x000000EC end:0x0000148C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000B3 diff --git a/config/GZLE01/rels/d_a_door10/splits.txt b/config/GZLE01/rels/d_a_door10/splits.txt index febd4bb..6c9796b 100644 --- a/config/GZLE01/rels/d_a_door10/splits.txt +++ b/config/GZLE01/rels/d_a_door10/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_door10.cpp: +d/actor/d_a_door10.cpp: .text start:0x00000078 end:0x00001F5C .text start:0x00001F5C end:0x00002000 .rodata start:0x00000000 end:0x000000BC diff --git a/config/GZLE01/rels/d_a_door12/splits.txt b/config/GZLE01/rels/d_a_door12/splits.txt index de40197..eb09f71 100644 --- a/config/GZLE01/rels/d_a_door12/splits.txt +++ b/config/GZLE01/rels/d_a_door12/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_door12.cpp: +d/actor/d_a_door12.cpp: .text start:0x00000078 end:0x00001D3C .text start:0x00001D3C end:0x00001D3C .text start:0x00001D3C end:0x00001DE0 diff --git a/config/GZLE01/rels/d_a_dr/splits.txt b/config/GZLE01/rels/d_a_dr/splits.txt index 46db39c..9432b92 100644 --- a/config/GZLE01/rels/d_a_dr/splits.txt +++ b/config/GZLE01/rels/d_a_dr/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_dr.cpp: +d/actor/d_a_dr.cpp: .text start:0x000000EC end:0x00000D68 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000002C diff --git a/config/GZLE01/rels/d_a_dr2/splits.txt b/config/GZLE01/rels/d_a_dr2/splits.txt index 5a1660d..d566de7 100644 --- a/config/GZLE01/rels/d_a_dr2/splits.txt +++ b/config/GZLE01/rels/d_a_dr2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_dr2.cpp: +d/actor/d_a_dr2.cpp: .text start:0x000000EC end:0x000027E4 .text start:0x000027E4 end:0x00002800 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_dummy/splits.txt b/config/GZLE01/rels/d_a_dummy/splits.txt index 230798c..6dfe25c 100644 --- a/config/GZLE01/rels/d_a_dummy/splits.txt +++ b/config/GZLE01/rels/d_a_dummy/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_dummy.cpp: +d/actor/d_a_dummy.cpp: .text start:0x00000078 end:0x00000270 .text start:0x00000270 end:0x000002D0 .rodata start:0x00000000 end:0x0000000C diff --git a/config/GZLE01/rels/d_a_ep/splits.txt b/config/GZLE01/rels/d_a_ep/splits.txt index 34a9b6b..9c776c5 100644 --- a/config/GZLE01/rels/d_a_ep/splits.txt +++ b/config/GZLE01/rels/d_a_ep/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ep.cpp: +d/actor/d_a_ep.cpp: .text start:0x00000078 end:0x00003004 .text start:0x00003004 end:0x00003004 .rodata start:0x00000000 end:0x00000111 diff --git a/config/GZLE01/rels/d_a_fallrock/splits.txt b/config/GZLE01/rels/d_a_fallrock/splits.txt index bbf3a65..004ddcd 100644 --- a/config/GZLE01/rels/d_a_fallrock/splits.txt +++ b/config/GZLE01/rels/d_a_fallrock/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fallrock.cpp: +d/actor/d_a_fallrock.cpp: .text start:0x00000078 end:0x00001A2C .rodata start:0x00000000 end:0x00000099 .data start:0x00000000 end:0x000002B0 diff --git a/config/GZLE01/rels/d_a_fallrock_tag/splits.txt b/config/GZLE01/rels/d_a_fallrock_tag/splits.txt index 127337c..1112d31 100644 --- a/config/GZLE01/rels/d_a_fallrock_tag/splits.txt +++ b/config/GZLE01/rels/d_a_fallrock_tag/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fallrock_tag.cpp: +d/actor/d_a_fallrock_tag.cpp: .text start:0x00000078 end:0x000003E4 .rodata start:0x00000000 end:0x00000018 .data start:0x00000000 end:0x00000070 diff --git a/config/GZLE01/rels/d_a_fan/splits.txt b/config/GZLE01/rels/d_a_fan/splits.txt index 6648dd6..07b1b47 100644 --- a/config/GZLE01/rels/d_a_fan/splits.txt +++ b/config/GZLE01/rels/d_a_fan/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fan.cpp: +d/actor/d_a_fan.cpp: .text start:0x00000078 end:0x00001220 .text start:0x00001220 end:0x00001324 .rodata start:0x00000000 end:0x00000115 diff --git a/config/GZLE01/rels/d_a_ff/splits.txt b/config/GZLE01/rels/d_a_ff/splits.txt index b9181d1..81eb9f5 100644 --- a/config/GZLE01/rels/d_a_ff/splits.txt +++ b/config/GZLE01/rels/d_a_ff/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ff.cpp: +d/actor/d_a_ff.cpp: .text start:0x00000078 end:0x000019CC .rodata start:0x00000000 end:0x000000C2 .data start:0x00000000 end:0x00000248 diff --git a/config/GZLE01/rels/d_a_fganon/splits.txt b/config/GZLE01/rels/d_a_fganon/splits.txt index e6db673..b982377 100644 --- a/config/GZLE01/rels/d_a_fganon/splits.txt +++ b/config/GZLE01/rels/d_a_fganon/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_fganon.cpp: +d/actor/d_a_fganon.cpp: .text start:0x000000EC end:0x0000A788 .text start:0x0000A788 end:0x0000A788 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_fgmahou/splits.txt b/config/GZLE01/rels/d_a_fgmahou/splits.txt index 1e1e3ca..6404021 100644 --- a/config/GZLE01/rels/d_a_fgmahou/splits.txt +++ b/config/GZLE01/rels/d_a_fgmahou/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fgmahou.cpp: +d/actor/d_a_fgmahou.cpp: .text start:0x00000078 end:0x00001748 .rodata start:0x00000000 end:0x00000053 .data start:0x00000000 end:0x00000268 diff --git a/config/GZLE01/rels/d_a_fire/splits.txt b/config/GZLE01/rels/d_a_fire/splits.txt index d7fce6f..776da77 100644 --- a/config/GZLE01/rels/d_a_fire/splits.txt +++ b/config/GZLE01/rels/d_a_fire/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fire.cpp: +d/actor/d_a_fire.cpp: .text start:0x00000078 end:0x000017A0 .rodata start:0x00000000 end:0x00000095 .data start:0x00000000 end:0x0000026C diff --git a/config/GZLE01/rels/d_a_floor/splits.txt b/config/GZLE01/rels/d_a_floor/splits.txt index da77f2f..c20497c 100644 --- a/config/GZLE01/rels/d_a_floor/splits.txt +++ b/config/GZLE01/rels/d_a_floor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_floor.cpp: +d/actor/d_a_floor.cpp: .text start:0x00000078 end:0x00000774 .text start:0x00000774 end:0x0000078C .rodata start:0x00000000 end:0x00000066 diff --git a/config/GZLE01/rels/d_a_fm/splits.txt b/config/GZLE01/rels/d_a_fm/splits.txt index ac84ced..c27f2e9 100644 --- a/config/GZLE01/rels/d_a_fm/splits.txt +++ b/config/GZLE01/rels/d_a_fm/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_fm.cpp: +d/actor/d_a_fm.cpp: .text start:0x000000EC end:0x0000A548 .text start:0x0000A548 end:0x0000A614 .text start:0x0000A614 end:0x0000A630 diff --git a/config/GZLE01/rels/d_a_ghostship/splits.txt b/config/GZLE01/rels/d_a_ghostship/splits.txt index 1e3bd70..e0dcf87 100644 --- a/config/GZLE01/rels/d_a_ghostship/splits.txt +++ b/config/GZLE01/rels/d_a_ghostship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ghostship.cpp: +d/actor/d_a_ghostship.cpp: .text start:0x000000EC end:0x00001B40 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000138 diff --git a/config/GZLE01/rels/d_a_gm/splits.txt b/config/GZLE01/rels/d_a_gm/splits.txt index 32eea95..769cda3 100644 --- a/config/GZLE01/rels/d_a_gm/splits.txt +++ b/config/GZLE01/rels/d_a_gm/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gm.cpp: +d/actor/d_a_gm.cpp: .text start:0x000000EC end:0x00009068 .text start:0x00009068 end:0x00009338 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_gnd/splits.txt b/config/GZLE01/rels/d_a_gnd/splits.txt index 5204169..f02d05f 100644 --- a/config/GZLE01/rels/d_a_gnd/splits.txt +++ b/config/GZLE01/rels/d_a_gnd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gnd.cpp: +d/actor/d_a_gnd.cpp: .text start:0x000000EC end:0x00008D7C .text start:0x00008D7C end:0x00008D7C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_goal_flag/splits.txt b/config/GZLE01/rels/d_a_goal_flag/splits.txt index 149aa6a..689fba2 100644 --- a/config/GZLE01/rels/d_a_goal_flag/splits.txt +++ b/config/GZLE01/rels/d_a_goal_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_goal_flag.cpp: +d/actor/d_a_goal_flag.cpp: .text start:0x000000EC end:0x00002DC8 .text start:0x00002DC8 end:0x00002EB0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_grass/splits.txt b/config/GZLE01/rels/d_a_grass/splits.txt index a4fd27d..fc21afb 100644 --- a/config/GZLE01/rels/d_a_grass/splits.txt +++ b/config/GZLE01/rels/d_a_grass/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_grass.cpp: +d/actor/d_a_grass.cpp: .text start:0x000000EC end:0x0000151C .rodata start:0x00000000 end:0x00000008 .data start:0x00000000 end:0x00000090 diff --git a/config/GZLE01/rels/d_a_gy/splits.txt b/config/GZLE01/rels/d_a_gy/splits.txt index 8a07cd1..04c543d 100644 --- a/config/GZLE01/rels/d_a_gy/splits.txt +++ b/config/GZLE01/rels/d_a_gy/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gy.cpp: +d/actor/d_a_gy.cpp: .text start:0x000000EC end:0x00005FE4 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000282 diff --git a/config/GZLE01/rels/d_a_gy_ctrl/splits.txt b/config/GZLE01/rels/d_a_gy_ctrl/splits.txt index d8f492e..c624203 100644 --- a/config/GZLE01/rels/d_a_gy_ctrl/splits.txt +++ b/config/GZLE01/rels/d_a_gy_ctrl/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gy_ctrl.cpp: +d/actor/d_a_gy_ctrl.cpp: .text start:0x000000EC end:0x00001DCC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000080 diff --git a/config/GZLE01/rels/d_a_himo3/splits.txt b/config/GZLE01/rels/d_a_himo3/splits.txt index 56d4dfd..b1032bb 100644 --- a/config/GZLE01/rels/d_a_himo3/splits.txt +++ b/config/GZLE01/rels/d_a_himo3/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_himo3.cpp: +d/actor/d_a_himo3.cpp: .text start:0x000000EC end:0x00002D30 .text start:0x00002D30 end:0x00002DA4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_hitobj/splits.txt b/config/GZLE01/rels/d_a_hitobj/splits.txt index 6f0e8a1..2af5575 100644 --- a/config/GZLE01/rels/d_a_hitobj/splits.txt +++ b/config/GZLE01/rels/d_a_hitobj/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hitobj.cpp: +d/actor/d_a_hitobj.cpp: .text start:0x00000078 end:0x00000510 .rodata start:0x00000000 end:0x00000007 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLE01/rels/d_a_hmlif/splits.txt b/config/GZLE01/rels/d_a_hmlif/splits.txt index 1cf8d32..5bc99e4 100644 --- a/config/GZLE01/rels/d_a_hmlif/splits.txt +++ b/config/GZLE01/rels/d_a_hmlif/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hmlif.cpp: +d/actor/d_a_hmlif.cpp: .text start:0x00000078 end:0x000016A4 .text start:0x000016A4 end:0x00001870 .rodata start:0x00000000 end:0x00000150 diff --git a/config/GZLE01/rels/d_a_hot_floor/splits.txt b/config/GZLE01/rels/d_a_hot_floor/splits.txt index bb8f442..83ddba5 100644 --- a/config/GZLE01/rels/d_a_hot_floor/splits.txt +++ b/config/GZLE01/rels/d_a_hot_floor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hot_floor.cpp: +d/actor/d_a_hot_floor.cpp: .text start:0x00000078 end:0x00000614 .rodata start:0x00000000 end:0x00000020 .data start:0x00000000 end:0x00000074 diff --git a/config/GZLE01/rels/d_a_hys/splits.txt b/config/GZLE01/rels/d_a_hys/splits.txt index f9ac2b5..6dc33c0 100644 --- a/config/GZLE01/rels/d_a_hys/splits.txt +++ b/config/GZLE01/rels/d_a_hys/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hys.cpp: +d/actor/d_a_hys.cpp: .text start:0x00000078 end:0x00000C30 .text start:0x00000C30 end:0x00000DB4 .rodata start:0x00000000 end:0x00000066 diff --git a/config/GZLE01/rels/d_a_icelift/splits.txt b/config/GZLE01/rels/d_a_icelift/splits.txt index 3cebd56..0debd5f 100644 --- a/config/GZLE01/rels/d_a_icelift/splits.txt +++ b/config/GZLE01/rels/d_a_icelift/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_icelift.cpp: +d/actor/d_a_icelift.cpp: .text start:0x00000078 end:0x0000109C .rodata start:0x00000000 end:0x000000A0 .data start:0x00000000 end:0x0000007C diff --git a/config/GZLE01/rels/d_a_ikari/splits.txt b/config/GZLE01/rels/d_a_ikari/splits.txt index e1a0d83..5e26ffc 100644 --- a/config/GZLE01/rels/d_a_ikari/splits.txt +++ b/config/GZLE01/rels/d_a_ikari/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ikari.cpp: +d/actor/d_a_ikari.cpp: .text start:0x000000EC end:0x0000077C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000005A diff --git a/config/GZLE01/rels/d_a_jbo/splits.txt b/config/GZLE01/rels/d_a_jbo/splits.txt index 043da2c..2241803 100644 --- a/config/GZLE01/rels/d_a_jbo/splits.txt +++ b/config/GZLE01/rels/d_a_jbo/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_jbo.cpp: +d/actor/d_a_jbo.cpp: .text start:0x00000078 end:0x00000D44 .rodata start:0x00000000 end:0x00000028 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLE01/rels/d_a_kaji/splits.txt b/config/GZLE01/rels/d_a_kaji/splits.txt index a56787b..f095669 100644 --- a/config/GZLE01/rels/d_a_kaji/splits.txt +++ b/config/GZLE01/rels/d_a_kaji/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kaji.cpp: +d/actor/d_a_kaji.cpp: .text start:0x00000078 end:0x00000570 .rodata start:0x00000000 end:0x0000004A .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_kamome/splits.txt b/config/GZLE01/rels/d_a_kamome/splits.txt index 7e1c490..21ff718 100644 --- a/config/GZLE01/rels/d_a_kamome/splits.txt +++ b/config/GZLE01/rels/d_a_kamome/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_kamome.cpp: +d/actor/d_a_kamome.cpp: .text start:0x000000EC end:0x00005398 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000DA diff --git a/config/GZLE01/rels/d_a_kanban/splits.txt b/config/GZLE01/rels/d_a_kanban/splits.txt index 884fc69..607bf56 100644 --- a/config/GZLE01/rels/d_a_kanban/splits.txt +++ b/config/GZLE01/rels/d_a_kanban/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_kanban.cpp: +d/actor/d_a_kanban.cpp: .text start:0x000000EC end:0x00002EDC .text start:0x00002EDC end:0x00002EF8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_kantera/splits.txt b/config/GZLE01/rels/d_a_kantera/splits.txt index efd70d8..b3d029d 100644 --- a/config/GZLE01/rels/d_a_kantera/splits.txt +++ b/config/GZLE01/rels/d_a_kantera/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_kantera.cpp: +d/actor/d_a_kantera.cpp: .text start:0x000000EC end:0x00002784 .rodata start:0x00000000 end:0x00000129 .data start:0x00000000 end:0x0000025C diff --git a/config/GZLE01/rels/d_a_kb/splits.txt b/config/GZLE01/rels/d_a_kb/splits.txt index 2269d5a..b2cf5c4 100644 --- a/config/GZLE01/rels/d_a_kb/splits.txt +++ b/config/GZLE01/rels/d_a_kb/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kb.cpp: +d/actor/d_a_kb.cpp: .text start:0x00000078 end:0x00007F88 .text start:0x00007F88 end:0x00007F88 .rodata start:0x00000000 end:0x0000010F diff --git a/config/GZLE01/rels/d_a_kddoor/splits.txt b/config/GZLE01/rels/d_a_kddoor/splits.txt index b3e8c3e..4950175 100644 --- a/config/GZLE01/rels/d_a_kddoor/splits.txt +++ b/config/GZLE01/rels/d_a_kddoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kddoor.cpp: +d/actor/d_a_kddoor.cpp: .text start:0x00000078 end:0x00002E5C .text start:0x00002E5C end:0x00002FD8 .text start:0x00002FD8 end:0x0000307C diff --git a/config/GZLE01/rels/d_a_ki/splits.txt b/config/GZLE01/rels/d_a_ki/splits.txt index 8a180fc..3b237b6 100644 --- a/config/GZLE01/rels/d_a_ki/splits.txt +++ b/config/GZLE01/rels/d_a_ki/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ki.cpp: +d/actor/d_a_ki.cpp: .text start:0x000000EC end:0x00005364 .text start:0x00005364 end:0x00005364 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_kita/splits.txt b/config/GZLE01/rels/d_a_kita/splits.txt index b4a60a3..daa9082 100644 --- a/config/GZLE01/rels/d_a_kita/splits.txt +++ b/config/GZLE01/rels/d_a_kita/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kita.cpp: +d/actor/d_a_kita.cpp: .text start:0x00000078 end:0x000027CC .rodata start:0x00000000 end:0x000000D5 .data start:0x00000000 end:0x0000039C diff --git a/config/GZLE01/rels/d_a_klft/splits.txt b/config/GZLE01/rels/d_a_klft/splits.txt index 79e6200..ae839a5 100644 --- a/config/GZLE01/rels/d_a_klft/splits.txt +++ b/config/GZLE01/rels/d_a_klft/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_klft.cpp: +d/actor/d_a_klft.cpp: .text start:0x00000078 end:0x00002214 .rodata start:0x00000000 end:0x000000DA .data start:0x00000000 end:0x00000270 diff --git a/config/GZLE01/rels/d_a_kmon/splits.txt b/config/GZLE01/rels/d_a_kmon/splits.txt index 4b2c0db..bcdbd00 100644 --- a/config/GZLE01/rels/d_a_kmon/splits.txt +++ b/config/GZLE01/rels/d_a_kmon/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kmon.cpp: +d/actor/d_a_kmon.cpp: .text start:0x00000078 end:0x00000AB4 .rodata start:0x00000000 end:0x0000007E .data start:0x00000000 end:0x000000B0 diff --git a/config/GZLE01/rels/d_a_kn/splits.txt b/config/GZLE01/rels/d_a_kn/splits.txt index ddb8843..b939377 100644 --- a/config/GZLE01/rels/d_a_kn/splits.txt +++ b/config/GZLE01/rels/d_a_kn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kn.cpp: +d/actor/d_a_kn.cpp: .text start:0x00000078 end:0x00001330 .rodata start:0x00000000 end:0x0000009B .data start:0x00000000 end:0x0000009C diff --git a/config/GZLE01/rels/d_a_knob00/splits.txt b/config/GZLE01/rels/d_a_knob00/splits.txt index d71c4b0..a596423 100644 --- a/config/GZLE01/rels/d_a_knob00/splits.txt +++ b/config/GZLE01/rels/d_a_knob00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_knob00.cpp: +d/actor/d_a_knob00.cpp: .text start:0x00000078 end:0x00001F70 .text start:0x00001F70 end:0x00002014 .text start:0x00002014 end:0x00002014 diff --git a/config/GZLE01/rels/d_a_kokiie/splits.txt b/config/GZLE01/rels/d_a_kokiie/splits.txt index 557824c..4017d41 100644 --- a/config/GZLE01/rels/d_a_kokiie/splits.txt +++ b/config/GZLE01/rels/d_a_kokiie/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kokiie.cpp: +d/actor/d_a_kokiie.cpp: .text start:0x00000078 end:0x000014E8 .rodata start:0x00000000 end:0x00000102 .data start:0x00000000 end:0x00000148 diff --git a/config/GZLE01/rels/d_a_komore/splits.txt b/config/GZLE01/rels/d_a_komore/splits.txt index 84fd2d5..cccec59 100644 --- a/config/GZLE01/rels/d_a_komore/splits.txt +++ b/config/GZLE01/rels/d_a_komore/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_komore.cpp: +d/actor/d_a_komore.cpp: .text start:0x00000078 end:0x000005AC .text start:0x000005AC end:0x00000638 .rodata start:0x00000000 end:0x00000048 diff --git a/config/GZLE01/rels/d_a_ks/splits.txt b/config/GZLE01/rels/d_a_ks/splits.txt index 0381e8d..b45e7ba 100644 --- a/config/GZLE01/rels/d_a_ks/splits.txt +++ b/config/GZLE01/rels/d_a_ks/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ks.cpp: +d/actor/d_a_ks.cpp: .text start:0x00000078 end:0x00004580 .text start:0x00004580 end:0x000045B8 .text start:0x000045B8 end:0x000045B8 diff --git a/config/GZLE01/rels/d_a_kt/splits.txt b/config/GZLE01/rels/d_a_kt/splits.txt index b219acd..425cf3a 100644 --- a/config/GZLE01/rels/d_a_kt/splits.txt +++ b/config/GZLE01/rels/d_a_kt/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kt.cpp: +d/actor/d_a_kt.cpp: .text start:0x00000078 end:0x000015E8 .text start:0x000015E8 end:0x00001984 .rodata start:0x00000000 end:0x0000008B diff --git a/config/GZLE01/rels/d_a_kui/splits.txt b/config/GZLE01/rels/d_a_kui/splits.txt index ff7e7cf..97f088d 100644 --- a/config/GZLE01/rels/d_a_kui/splits.txt +++ b/config/GZLE01/rels/d_a_kui/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kui.cpp: +d/actor/d_a_kui.cpp: .text start:0x00000078 end:0x000018C8 .text start:0x000018C8 end:0x000018E4 .rodata start:0x00000000 end:0x00000099 diff --git a/config/GZLE01/rels/d_a_kytag00/splits.txt b/config/GZLE01/rels/d_a_kytag00/splits.txt index 92be9ee..596dbfe 100644 --- a/config/GZLE01/rels/d_a_kytag00/splits.txt +++ b/config/GZLE01/rels/d_a_kytag00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag00.cpp: +d/actor/d_a_kytag00.cpp: .text start:0x00000078 end:0x00000F8C .rodata start:0x00000000 end:0x0000004C .data start:0x00000000 end:0x00000080 diff --git a/config/GZLE01/rels/d_a_kytag01/splits.txt b/config/GZLE01/rels/d_a_kytag01/splits.txt index fbd6b40..72626a0 100644 --- a/config/GZLE01/rels/d_a_kytag01/splits.txt +++ b/config/GZLE01/rels/d_a_kytag01/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag01.cpp: +d/actor/d_a_kytag01.cpp: .text start:0x00000078 end:0x00000318 .rodata start:0x00000000 end:0x00000053 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_kytag02/splits.txt b/config/GZLE01/rels/d_a_kytag02/splits.txt index ee426fe..b04c749 100644 --- a/config/GZLE01/rels/d_a_kytag02/splits.txt +++ b/config/GZLE01/rels/d_a_kytag02/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag02.cpp: +d/actor/d_a_kytag02.cpp: .text start:0x00000078 end:0x0000047C .rodata start:0x00000000 end:0x00000028 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_kytag03/splits.txt b/config/GZLE01/rels/d_a_kytag03/splits.txt index 925d057..7319c98 100644 --- a/config/GZLE01/rels/d_a_kytag03/splits.txt +++ b/config/GZLE01/rels/d_a_kytag03/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag03.cpp: +d/actor/d_a_kytag03.cpp: .text start:0x00000078 end:0x00000604 .rodata start:0x00000000 end:0x0000000F .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_kytag04/splits.txt b/config/GZLE01/rels/d_a_kytag04/splits.txt index b44f370..3b6600a 100644 --- a/config/GZLE01/rels/d_a_kytag04/splits.txt +++ b/config/GZLE01/rels/d_a_kytag04/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag04.cpp: +d/actor/d_a_kytag04.cpp: .text start:0x00000078 end:0x00000208 .rodata start:0x00000000 end:0x00000004 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_kytag05/splits.txt b/config/GZLE01/rels/d_a_kytag05/splits.txt index a33a497..40d0c05 100644 --- a/config/GZLE01/rels/d_a_kytag05/splits.txt +++ b/config/GZLE01/rels/d_a_kytag05/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag05.cpp: +d/actor/d_a_kytag05.cpp: .text start:0x00000078 end:0x000004C0 .rodata start:0x00000000 end:0x00000057 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_kytag06/splits.txt b/config/GZLE01/rels/d_a_kytag06/splits.txt index 65a23f1..68d4fa5 100644 --- a/config/GZLE01/rels/d_a_kytag06/splits.txt +++ b/config/GZLE01/rels/d_a_kytag06/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag06.cpp: +d/actor/d_a_kytag06.cpp: .text start:0x00000078 end:0x00000224 .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_kytag07/splits.txt b/config/GZLE01/rels/d_a_kytag07/splits.txt index 474f793..22316d1 100644 --- a/config/GZLE01/rels/d_a_kytag07/splits.txt +++ b/config/GZLE01/rels/d_a_kytag07/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag07.cpp: +d/actor/d_a_kytag07.cpp: .text start:0x00000078 end:0x00000350 .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_lamp/splits.txt b/config/GZLE01/rels/d_a_lamp/splits.txt index 8bf2590..4f909d4 100644 --- a/config/GZLE01/rels/d_a_lamp/splits.txt +++ b/config/GZLE01/rels/d_a_lamp/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_lamp.cpp: +d/actor/d_a_lamp.cpp: .text start:0x000000EC end:0x00000BC8 .rodata start:0x00000000 end:0x00000082 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLE01/rels/d_a_lbridge/splits.txt b/config/GZLE01/rels/d_a_lbridge/splits.txt index b5147c5..4d3ddc3 100644 --- a/config/GZLE01/rels/d_a_lbridge/splits.txt +++ b/config/GZLE01/rels/d_a_lbridge/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lbridge.cpp: +d/actor/d_a_lbridge.cpp: .text start:0x00000078 end:0x00001140 .rodata start:0x00000000 end:0x00000099 .data start:0x00000000 end:0x00000080 diff --git a/config/GZLE01/rels/d_a_leaflift/splits.txt b/config/GZLE01/rels/d_a_leaflift/splits.txt index 8c2f221..f58886f 100644 --- a/config/GZLE01/rels/d_a_leaflift/splits.txt +++ b/config/GZLE01/rels/d_a_leaflift/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_leaflift.cpp: +d/actor/d_a_leaflift.cpp: .text start:0x000000EC end:0x00001360 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000081 diff --git a/config/GZLE01/rels/d_a_lod_bg/splits.txt b/config/GZLE01/rels/d_a_lod_bg/splits.txt index ca69008..32c5fd4 100644 --- a/config/GZLE01/rels/d_a_lod_bg/splits.txt +++ b/config/GZLE01/rels/d_a_lod_bg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lod_bg.cpp: +d/actor/d_a_lod_bg.cpp: .text start:0x00000078 end:0x0000133C .rodata start:0x00000000 end:0x000001DD .data start:0x00000000 end:0x000000C8 diff --git a/config/GZLE01/rels/d_a_lstair/splits.txt b/config/GZLE01/rels/d_a_lstair/splits.txt index bb0e40f..eb74440 100644 --- a/config/GZLE01/rels/d_a_lstair/splits.txt +++ b/config/GZLE01/rels/d_a_lstair/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lstair.cpp: +d/actor/d_a_lstair.cpp: .text start:0x00000078 end:0x000012D4 .rodata start:0x00000000 end:0x000000AF .data start:0x00000000 end:0x0000008C diff --git a/config/GZLE01/rels/d_a_lwood/splits.txt b/config/GZLE01/rels/d_a_lwood/splits.txt index 87270cb..712dfd3 100644 --- a/config/GZLE01/rels/d_a_lwood/splits.txt +++ b/config/GZLE01/rels/d_a_lwood/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lwood.cpp: +d/actor/d_a_lwood.cpp: .text start:0x00000078 end:0x00000794 .rodata start:0x00000000 end:0x00000074 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_machine/splits.txt b/config/GZLE01/rels/d_a_machine/splits.txt index 67cf140..c6b98e8 100644 --- a/config/GZLE01/rels/d_a_machine/splits.txt +++ b/config/GZLE01/rels/d_a_machine/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_machine.cpp: +d/actor/d_a_machine.cpp: .text start:0x00000078 end:0x000017A4 .rodata start:0x00000000 end:0x000000B1 .data start:0x00000000 end:0x000002A0 diff --git a/config/GZLE01/rels/d_a_magma/splits.txt b/config/GZLE01/rels/d_a_magma/splits.txt index 1bc26d2..5f6e463 100644 --- a/config/GZLE01/rels/d_a_magma/splits.txt +++ b/config/GZLE01/rels/d_a_magma/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_magma.cpp: +d/actor/d_a_magma.cpp: .text start:0x00000078 end:0x00000178 .rodata start:0x00000000 end:0x00000006 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_majuu_flag/splits.txt b/config/GZLE01/rels/d_a_majuu_flag/splits.txt index 4a156ab..5b291bf 100644 --- a/config/GZLE01/rels/d_a_majuu_flag/splits.txt +++ b/config/GZLE01/rels/d_a_majuu_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_majuu_flag.cpp: +d/actor/d_a_majuu_flag.cpp: .text start:0x000000EC end:0x00001C38 .text start:0x00001C38 end:0x00001D08 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_mant/splits.txt b/config/GZLE01/rels/d_a_mant/splits.txt index 61f1c2b..a68518d 100644 --- a/config/GZLE01/rels/d_a_mant/splits.txt +++ b/config/GZLE01/rels/d_a_mant/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mant.cpp: +d/actor/d_a_mant.cpp: .text start:0x000000EC end:0x0000229C .text start:0x0000229C end:0x0000233C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_mbdoor/splits.txt b/config/GZLE01/rels/d_a_mbdoor/splits.txt index 24a483e..17935b2 100644 --- a/config/GZLE01/rels/d_a_mbdoor/splits.txt +++ b/config/GZLE01/rels/d_a_mbdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mbdoor.cpp: +d/actor/d_a_mbdoor.cpp: .text start:0x00000078 end:0x000015F4 .text start:0x000015F4 end:0x000015F4 .rodata start:0x00000000 end:0x000000FB diff --git a/config/GZLE01/rels/d_a_mdoor/splits.txt b/config/GZLE01/rels/d_a_mdoor/splits.txt index 56f7087..af08c13 100644 --- a/config/GZLE01/rels/d_a_mdoor/splits.txt +++ b/config/GZLE01/rels/d_a_mdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mdoor.cpp: +d/actor/d_a_mdoor.cpp: .text start:0x00000078 end:0x00001128 .rodata start:0x00000000 end:0x000000A2 .data start:0x00000000 end:0x000000D8 diff --git a/config/GZLE01/rels/d_a_mflft/splits.txt b/config/GZLE01/rels/d_a_mflft/splits.txt index 3f8d714..11b3e80 100644 --- a/config/GZLE01/rels/d_a_mflft/splits.txt +++ b/config/GZLE01/rels/d_a_mflft/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mflft.cpp: +d/actor/d_a_mflft.cpp: .text start:0x00000078 end:0x00002E10 .rodata start:0x00000000 end:0x000000F6 .data start:0x00000000 end:0x00000300 diff --git a/config/GZLE01/rels/d_a_mgameboard/splits.txt b/config/GZLE01/rels/d_a_mgameboard/splits.txt index 0692b9b..ce80ca4 100644 --- a/config/GZLE01/rels/d_a_mgameboard/splits.txt +++ b/config/GZLE01/rels/d_a_mgameboard/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mgameboard.cpp: +d/actor/d_a_mgameboard.cpp: .text start:0x000000EC end:0x00002CB0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000FC diff --git a/config/GZLE01/rels/d_a_mmusic/splits.txt b/config/GZLE01/rels/d_a_mmusic/splits.txt index 9d86e94..ca72dc6 100644 --- a/config/GZLE01/rels/d_a_mmusic/splits.txt +++ b/config/GZLE01/rels/d_a_mmusic/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mmusic.cpp: +d/actor/d_a_mmusic.cpp: .text start:0x00000078 end:0x000005F0 .rodata start:0x00000000 end:0x0000001C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_mo2/splits.txt b/config/GZLE01/rels/d_a_mo2/splits.txt index 70d7c7e..04f2868 100644 --- a/config/GZLE01/rels/d_a_mo2/splits.txt +++ b/config/GZLE01/rels/d_a_mo2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mo2.cpp: +d/actor/d_a_mo2.cpp: .text start:0x000000EC end:0x0000D3A4 .text start:0x0000D3A4 end:0x0000D3A4 .text start:0x0000D3A4 end:0x0000D464 diff --git a/config/GZLE01/rels/d_a_movie_player/splits.txt b/config/GZLE01/rels/d_a_movie_player/splits.txt index c21b000..d33bc98 100644 --- a/config/GZLE01/rels/d_a_movie_player/splits.txt +++ b/config/GZLE01/rels/d_a_movie_player/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000020 -d/a/d_a_movie_player.cpp: +d/actor/d_a_movie_player.cpp: .text start:0x000000EC end:0x000068F4 .text start:0x000068F4 end:0x00006970 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_mozo/splits.txt b/config/GZLE01/rels/d_a_mozo/splits.txt index 24d180c..14b828a 100644 --- a/config/GZLE01/rels/d_a_mozo/splits.txt +++ b/config/GZLE01/rels/d_a_mozo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mozo.cpp: +d/actor/d_a_mozo.cpp: .text start:0x000000EC end:0x000027F8 .text start:0x000027F8 end:0x00002834 .text start:0x00002834 end:0x00002834 diff --git a/config/GZLE01/rels/d_a_msw/splits.txt b/config/GZLE01/rels/d_a_msw/splits.txt index 4a40723..1cc2165 100644 --- a/config/GZLE01/rels/d_a_msw/splits.txt +++ b/config/GZLE01/rels/d_a_msw/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_msw.cpp: +d/actor/d_a_msw.cpp: .text start:0x00000078 end:0x0000131C .rodata start:0x00000000 end:0x0000008C .data start:0x00000000 end:0x000001A8 diff --git a/config/GZLE01/rels/d_a_mt/splits.txt b/config/GZLE01/rels/d_a_mt/splits.txt index addfdee..75a0710 100644 --- a/config/GZLE01/rels/d_a_mt/splits.txt +++ b/config/GZLE01/rels/d_a_mt/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mt.cpp: +d/actor/d_a_mt.cpp: .text start:0x000000EC end:0x0000962C .text start:0x0000962C end:0x0000962C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_mtoge/splits.txt b/config/GZLE01/rels/d_a_mtoge/splits.txt index a2a41b4..93314ce 100644 --- a/config/GZLE01/rels/d_a_mtoge/splits.txt +++ b/config/GZLE01/rels/d_a_mtoge/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mtoge.cpp: +d/actor/d_a_mtoge.cpp: .text start:0x00000078 end:0x000007B0 .rodata start:0x00000000 end:0x00000044 .data start:0x00000000 end:0x00000064 diff --git a/config/GZLE01/rels/d_a_npc_ac1/splits.txt b/config/GZLE01/rels/d_a_npc_ac1/splits.txt index a19ec17..6b35286 100644 --- a/config/GZLE01/rels/d_a_npc_ac1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_ac1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ac1.cpp: +d/actor/d_a_npc_ac1.cpp: .text start:0x000000EC end:0x0000328C .text start:0x0000328C end:0x000032A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_ah/splits.txt b/config/GZLE01/rels/d_a_npc_ah/splits.txt index 36d6db2..4e15a9e 100644 --- a/config/GZLE01/rels/d_a_npc_ah/splits.txt +++ b/config/GZLE01/rels/d_a_npc_ah/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_ah.cpp: +d/actor/d_a_npc_ah.cpp: .text start:0x00000078 end:0x000025EC .text start:0x000025EC end:0x0000261C .text start:0x0000261C end:0x000026E8 diff --git a/config/GZLE01/rels/d_a_npc_aj1/splits.txt b/config/GZLE01/rels/d_a_npc_aj1/splits.txt index 7555ca1..5c95b2d 100644 --- a/config/GZLE01/rels/d_a_npc_aj1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_aj1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_aj1.cpp: +d/actor/d_a_npc_aj1.cpp: .text start:0x000000EC end:0x000042DC .text start:0x000042DC end:0x000042F0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_auction/splits.txt b/config/GZLE01/rels/d_a_npc_auction/splits.txt index 366b494..bdaf6e2 100644 --- a/config/GZLE01/rels/d_a_npc_auction/splits.txt +++ b/config/GZLE01/rels/d_a_npc_auction/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_auction.cpp: +d/actor/d_a_npc_auction.cpp: .text start:0x000000EC end:0x00002F1C .text start:0x00002F1C end:0x00003E70 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_ba1/splits.txt b/config/GZLE01/rels/d_a_npc_ba1/splits.txt index d071164..f21eb58 100644 --- a/config/GZLE01/rels/d_a_npc_ba1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_ba1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ba1.cpp: +d/actor/d_a_npc_ba1.cpp: .text start:0x000000EC end:0x00004AA4 .text start:0x00004AA4 end:0x00004AA4 .text start:0x00004AA4 end:0x00004AB8 diff --git a/config/GZLE01/rels/d_a_npc_bj1/splits.txt b/config/GZLE01/rels/d_a_npc_bj1/splits.txt index b2cb4f1..02b8a6d 100644 --- a/config/GZLE01/rels/d_a_npc_bj1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_bj1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bj1.cpp: +d/actor/d_a_npc_bj1.cpp: .text start:0x000000EC end:0x000074B8 .text start:0x000074B8 end:0x000074CC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_bm1/splits.txt b/config/GZLE01/rels/d_a_npc_bm1/splits.txt index 4a972b4..13f31fc 100644 --- a/config/GZLE01/rels/d_a_npc_bm1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_bm1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bm1.cpp: +d/actor/d_a_npc_bm1.cpp: .text start:0x000000EC end:0x00009810 .text start:0x00009810 end:0x00009824 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_bmcon1/splits.txt b/config/GZLE01/rels/d_a_npc_bmcon1/splits.txt index e415d3c..9eaac60 100644 --- a/config/GZLE01/rels/d_a_npc_bmcon1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_bmcon1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bmcon1.cpp: +d/actor/d_a_npc_bmcon1.cpp: .text start:0x000000EC end:0x000040B0 .text start:0x000040B0 end:0x000040E0 .text start:0x000040E0 end:0x0000429C diff --git a/config/GZLE01/rels/d_a_npc_bms1/splits.txt b/config/GZLE01/rels/d_a_npc_bms1/splits.txt index c126732..7e30814 100644 --- a/config/GZLE01/rels/d_a_npc_bms1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_bms1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bms1.cpp: +d/actor/d_a_npc_bms1.cpp: .text start:0x000000EC end:0x00004764 .text start:0x00004764 end:0x000047AC .text start:0x000047AC end:0x00004820 diff --git a/config/GZLE01/rels/d_a_npc_bmsw/splits.txt b/config/GZLE01/rels/d_a_npc_bmsw/splits.txt index 93ba916..c83a124 100644 --- a/config/GZLE01/rels/d_a_npc_bmsw/splits.txt +++ b/config/GZLE01/rels/d_a_npc_bmsw/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bmsw.cpp: +d/actor/d_a_npc_bmsw.cpp: .text start:0x000000EC end:0x00005234 .text start:0x00005234 end:0x00005290 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_bs1/splits.txt b/config/GZLE01/rels/d_a_npc_bs1/splits.txt index 08f4f0d..2027465 100644 --- a/config/GZLE01/rels/d_a_npc_bs1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_bs1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bs1.cpp: +d/actor/d_a_npc_bs1.cpp: .text start:0x000000EC end:0x00005800 .text start:0x00005800 end:0x00005848 .text start:0x00005848 end:0x000058BC diff --git a/config/GZLE01/rels/d_a_npc_btsw/splits.txt b/config/GZLE01/rels/d_a_npc_btsw/splits.txt index 385c648..c413c45 100644 --- a/config/GZLE01/rels/d_a_npc_btsw/splits.txt +++ b/config/GZLE01/rels/d_a_npc_btsw/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_btsw.cpp: +d/actor/d_a_npc_btsw.cpp: .text start:0x000000EC end:0x00004CB0 .text start:0x00004CB0 end:0x00004D0C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_btsw2/splits.txt b/config/GZLE01/rels/d_a_npc_btsw2/splits.txt index 4ee6240..27be6e0 100644 --- a/config/GZLE01/rels/d_a_npc_btsw2/splits.txt +++ b/config/GZLE01/rels/d_a_npc_btsw2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_btsw2.cpp: +d/actor/d_a_npc_btsw2.cpp: .text start:0x000000EC end:0x000022EC .text start:0x000022EC end:0x00002348 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_cb1/splits.txt b/config/GZLE01/rels/d_a_npc_cb1/splits.txt index 6096771..2045b78 100644 --- a/config/GZLE01/rels/d_a_npc_cb1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_cb1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_cb1.cpp: +d/actor/d_a_npc_cb1.cpp: .text start:0x000000EC end:0x00009AB4 .text start:0x00009AB4 end:0x00009AFC .text start:0x00009AFC end:0x0000A19C diff --git a/config/GZLE01/rels/d_a_npc_co1/splits.txt b/config/GZLE01/rels/d_a_npc_co1/splits.txt index fc33365..24b7084 100644 --- a/config/GZLE01/rels/d_a_npc_co1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_co1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_co1.cpp: +d/actor/d_a_npc_co1.cpp: .text start:0x000000EC end:0x00003A10 .text start:0x00003A10 end:0x00003A24 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_de1/splits.txt b/config/GZLE01/rels/d_a_npc_de1/splits.txt index 8f03615..efe7849 100644 --- a/config/GZLE01/rels/d_a_npc_de1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_de1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_de1.cpp: +d/actor/d_a_npc_de1.cpp: .text start:0x000000EC end:0x00002F54 .text start:0x00002F54 end:0x00002F54 .text start:0x00002F54 end:0x00002F58 diff --git a/config/GZLE01/rels/d_a_npc_ds1/splits.txt b/config/GZLE01/rels/d_a_npc_ds1/splits.txt index 3dda44e..8ee7775 100644 --- a/config/GZLE01/rels/d_a_npc_ds1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_ds1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ds1.cpp: +d/actor/d_a_npc_ds1.cpp: .text start:0x000000EC end:0x00005768 .text start:0x00005768 end:0x000057B0 .text start:0x000057B0 end:0x00005824 diff --git a/config/GZLE01/rels/d_a_npc_gk1/splits.txt b/config/GZLE01/rels/d_a_npc_gk1/splits.txt index 5302892..e274721 100644 --- a/config/GZLE01/rels/d_a_npc_gk1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_gk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_gk1.cpp: +d/actor/d_a_npc_gk1.cpp: .text start:0x000000EC end:0x00002FF0 .text start:0x00002FF0 end:0x00003004 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_gp1/splits.txt b/config/GZLE01/rels/d_a_npc_gp1/splits.txt index 09e3fe5..daa9d17 100644 --- a/config/GZLE01/rels/d_a_npc_gp1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_gp1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_gp1.cpp: +d/actor/d_a_npc_gp1.cpp: .text start:0x000000EC end:0x00003BE8 .text start:0x00003BE8 end:0x00003BFC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_hi1/splits.txt b/config/GZLE01/rels/d_a_npc_hi1/splits.txt index 387fa72..115b71b 100644 --- a/config/GZLE01/rels/d_a_npc_hi1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_hi1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_hi1.cpp: +d/actor/d_a_npc_hi1.cpp: .text start:0x000000EC end:0x00002AB0 .text start:0x00002AB0 end:0x00002AC4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_ho/splits.txt b/config/GZLE01/rels/d_a_npc_ho/splits.txt index eaa6c18..3651e35 100644 --- a/config/GZLE01/rels/d_a_npc_ho/splits.txt +++ b/config/GZLE01/rels/d_a_npc_ho/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_ho.cpp: +d/actor/d_a_npc_ho.cpp: .text start:0x00000078 end:0x00002934 .text start:0x00002934 end:0x0000296C .rodata start:0x00000000 end:0x00000108 diff --git a/config/GZLE01/rels/d_a_npc_hr/splits.txt b/config/GZLE01/rels/d_a_npc_hr/splits.txt index 20d9ce7..7b813ac 100644 --- a/config/GZLE01/rels/d_a_npc_hr/splits.txt +++ b/config/GZLE01/rels/d_a_npc_hr/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_hr.cpp: +d/actor/d_a_npc_hr.cpp: .text start:0x00000078 end:0x00005F84 .text start:0x00005F84 end:0x00005F84 .text start:0x00005F84 end:0x00005FBC diff --git a/config/GZLE01/rels/d_a_npc_jb1/splits.txt b/config/GZLE01/rels/d_a_npc_jb1/splits.txt index be56eb5..ab80bb0 100644 --- a/config/GZLE01/rels/d_a_npc_jb1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_jb1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_jb1.cpp: +d/actor/d_a_npc_jb1.cpp: .text start:0x000000EC end:0x00001E38 .text start:0x00001E38 end:0x00001E4C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_ji1/splits.txt b/config/GZLE01/rels/d_a_npc_ji1/splits.txt index fadf505..c42423c 100644 --- a/config/GZLE01/rels/d_a_npc_ji1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_ji1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ji1.cpp: +d/actor/d_a_npc_ji1.cpp: .text start:0x000000EC end:0x000124D8 .text start:0x000124D8 end:0x000124F4 .text start:0x000124F4 end:0x00012510 diff --git a/config/GZLE01/rels/d_a_npc_kamome/splits.txt b/config/GZLE01/rels/d_a_npc_kamome/splits.txt index 654f9f2..23bce03 100644 --- a/config/GZLE01/rels/d_a_npc_kamome/splits.txt +++ b/config/GZLE01/rels/d_a_npc_kamome/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kamome.cpp: +d/actor/d_a_npc_kamome.cpp: .text start:0x000000EC end:0x000049DC .text start:0x000049DC end:0x00004AD4 .text start:0x00004AD4 end:0x00004CC0 diff --git a/config/GZLE01/rels/d_a_npc_kf1/splits.txt b/config/GZLE01/rels/d_a_npc_kf1/splits.txt index a66ecd7..e6736f4 100644 --- a/config/GZLE01/rels/d_a_npc_kf1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_kf1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kf1.cpp: +d/actor/d_a_npc_kf1.cpp: .text start:0x000000EC end:0x00004760 .text start:0x00004760 end:0x00004774 .text start:0x00004774 end:0x00004884 diff --git a/config/GZLE01/rels/d_a_npc_kg1/splits.txt b/config/GZLE01/rels/d_a_npc_kg1/splits.txt index 0aea378..c72f2bc 100644 --- a/config/GZLE01/rels/d_a_npc_kg1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_kg1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kg1.cpp: +d/actor/d_a_npc_kg1.cpp: .text start:0x000000EC end:0x00002A34 .text start:0x00002A34 end:0x00002ABC .text start:0x00002ABC end:0x00002ABC diff --git a/config/GZLE01/rels/d_a_npc_kg2/splits.txt b/config/GZLE01/rels/d_a_npc_kg2/splits.txt index d0581aa..5c00571 100644 --- a/config/GZLE01/rels/d_a_npc_kg2/splits.txt +++ b/config/GZLE01/rels/d_a_npc_kg2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kg2.cpp: +d/actor/d_a_npc_kg2.cpp: .text start:0x000000EC end:0x000031F4 .text start:0x000031F4 end:0x00003250 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_kk1/splits.txt b/config/GZLE01/rels/d_a_npc_kk1/splits.txt index 245822e..b978349 100644 --- a/config/GZLE01/rels/d_a_npc_kk1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_kk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kk1.cpp: +d/actor/d_a_npc_kk1.cpp: .text start:0x000000EC end:0x00006948 .text start:0x00006948 end:0x00006948 .text start:0x00006948 end:0x0000695C diff --git a/config/GZLE01/rels/d_a_npc_km1/splits.txt b/config/GZLE01/rels/d_a_npc_km1/splits.txt index 66de594..36925d1 100644 --- a/config/GZLE01/rels/d_a_npc_km1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_km1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_km1.cpp: +d/actor/d_a_npc_km1.cpp: .text start:0x000000EC end:0x0000238C .text start:0x0000238C end:0x000023A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_ko1/splits.txt b/config/GZLE01/rels/d_a_npc_ko1/splits.txt index e7b917d..8deb91b 100644 --- a/config/GZLE01/rels/d_a_npc_ko1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_ko1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ko1.cpp: +d/actor/d_a_npc_ko1.cpp: .text start:0x000000EC end:0x00008948 .text start:0x00008948 end:0x0000895C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_kp1/splits.txt b/config/GZLE01/rels/d_a_npc_kp1/splits.txt index 2e42cdd..9f2230d 100644 --- a/config/GZLE01/rels/d_a_npc_kp1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_kp1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kp1.cpp: +d/actor/d_a_npc_kp1.cpp: .text start:0x000000EC end:0x00002D5C .text start:0x00002D5C end:0x00002D70 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_ls1/splits.txt b/config/GZLE01/rels/d_a_npc_ls1/splits.txt index 9fbe874..70545e8 100644 --- a/config/GZLE01/rels/d_a_npc_ls1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_ls1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ls1.cpp: +d/actor/d_a_npc_ls1.cpp: .text start:0x000000EC end:0x00005880 .text start:0x00005880 end:0x00005880 .text start:0x00005880 end:0x00005894 diff --git a/config/GZLE01/rels/d_a_npc_md/splits.txt b/config/GZLE01/rels/d_a_npc_md/splits.txt index 9d9dd58..c482cd5 100644 --- a/config/GZLE01/rels/d_a_npc_md/splits.txt +++ b/config/GZLE01/rels/d_a_npc_md/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_md.cpp: +d/actor/d_a_npc_md.cpp: .text start:0x000000EC end:0x000118C4 .text start:0x000118C4 end:0x0001190C .text start:0x0001190C end:0x000119A8 diff --git a/config/GZLE01/rels/d_a_npc_mk/splits.txt b/config/GZLE01/rels/d_a_npc_mk/splits.txt index 7dd5d63..3d4797c 100644 --- a/config/GZLE01/rels/d_a_npc_mk/splits.txt +++ b/config/GZLE01/rels/d_a_npc_mk/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_mk.cpp: +d/actor/d_a_npc_mk.cpp: .text start:0x00000078 end:0x00004C38 .text start:0x00004C38 end:0x00004C70 .rodata start:0x00000000 end:0x00000227 diff --git a/config/GZLE01/rels/d_a_npc_mn/splits.txt b/config/GZLE01/rels/d_a_npc_mn/splits.txt index 6f33208..b1c9801 100644 --- a/config/GZLE01/rels/d_a_npc_mn/splits.txt +++ b/config/GZLE01/rels/d_a_npc_mn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_mn.cpp: +d/actor/d_a_npc_mn.cpp: .text start:0x00000078 end:0x00003F9C .text start:0x00003F9C end:0x00003FCC .text start:0x00003FCC end:0x00004128 diff --git a/config/GZLE01/rels/d_a_npc_mt/splits.txt b/config/GZLE01/rels/d_a_npc_mt/splits.txt index d79aed9..7d3263c 100644 --- a/config/GZLE01/rels/d_a_npc_mt/splits.txt +++ b/config/GZLE01/rels/d_a_npc_mt/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_mt.cpp: +d/actor/d_a_npc_mt.cpp: .text start:0x00000078 end:0x00003000 .text start:0x00003000 end:0x00003030 .text start:0x00003030 end:0x000030E0 diff --git a/config/GZLE01/rels/d_a_npc_nz/splits.txt b/config/GZLE01/rels/d_a_npc_nz/splits.txt index 7b1a863..b951be7 100644 --- a/config/GZLE01/rels/d_a_npc_nz/splits.txt +++ b/config/GZLE01/rels/d_a_npc_nz/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_nz.cpp: +d/actor/d_a_npc_nz.cpp: .text start:0x000000EC end:0x000032BC .text start:0x000032BC end:0x00004554 .text start:0x00004554 end:0x00004554 diff --git a/config/GZLE01/rels/d_a_npc_ob1/splits.txt b/config/GZLE01/rels/d_a_npc_ob1/splits.txt index 93c7f00..f52a8e5 100644 --- a/config/GZLE01/rels/d_a_npc_ob1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_ob1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ob1.cpp: +d/actor/d_a_npc_ob1.cpp: .text start:0x000000EC end:0x00003EAC .text start:0x00003EAC end:0x00003EC0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_os/splits.txt b/config/GZLE01/rels/d_a_npc_os/splits.txt index dc56fa5..af4de04 100644 --- a/config/GZLE01/rels/d_a_npc_os/splits.txt +++ b/config/GZLE01/rels/d_a_npc_os/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_os.cpp: +d/actor/d_a_npc_os.cpp: .text start:0x000000EC end:0x000074CC .text start:0x000074CC end:0x00007514 .text start:0x00007514 end:0x00007B48 diff --git a/config/GZLE01/rels/d_a_npc_p1/splits.txt b/config/GZLE01/rels/d_a_npc_p1/splits.txt index 9e9efbd..6f2cde8 100644 --- a/config/GZLE01/rels/d_a_npc_p1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_p1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_p1.cpp: +d/actor/d_a_npc_p1.cpp: .text start:0x000000EC end:0x00004F14 .text start:0x00004F14 end:0x00004F30 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_p2/splits.txt b/config/GZLE01/rels/d_a_npc_p2/splits.txt index aa1787c..e5e5d46 100644 --- a/config/GZLE01/rels/d_a_npc_p2/splits.txt +++ b/config/GZLE01/rels/d_a_npc_p2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_p2.cpp: +d/actor/d_a_npc_p2.cpp: .text start:0x000000EC end:0x000051D4 .text start:0x000051D4 end:0x00005238 .text start:0x00005238 end:0x00008400 diff --git a/config/GZLE01/rels/d_a_npc_people/splits.txt b/config/GZLE01/rels/d_a_npc_people/splits.txt index 7331e7a..834e584 100644 --- a/config/GZLE01/rels/d_a_npc_people/splits.txt +++ b/config/GZLE01/rels/d_a_npc_people/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_people.cpp: +d/actor/d_a_npc_people.cpp: .text start:0x00000078 end:0x00009B90 .text start:0x00009B90 end:0x00009BB4 .text start:0x00009BB4 end:0x00009BFC diff --git a/config/GZLE01/rels/d_a_npc_pf1/splits.txt b/config/GZLE01/rels/d_a_npc_pf1/splits.txt index 50f23bc..2e70056 100644 --- a/config/GZLE01/rels/d_a_npc_pf1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_pf1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_pf1.cpp: +d/actor/d_a_npc_pf1.cpp: .text start:0x000000EC end:0x00003AE0 .text start:0x00003AE0 end:0x00003AF4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_photo/splits.txt b/config/GZLE01/rels/d_a_npc_photo/splits.txt index 09e1a7d..96b0a18 100644 --- a/config/GZLE01/rels/d_a_npc_photo/splits.txt +++ b/config/GZLE01/rels/d_a_npc_photo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_photo.cpp: +d/actor/d_a_npc_photo.cpp: .text start:0x000000EC end:0x00004FF8 .text start:0x00004FF8 end:0x00005040 .text start:0x00005040 end:0x00005070 diff --git a/config/GZLE01/rels/d_a_npc_pm1/splits.txt b/config/GZLE01/rels/d_a_npc_pm1/splits.txt index fe31f87..874b80d 100644 --- a/config/GZLE01/rels/d_a_npc_pm1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_pm1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_pm1.cpp: +d/actor/d_a_npc_pm1.cpp: .text start:0x000000EC end:0x0000239C .text start:0x0000239C end:0x000023B0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_roten/splits.txt b/config/GZLE01/rels/d_a_npc_roten/splits.txt index cf10b6b..5fac535 100644 --- a/config/GZLE01/rels/d_a_npc_roten/splits.txt +++ b/config/GZLE01/rels/d_a_npc_roten/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_roten.cpp: +d/actor/d_a_npc_roten.cpp: .text start:0x00000078 end:0x00003F9C .text start:0x00003F9C end:0x00003FB8 .text start:0x00003FB8 end:0x000042C0 diff --git a/config/GZLE01/rels/d_a_npc_rsh1/splits.txt b/config/GZLE01/rels/d_a_npc_rsh1/splits.txt index 79e827f..bcbddac 100644 --- a/config/GZLE01/rels/d_a_npc_rsh1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_rsh1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_rsh1.cpp: +d/actor/d_a_npc_rsh1.cpp: .text start:0x000000EC end:0x00004F98 .text start:0x00004F98 end:0x00004FE0 .text start:0x00004FE0 end:0x00005018 diff --git a/config/GZLE01/rels/d_a_npc_sarace/splits.txt b/config/GZLE01/rels/d_a_npc_sarace/splits.txt index d5962fd..6e3b517 100644 --- a/config/GZLE01/rels/d_a_npc_sarace/splits.txt +++ b/config/GZLE01/rels/d_a_npc_sarace/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_sarace.cpp: +d/actor/d_a_npc_sarace.cpp: .text start:0x000000EC end:0x00002818 .text start:0x00002818 end:0x00002874 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_so/splits.txt b/config/GZLE01/rels/d_a_npc_so/splits.txt index 830541c..ce4d93e 100644 --- a/config/GZLE01/rels/d_a_npc_so/splits.txt +++ b/config/GZLE01/rels/d_a_npc_so/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_so.cpp: +d/actor/d_a_npc_so.cpp: .text start:0x000000EC end:0x00004BE0 .text start:0x00004BE0 end:0x00004C28 .text start:0x00004C28 end:0x00004CE8 diff --git a/config/GZLE01/rels/d_a_npc_sv/splits.txt b/config/GZLE01/rels/d_a_npc_sv/splits.txt index 92e216f..b6d7be8 100644 --- a/config/GZLE01/rels/d_a_npc_sv/splits.txt +++ b/config/GZLE01/rels/d_a_npc_sv/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_sv.cpp: +d/actor/d_a_npc_sv.cpp: .text start:0x00000078 end:0x00002C0C .text start:0x00002C0C end:0x00002C28 .text start:0x00002C28 end:0x00002C58 diff --git a/config/GZLE01/rels/d_a_npc_tc/splits.txt b/config/GZLE01/rels/d_a_npc_tc/splits.txt index a2ed88d..40da27d 100644 --- a/config/GZLE01/rels/d_a_npc_tc/splits.txt +++ b/config/GZLE01/rels/d_a_npc_tc/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_tc.cpp: +d/actor/d_a_npc_tc.cpp: .text start:0x000000EC end:0x00004BAC .text start:0x00004BAC end:0x00005158 .text start:0x00005158 end:0x00005498 diff --git a/config/GZLE01/rels/d_a_npc_tt/splits.txt b/config/GZLE01/rels/d_a_npc_tt/splits.txt index 2f49b20..3a06d97 100644 --- a/config/GZLE01/rels/d_a_npc_tt/splits.txt +++ b/config/GZLE01/rels/d_a_npc_tt/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_tt.cpp: +d/actor/d_a_npc_tt.cpp: .text start:0x00000078 end:0x00002C60 .text start:0x00002C60 end:0x00002CD4 .text start:0x00002CD4 end:0x00003210 diff --git a/config/GZLE01/rels/d_a_npc_uk/splits.txt b/config/GZLE01/rels/d_a_npc_uk/splits.txt index 2037503..aad16a6 100644 --- a/config/GZLE01/rels/d_a_npc_uk/splits.txt +++ b/config/GZLE01/rels/d_a_npc_uk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_uk.cpp: +d/actor/d_a_npc_uk.cpp: .text start:0x000000EC end:0x00005A0C .text start:0x00005A0C end:0x00005A44 .rodata start:0x00000000 end:0x0000026A diff --git a/config/GZLE01/rels/d_a_npc_ym1/splits.txt b/config/GZLE01/rels/d_a_npc_ym1/splits.txt index c83aa76..d6dc7b7 100644 --- a/config/GZLE01/rels/d_a_npc_ym1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_ym1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ym1.cpp: +d/actor/d_a_npc_ym1.cpp: .text start:0x000000EC end:0x000048E4 .text start:0x000048E4 end:0x000048F8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_yw1/splits.txt b/config/GZLE01/rels/d_a_npc_yw1/splits.txt index b107a04..5790be0 100644 --- a/config/GZLE01/rels/d_a_npc_yw1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_yw1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_yw1.cpp: +d/actor/d_a_npc_yw1.cpp: .text start:0x000000EC end:0x00004CF4 .text start:0x00004CF4 end:0x00004D08 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_zk1/splits.txt b/config/GZLE01/rels/d_a_npc_zk1/splits.txt index bc2d0ea..aaaa80d 100644 --- a/config/GZLE01/rels/d_a_npc_zk1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_zk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_zk1.cpp: +d/actor/d_a_npc_zk1.cpp: .text start:0x000000EC end:0x000029D0 .text start:0x000029D0 end:0x000029E4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_npc_zl1/splits.txt b/config/GZLE01/rels/d_a_npc_zl1/splits.txt index 32cdd71..abfb09b 100644 --- a/config/GZLE01/rels/d_a_npc_zl1/splits.txt +++ b/config/GZLE01/rels/d_a_npc_zl1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_zl1.cpp: +d/actor/d_a_npc_zl1.cpp: .text start:0x000000EC end:0x00007CA0 .text start:0x00007CA0 end:0x00007CBC .text start:0x00007CBC end:0x00007CD0 diff --git a/config/GZLE01/rels/d_a_nz/splits.txt b/config/GZLE01/rels/d_a_nz/splits.txt index 58675e2..810f9cc 100644 --- a/config/GZLE01/rels/d_a_nz/splits.txt +++ b/config/GZLE01/rels/d_a_nz/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_nz.cpp: +d/actor/d_a_nz.cpp: .text start:0x000000EC end:0x00008E50 .text start:0x00008E50 end:0x00008E6C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_nzg/splits.txt b/config/GZLE01/rels/d_a_nzg/splits.txt index 9c3b47e..04e0d2c 100644 --- a/config/GZLE01/rels/d_a_nzg/splits.txt +++ b/config/GZLE01/rels/d_a_nzg/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_nzg.cpp: +d/actor/d_a_nzg.cpp: .text start:0x00000078 end:0x00000B18 .rodata start:0x00000000 end:0x00000072 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLE01/rels/d_a_obj_AjavW/splits.txt b/config/GZLE01/rels/d_a_obj_AjavW/splits.txt index 62ed544..d79baf4 100644 --- a/config/GZLE01/rels/d_a_obj_AjavW/splits.txt +++ b/config/GZLE01/rels/d_a_obj_AjavW/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_AjavW.cpp: +d/actor/d_a_obj_AjavW.cpp: .text start:0x00000078 end:0x00000600 .rodata start:0x00000000 end:0x00000025 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLE01/rels/d_a_obj_Itnak/splits.txt b/config/GZLE01/rels/d_a_obj_Itnak/splits.txt index 544e046..ac19ba8 100644 --- a/config/GZLE01/rels/d_a_obj_Itnak/splits.txt +++ b/config/GZLE01/rels/d_a_obj_Itnak/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Itnak.cpp: +d/actor/d_a_obj_Itnak.cpp: .text start:0x00000078 end:0x0000144C .text start:0x0000144C end:0x00001850 .text start:0x00001850 end:0x000018BC diff --git a/config/GZLE01/rels/d_a_obj_Vds/splits.txt b/config/GZLE01/rels/d_a_obj_Vds/splits.txt index 2354c0f..263aa35 100644 --- a/config/GZLE01/rels/d_a_obj_Vds/splits.txt +++ b/config/GZLE01/rels/d_a_obj_Vds/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Vds.cpp: +d/actor/d_a_obj_Vds.cpp: .text start:0x00000078 end:0x0000163C .text start:0x0000163C end:0x00001720 .text start:0x00001720 end:0x0000173C diff --git a/config/GZLE01/rels/d_a_obj_Vteng/splits.txt b/config/GZLE01/rels/d_a_obj_Vteng/splits.txt index 27a6c37..1871d8e 100644 --- a/config/GZLE01/rels/d_a_obj_Vteng/splits.txt +++ b/config/GZLE01/rels/d_a_obj_Vteng/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Vteng.cpp: +d/actor/d_a_obj_Vteng.cpp: .text start:0x00000078 end:0x0000060C .rodata start:0x00000000 end:0x0000002B .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_YLzou/splits.txt b/config/GZLE01/rels/d_a_obj_YLzou/splits.txt index 959c35c..c4b47f4 100644 --- a/config/GZLE01/rels/d_a_obj_YLzou/splits.txt +++ b/config/GZLE01/rels/d_a_obj_YLzou/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_YLzou.cpp: +d/actor/d_a_obj_YLzou.cpp: .text start:0x000000EC end:0x0000197C .text start:0x0000197C end:0x00001A48 .text start:0x00001A48 end:0x00001A64 diff --git a/config/GZLE01/rels/d_a_obj_Yboil/splits.txt b/config/GZLE01/rels/d_a_obj_Yboil/splits.txt index ac082ea..d60cbf5 100644 --- a/config/GZLE01/rels/d_a_obj_Yboil/splits.txt +++ b/config/GZLE01/rels/d_a_obj_Yboil/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Yboil.cpp: +d/actor/d_a_obj_Yboil.cpp: .text start:0x00000078 end:0x00000DFC .text start:0x00000DFC end:0x00000E18 .rodata start:0x00000000 end:0x0000007F diff --git a/config/GZLE01/rels/d_a_obj_Ygush00/splits.txt b/config/GZLE01/rels/d_a_obj_Ygush00/splits.txt index c47dd80..f5a2f9c 100644 --- a/config/GZLE01/rels/d_a_obj_Ygush00/splits.txt +++ b/config/GZLE01/rels/d_a_obj_Ygush00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Ygush00.cpp: +d/actor/d_a_obj_Ygush00.cpp: .text start:0x00000078 end:0x00000790 .text start:0x00000790 end:0x000007AC .rodata start:0x00000000 end:0x0000003B diff --git a/config/GZLE01/rels/d_a_obj_adnno/splits.txt b/config/GZLE01/rels/d_a_obj_adnno/splits.txt index 7269693..7e593ff 100644 --- a/config/GZLE01/rels/d_a_obj_adnno/splits.txt +++ b/config/GZLE01/rels/d_a_obj_adnno/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_adnno.cpp: +d/actor/d_a_obj_adnno.cpp: .text start:0x00000078 end:0x00000524 .rodata start:0x00000000 end:0x000000B4 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_ajav/splits.txt b/config/GZLE01/rels/d_a_obj_ajav/splits.txt index 2d75f8f..bcfb7c0 100644 --- a/config/GZLE01/rels/d_a_obj_ajav/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ajav/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ajav.cpp: +d/actor/d_a_obj_ajav.cpp: .text start:0x000000EC end:0x00003580 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000001C1 diff --git a/config/GZLE01/rels/d_a_obj_akabe/splits.txt b/config/GZLE01/rels/d_a_obj_akabe/splits.txt index 30de780..e7012b1 100644 --- a/config/GZLE01/rels/d_a_obj_akabe/splits.txt +++ b/config/GZLE01/rels/d_a_obj_akabe/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_akabe.cpp: +d/actor/d_a_obj_akabe.cpp: .text start:0x00000078 end:0x00000680 .text start:0x00000680 end:0x0000069C .rodata start:0x00000000 end:0x0000007E diff --git a/config/GZLE01/rels/d_a_obj_apzl/splits.txt b/config/GZLE01/rels/d_a_obj_apzl/splits.txt index a505123..a43ad9d 100644 --- a/config/GZLE01/rels/d_a_obj_apzl/splits.txt +++ b/config/GZLE01/rels/d_a_obj_apzl/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_apzl.cpp: +d/actor/d_a_obj_apzl.cpp: .text start:0x00000078 end:0x00001E94 .rodata start:0x00000000 end:0x00000503 .data start:0x00000000 end:0x00000118 diff --git a/config/GZLE01/rels/d_a_obj_ashut/splits.txt b/config/GZLE01/rels/d_a_obj_ashut/splits.txt index 13b26a6..7be5e4b 100644 --- a/config/GZLE01/rels/d_a_obj_ashut/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ashut/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ashut.cpp: +d/actor/d_a_obj_ashut.cpp: .text start:0x00000078 end:0x00000E24 .text start:0x00000E24 end:0x00000E64 .text start:0x00000E64 end:0x00000E80 diff --git a/config/GZLE01/rels/d_a_obj_auzu/splits.txt b/config/GZLE01/rels/d_a_obj_auzu/splits.txt index 8cda9c0..80f1b45 100644 --- a/config/GZLE01/rels/d_a_obj_auzu/splits.txt +++ b/config/GZLE01/rels/d_a_obj_auzu/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_auzu.cpp: +d/actor/d_a_obj_auzu.cpp: .text start:0x00000078 end:0x00000CCC .text start:0x00000CCC end:0x00000CE8 .rodata start:0x00000000 end:0x0000008E diff --git a/config/GZLE01/rels/d_a_obj_aygr/splits.txt b/config/GZLE01/rels/d_a_obj_aygr/splits.txt index 5837805..e93d469 100644 --- a/config/GZLE01/rels/d_a_obj_aygr/splits.txt +++ b/config/GZLE01/rels/d_a_obj_aygr/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_aygr.cpp: +d/actor/d_a_obj_aygr.cpp: .text start:0x00000078 end:0x00000854 .text start:0x00000854 end:0x0000086C .text start:0x0000086C end:0x00000888 diff --git a/config/GZLE01/rels/d_a_obj_balancelift/splits.txt b/config/GZLE01/rels/d_a_obj_balancelift/splits.txt index a6cec87..0a011ed 100644 --- a/config/GZLE01/rels/d_a_obj_balancelift/splits.txt +++ b/config/GZLE01/rels/d_a_obj_balancelift/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_balancelift.cpp: +d/actor/d_a_obj_balancelift.cpp: .text start:0x000000EC end:0x000018FC .text start:0x000018FC end:0x000018FC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_barrel/splits.txt b/config/GZLE01/rels/d_a_obj_barrel/splits.txt index 526dc11..66139ff 100644 --- a/config/GZLE01/rels/d_a_obj_barrel/splits.txt +++ b/config/GZLE01/rels/d_a_obj_barrel/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_barrel.cpp: +d/actor/d_a_obj_barrel.cpp: .text start:0x00000078 end:0x000026D0 .text start:0x000026D0 end:0x0000270C .rodata start:0x00000000 end:0x000001A9 diff --git a/config/GZLE01/rels/d_a_obj_barrel2/splits.txt b/config/GZLE01/rels/d_a_obj_barrel2/splits.txt index 440802e..ab9f3ce 100644 --- a/config/GZLE01/rels/d_a_obj_barrel2/splits.txt +++ b/config/GZLE01/rels/d_a_obj_barrel2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_barrel2.cpp: +d/actor/d_a_obj_barrel2.cpp: .text start:0x000000EC end:0x000034C8 .text start:0x000034C8 end:0x0000352C .rodata start:0x00000000 end:0x00000305 diff --git a/config/GZLE01/rels/d_a_obj_barrier/splits.txt b/config/GZLE01/rels/d_a_obj_barrier/splits.txt index a89dd5b..fcad582 100644 --- a/config/GZLE01/rels/d_a_obj_barrier/splits.txt +++ b/config/GZLE01/rels/d_a_obj_barrier/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_barrier.cpp: +d/actor/d_a_obj_barrier.cpp: .text start:0x000000EC end:0x00001D9C .text start:0x00001D9C end:0x00002130 .text start:0x00002130 end:0x000021A4 diff --git a/config/GZLE01/rels/d_a_obj_bemos/splits.txt b/config/GZLE01/rels/d_a_obj_bemos/splits.txt index 6df5120..92be408 100644 --- a/config/GZLE01/rels/d_a_obj_bemos/splits.txt +++ b/config/GZLE01/rels/d_a_obj_bemos/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_bemos.cpp: +d/actor/d_a_obj_bemos.cpp: .text start:0x000000EC end:0x000050E8 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000120 diff --git a/config/GZLE01/rels/d_a_obj_bscurtain/splits.txt b/config/GZLE01/rels/d_a_obj_bscurtain/splits.txt index 7f0caa2..48c9a23 100644 --- a/config/GZLE01/rels/d_a_obj_bscurtain/splits.txt +++ b/config/GZLE01/rels/d_a_obj_bscurtain/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_bscurtain.cpp: +d/actor/d_a_obj_bscurtain.cpp: .text start:0x000000EC end:0x00000584 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000032 diff --git a/config/GZLE01/rels/d_a_obj_buoyflag/splits.txt b/config/GZLE01/rels/d_a_obj_buoyflag/splits.txt index c42f008..0ce69e2 100644 --- a/config/GZLE01/rels/d_a_obj_buoyflag/splits.txt +++ b/config/GZLE01/rels/d_a_obj_buoyflag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_buoyflag.cpp: +d/actor/d_a_obj_buoyflag.cpp: .text start:0x000000EC end:0x00002C90 .text start:0x00002C90 end:0x00003068 .text start:0x00003068 end:0x00003124 diff --git a/config/GZLE01/rels/d_a_obj_buoyrace/splits.txt b/config/GZLE01/rels/d_a_obj_buoyrace/splits.txt index bce9ddb..8c797b2 100644 --- a/config/GZLE01/rels/d_a_obj_buoyrace/splits.txt +++ b/config/GZLE01/rels/d_a_obj_buoyrace/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_buoyrace.cpp: +d/actor/d_a_obj_buoyrace.cpp: .text start:0x00000078 end:0x00000BBC .text start:0x00000BBC end:0x00000BD8 .rodata start:0x00000000 end:0x000000EA diff --git a/config/GZLE01/rels/d_a_obj_cafelmp/splits.txt b/config/GZLE01/rels/d_a_obj_cafelmp/splits.txt index 07f79dc..fd1ebe2 100644 --- a/config/GZLE01/rels/d_a_obj_cafelmp/splits.txt +++ b/config/GZLE01/rels/d_a_obj_cafelmp/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_cafelmp.cpp: +d/actor/d_a_obj_cafelmp.cpp: .text start:0x00000078 end:0x000003F8 .rodata start:0x00000000 end:0x00000044 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_canon/splits.txt b/config/GZLE01/rels/d_a_obj_canon/splits.txt index 8b883f7..638a00a 100644 --- a/config/GZLE01/rels/d_a_obj_canon/splits.txt +++ b/config/GZLE01/rels/d_a_obj_canon/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_canon.cpp: +d/actor/d_a_obj_canon.cpp: .text start:0x000000EC end:0x00001F90 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000140 diff --git a/config/GZLE01/rels/d_a_obj_coming/splits.txt b/config/GZLE01/rels/d_a_obj_coming/splits.txt index 5d72ede..9496612 100644 --- a/config/GZLE01/rels/d_a_obj_coming/splits.txt +++ b/config/GZLE01/rels/d_a_obj_coming/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_coming.cpp: +d/actor/d_a_obj_coming.cpp: .text start:0x000000EC end:0x000016D8 .text start:0x000016D8 end:0x0000205C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_correct/splits.txt b/config/GZLE01/rels/d_a_obj_correct/splits.txt index 8c7f277..5279c6a 100644 --- a/config/GZLE01/rels/d_a_obj_correct/splits.txt +++ b/config/GZLE01/rels/d_a_obj_correct/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_correct.cpp: +d/actor/d_a_obj_correct.cpp: .text start:0x00000078 end:0x00000E50 .text start:0x00000E50 end:0x00000E50 .text start:0x00000E50 end:0x00000EA4 diff --git a/config/GZLE01/rels/d_a_obj_demo_barrel/splits.txt b/config/GZLE01/rels/d_a_obj_demo_barrel/splits.txt index 60cc0c5..497d0f9 100644 --- a/config/GZLE01/rels/d_a_obj_demo_barrel/splits.txt +++ b/config/GZLE01/rels/d_a_obj_demo_barrel/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_demo_barrel.cpp: +d/actor/d_a_obj_demo_barrel.cpp: .text start:0x00000078 end:0x0000081C .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_dmgroom/splits.txt b/config/GZLE01/rels/d_a_obj_dmgroom/splits.txt index 3803eba..b2bf856 100644 --- a/config/GZLE01/rels/d_a_obj_dmgroom/splits.txt +++ b/config/GZLE01/rels/d_a_obj_dmgroom/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_dmgroom.cpp: +d/actor/d_a_obj_dmgroom.cpp: .text start:0x00000078 end:0x000005D4 .rodata start:0x00000000 end:0x0000004D .data start:0x00000000 end:0x00000068 diff --git a/config/GZLE01/rels/d_a_obj_doguu/splits.txt b/config/GZLE01/rels/d_a_obj_doguu/splits.txt index 692048d..c418ad6 100644 --- a/config/GZLE01/rels/d_a_obj_doguu/splits.txt +++ b/config/GZLE01/rels/d_a_obj_doguu/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_doguu.cpp: +d/actor/d_a_obj_doguu.cpp: .text start:0x00000078 end:0x000028A0 .text start:0x000028A0 end:0x000028A0 .text start:0x000028A0 end:0x000028D4 diff --git a/config/GZLE01/rels/d_a_obj_doguu_demo/splits.txt b/config/GZLE01/rels/d_a_obj_doguu_demo/splits.txt index e79911a..da3707f 100644 --- a/config/GZLE01/rels/d_a_obj_doguu_demo/splits.txt +++ b/config/GZLE01/rels/d_a_obj_doguu_demo/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_doguu_demo.cpp: +d/actor/d_a_obj_doguu_demo.cpp: .text start:0x00000078 end:0x00000540 .rodata start:0x00000000 end:0x00000042 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_dragonhead/splits.txt b/config/GZLE01/rels/d_a_obj_dragonhead/splits.txt index eee60bf..277a934 100644 --- a/config/GZLE01/rels/d_a_obj_dragonhead/splits.txt +++ b/config/GZLE01/rels/d_a_obj_dragonhead/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_dragonhead.cpp: +d/actor/d_a_obj_dragonhead.cpp: .text start:0x00000078 end:0x00000B4C .rodata start:0x00000000 end:0x00000046 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLE01/rels/d_a_obj_drift/splits.txt b/config/GZLE01/rels/d_a_obj_drift/splits.txt index 4caf7ff..dfab859 100644 --- a/config/GZLE01/rels/d_a_obj_drift/splits.txt +++ b/config/GZLE01/rels/d_a_obj_drift/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_drift.cpp: +d/actor/d_a_obj_drift.cpp: .text start:0x000000EC end:0x00001328 .text start:0x00001328 end:0x0000149C .text start:0x0000149C end:0x000014C8 diff --git a/config/GZLE01/rels/d_a_obj_eayogn/splits.txt b/config/GZLE01/rels/d_a_obj_eayogn/splits.txt index 6da8846..29eaf65 100644 --- a/config/GZLE01/rels/d_a_obj_eayogn/splits.txt +++ b/config/GZLE01/rels/d_a_obj_eayogn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_eayogn.cpp: +d/actor/d_a_obj_eayogn.cpp: .text start:0x00000078 end:0x00000524 .rodata start:0x00000000 end:0x00000046 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_ebomzo/splits.txt b/config/GZLE01/rels/d_a_obj_ebomzo/splits.txt index d0aad60..e3c3ca1 100644 --- a/config/GZLE01/rels/d_a_obj_ebomzo/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ebomzo/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ebomzo.cpp: +d/actor/d_a_obj_ebomzo.cpp: .text start:0x00000078 end:0x00000C54 .text start:0x00000C54 end:0x00000D58 .text start:0x00000D58 end:0x00000D84 diff --git a/config/GZLE01/rels/d_a_obj_eff/splits.txt b/config/GZLE01/rels/d_a_obj_eff/splits.txt index ea72a6d..fe53fce 100644 --- a/config/GZLE01/rels/d_a_obj_eff/splits.txt +++ b/config/GZLE01/rels/d_a_obj_eff/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_eff.cpp: +d/actor/d_a_obj_eff.cpp: .text start:0x000000EC end:0x00001538 .text start:0x00001538 end:0x00001934 .text start:0x00001934 end:0x00001950 diff --git a/config/GZLE01/rels/d_a_obj_ekskz/splits.txt b/config/GZLE01/rels/d_a_obj_ekskz/splits.txt index b450c15..fcc1e09 100644 --- a/config/GZLE01/rels/d_a_obj_ekskz/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ekskz/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ekskz.cpp: +d/actor/d_a_obj_ekskz.cpp: .text start:0x00000078 end:0x000011DC .text start:0x000011DC end:0x00001394 .text start:0x00001394 end:0x000013C0 diff --git a/config/GZLE01/rels/d_a_obj_eskban/splits.txt b/config/GZLE01/rels/d_a_obj_eskban/splits.txt index 64f1932..ea58e33 100644 --- a/config/GZLE01/rels/d_a_obj_eskban/splits.txt +++ b/config/GZLE01/rels/d_a_obj_eskban/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_eskban.cpp: +d/actor/d_a_obj_eskban.cpp: .text start:0x000000EC end:0x0000156C .text start:0x0000156C end:0x00001798 .text start:0x00001798 end:0x000017D4 diff --git a/config/GZLE01/rels/d_a_obj_ferris/splits.txt b/config/GZLE01/rels/d_a_obj_ferris/splits.txt index 809e4be..6345d18 100644 --- a/config/GZLE01/rels/d_a_obj_ferris/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ferris/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ferris.cpp: +d/actor/d_a_obj_ferris.cpp: .text start:0x000000EC end:0x00002098 .text start:0x00002098 end:0x000020D4 .rodata start:0x00000000 end:0x000001F5 diff --git a/config/GZLE01/rels/d_a_obj_figure/splits.txt b/config/GZLE01/rels/d_a_obj_figure/splits.txt index d242e5e..0fec6f8 100644 --- a/config/GZLE01/rels/d_a_obj_figure/splits.txt +++ b/config/GZLE01/rels/d_a_obj_figure/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_figure.cpp: +d/actor/d_a_obj_figure.cpp: .text start:0x000000EC end:0x00002348 .text start:0x00002348 end:0x000023A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_firewall/splits.txt b/config/GZLE01/rels/d_a_obj_firewall/splits.txt index 33fb557..c61b212 100644 --- a/config/GZLE01/rels/d_a_obj_firewall/splits.txt +++ b/config/GZLE01/rels/d_a_obj_firewall/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_firewall.cpp: +d/actor/d_a_obj_firewall.cpp: .text start:0x00000078 end:0x00001E9C .text start:0x00001E9C end:0x00001EF4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_flame/splits.txt b/config/GZLE01/rels/d_a_obj_flame/splits.txt index 643454b..8d7f3fa 100644 --- a/config/GZLE01/rels/d_a_obj_flame/splits.txt +++ b/config/GZLE01/rels/d_a_obj_flame/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_flame.cpp: +d/actor/d_a_obj_flame.cpp: .text start:0x00000078 end:0x0000298C .text start:0x0000298C end:0x000029B8 .rodata start:0x00000000 end:0x0000028B diff --git a/config/GZLE01/rels/d_a_obj_ftree/splits.txt b/config/GZLE01/rels/d_a_obj_ftree/splits.txt index acc6e88..3ffab4b 100644 --- a/config/GZLE01/rels/d_a_obj_ftree/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ftree/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ftree.cpp: +d/actor/d_a_obj_ftree.cpp: .text start:0x00000078 end:0x0000476C .text start:0x0000476C end:0x0000476C .text start:0x0000476C end:0x00004AB8 diff --git a/config/GZLE01/rels/d_a_obj_ganonbed/splits.txt b/config/GZLE01/rels/d_a_obj_ganonbed/splits.txt index 65240d5..7e3aa32 100644 --- a/config/GZLE01/rels/d_a_obj_ganonbed/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ganonbed/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ganonbed.cpp: +d/actor/d_a_obj_ganonbed.cpp: .text start:0x00000078 end:0x000004D8 .rodata start:0x00000000 end:0x00000024 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_gaship/splits.txt b/config/GZLE01/rels/d_a_obj_gaship/splits.txt index 4c382a4..04ad4a9 100644 --- a/config/GZLE01/rels/d_a_obj_gaship/splits.txt +++ b/config/GZLE01/rels/d_a_obj_gaship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_gaship.cpp: +d/actor/d_a_obj_gaship.cpp: .text start:0x000000EC end:0x00000700 .text start:0x00000700 end:0x00000760 .rodata start:0x00000000 end:0x00000046 diff --git a/config/GZLE01/rels/d_a_obj_gaship2/splits.txt b/config/GZLE01/rels/d_a_obj_gaship2/splits.txt index c68c789..d1fa201 100644 --- a/config/GZLE01/rels/d_a_obj_gaship2/splits.txt +++ b/config/GZLE01/rels/d_a_obj_gaship2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gaship2.cpp: +d/actor/d_a_obj_gaship2.cpp: .text start:0x00000078 end:0x0000059C .text start:0x0000059C end:0x000005FC .rodata start:0x00000000 end:0x0000003D diff --git a/config/GZLE01/rels/d_a_obj_gnnbtltaki/splits.txt b/config/GZLE01/rels/d_a_obj_gnnbtltaki/splits.txt index 7b821c4..464a975 100644 --- a/config/GZLE01/rels/d_a_obj_gnnbtltaki/splits.txt +++ b/config/GZLE01/rels/d_a_obj_gnnbtltaki/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gnnbtltaki.cpp: +d/actor/d_a_obj_gnnbtltaki.cpp: .text start:0x00000078 end:0x00000660 .rodata start:0x00000000 end:0x00000068 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLE01/rels/d_a_obj_gnndemotakie/splits.txt b/config/GZLE01/rels/d_a_obj_gnndemotakie/splits.txt index 820f1a6..4f06466 100644 --- a/config/GZLE01/rels/d_a_obj_gnndemotakie/splits.txt +++ b/config/GZLE01/rels/d_a_obj_gnndemotakie/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gnndemotakie.cpp: +d/actor/d_a_obj_gnndemotakie.cpp: .text start:0x00000078 end:0x00000528 .rodata start:0x00000000 end:0x0000005A .data start:0x00000000 end:0x00000068 diff --git a/config/GZLE01/rels/d_a_obj_gnndemotakis/splits.txt b/config/GZLE01/rels/d_a_obj_gnndemotakis/splits.txt index dd10c35..ee01fde 100644 --- a/config/GZLE01/rels/d_a_obj_gnndemotakis/splits.txt +++ b/config/GZLE01/rels/d_a_obj_gnndemotakis/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gnndemotakis.cpp: +d/actor/d_a_obj_gnndemotakis.cpp: .text start:0x00000078 end:0x00000620 .rodata start:0x00000000 end:0x0000006A .data start:0x00000000 end:0x00000068 diff --git a/config/GZLE01/rels/d_a_obj_gong/splits.txt b/config/GZLE01/rels/d_a_obj_gong/splits.txt index 94350c4..b5ba6b9 100644 --- a/config/GZLE01/rels/d_a_obj_gong/splits.txt +++ b/config/GZLE01/rels/d_a_obj_gong/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gong.cpp: +d/actor/d_a_obj_gong.cpp: .text start:0x00000078 end:0x00000614 .rodata start:0x00000000 end:0x000000A6 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_gryw00/splits.txt b/config/GZLE01/rels/d_a_obj_gryw00/splits.txt index 7f42da2..f59bcb3 100644 --- a/config/GZLE01/rels/d_a_obj_gryw00/splits.txt +++ b/config/GZLE01/rels/d_a_obj_gryw00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gryw00.cpp: +d/actor/d_a_obj_gryw00.cpp: .text start:0x00000078 end:0x00000F84 .text start:0x00000F84 end:0x00000F9C .text start:0x00000F9C end:0x00000FB8 diff --git a/config/GZLE01/rels/d_a_obj_gtaki/splits.txt b/config/GZLE01/rels/d_a_obj_gtaki/splits.txt index fe2e271..e4728eb 100644 --- a/config/GZLE01/rels/d_a_obj_gtaki/splits.txt +++ b/config/GZLE01/rels/d_a_obj_gtaki/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gtaki.cpp: +d/actor/d_a_obj_gtaki.cpp: .text start:0x00000078 end:0x00000D68 .rodata start:0x00000000 end:0x00000073 .data start:0x00000000 end:0x000001A0 diff --git a/config/GZLE01/rels/d_a_obj_hami2/splits.txt b/config/GZLE01/rels/d_a_obj_hami2/splits.txt index e7b9d4c..524dbf3 100644 --- a/config/GZLE01/rels/d_a_obj_hami2/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hami2/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hami2.cpp: +d/actor/d_a_obj_hami2.cpp: .text start:0x00000078 end:0x00000C10 .text start:0x00000C10 end:0x00000C28 .text start:0x00000C28 end:0x00000C44 diff --git a/config/GZLE01/rels/d_a_obj_hami3/splits.txt b/config/GZLE01/rels/d_a_obj_hami3/splits.txt index ad44b11..b5ecf6e 100644 --- a/config/GZLE01/rels/d_a_obj_hami3/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hami3/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hami3.cpp: +d/actor/d_a_obj_hami3.cpp: .text start:0x00000078 end:0x00000B4C .text start:0x00000B4C end:0x00000B64 .text start:0x00000B64 end:0x00000B80 diff --git a/config/GZLE01/rels/d_a_obj_hami4/splits.txt b/config/GZLE01/rels/d_a_obj_hami4/splits.txt index 83bc34d..15de4e3 100644 --- a/config/GZLE01/rels/d_a_obj_hami4/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hami4/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hami4.cpp: +d/actor/d_a_obj_hami4.cpp: .text start:0x00000078 end:0x00000A60 .text start:0x00000A60 end:0x00000A7C .rodata start:0x00000000 end:0x00000062 diff --git a/config/GZLE01/rels/d_a_obj_hat/splits.txt b/config/GZLE01/rels/d_a_obj_hat/splits.txt index d5a6203..f2ed35a 100644 --- a/config/GZLE01/rels/d_a_obj_hat/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hat/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hat.cpp: +d/actor/d_a_obj_hat.cpp: .text start:0x00000078 end:0x00000B94 .text start:0x00000B94 end:0x00000BB0 .text start:0x00000BB0 end:0x00000C18 diff --git a/config/GZLE01/rels/d_a_obj_hbrf1/splits.txt b/config/GZLE01/rels/d_a_obj_hbrf1/splits.txt index fe74f8d..c7ca024 100644 --- a/config/GZLE01/rels/d_a_obj_hbrf1/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hbrf1/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hbrf1.cpp: +d/actor/d_a_obj_hbrf1.cpp: .text start:0x00000078 end:0x00000D74 .text start:0x00000D74 end:0x00000D8C .text start:0x00000D8C end:0x00000DA8 diff --git a/config/GZLE01/rels/d_a_obj_hcbh/splits.txt b/config/GZLE01/rels/d_a_obj_hcbh/splits.txt index 4232f51..bd481d4 100644 --- a/config/GZLE01/rels/d_a_obj_hcbh/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hcbh/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hcbh.cpp: +d/actor/d_a_obj_hcbh.cpp: .text start:0x00000078 end:0x00001BB4 .text start:0x00001BB4 end:0x00001C00 .rodata start:0x00000000 end:0x00000130 diff --git a/config/GZLE01/rels/d_a_obj_hfuck1/splits.txt b/config/GZLE01/rels/d_a_obj_hfuck1/splits.txt index 2463231..3bc28d8 100644 --- a/config/GZLE01/rels/d_a_obj_hfuck1/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hfuck1/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hfuck1.cpp: +d/actor/d_a_obj_hfuck1.cpp: .text start:0x00000078 end:0x000009BC .text start:0x000009BC end:0x000009BC .rodata start:0x00000000 end:0x0000007A diff --git a/config/GZLE01/rels/d_a_obj_hha/splits.txt b/config/GZLE01/rels/d_a_obj_hha/splits.txt index 9b9f3d1..82e54a9 100644 --- a/config/GZLE01/rels/d_a_obj_hha/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hha/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hha.cpp: +d/actor/d_a_obj_hha.cpp: .text start:0x00000078 end:0x00003064 .text start:0x00003064 end:0x000030D4 .rodata start:0x00000000 end:0x000001B0 diff --git a/config/GZLE01/rels/d_a_obj_hlift/splits.txt b/config/GZLE01/rels/d_a_obj_hlift/splits.txt index 5856514..160f2e3 100644 --- a/config/GZLE01/rels/d_a_obj_hlift/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hlift/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hlift.cpp: +d/actor/d_a_obj_hlift.cpp: .text start:0x00000078 end:0x00001148 .text start:0x00001148 end:0x00001188 .text start:0x00001188 end:0x000011A4 diff --git a/config/GZLE01/rels/d_a_obj_hole/splits.txt b/config/GZLE01/rels/d_a_obj_hole/splits.txt index f38d632..33422d5 100644 --- a/config/GZLE01/rels/d_a_obj_hole/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hole/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_hole.cpp: +d/actor/d_a_obj_hole.cpp: .text start:0x000000EC end:0x00001468 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000077 diff --git a/config/GZLE01/rels/d_a_obj_homen/splits.txt b/config/GZLE01/rels/d_a_obj_homen/splits.txt index 2a25dc6..6832414 100644 --- a/config/GZLE01/rels/d_a_obj_homen/splits.txt +++ b/config/GZLE01/rels/d_a_obj_homen/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_homen.cpp: +d/actor/d_a_obj_homen.cpp: .text start:0x000000EC end:0x00002C0C .text start:0x00002C0C end:0x00002C0C .text start:0x00002C0C end:0x00002E88 diff --git a/config/GZLE01/rels/d_a_obj_homensmoke/splits.txt b/config/GZLE01/rels/d_a_obj_homensmoke/splits.txt index 2ecc2b5..faaff2e 100644 --- a/config/GZLE01/rels/d_a_obj_homensmoke/splits.txt +++ b/config/GZLE01/rels/d_a_obj_homensmoke/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_homensmoke.cpp: +d/actor/d_a_obj_homensmoke.cpp: .text start:0x000000EC end:0x00000888 .text start:0x00000888 end:0x0000093C .text start:0x0000093C end:0x00000958 diff --git a/config/GZLE01/rels/d_a_obj_hsehi1/splits.txt b/config/GZLE01/rels/d_a_obj_hsehi1/splits.txt index 7998a20..5277bfc 100644 --- a/config/GZLE01/rels/d_a_obj_hsehi1/splits.txt +++ b/config/GZLE01/rels/d_a_obj_hsehi1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_hsehi1.cpp: +d/actor/d_a_obj_hsehi1.cpp: .text start:0x000000EC end:0x000024D4 .text start:0x000024D4 end:0x000024D4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_htetu1/splits.txt b/config/GZLE01/rels/d_a_obj_htetu1/splits.txt index 7819263..ea4efbd 100644 --- a/config/GZLE01/rels/d_a_obj_htetu1/splits.txt +++ b/config/GZLE01/rels/d_a_obj_htetu1/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_htetu1.cpp: +d/actor/d_a_obj_htetu1.cpp: .text start:0x00000078 end:0x00001528 .rodata start:0x00000000 end:0x00000082 .data start:0x00000000 end:0x00000140 diff --git a/config/GZLE01/rels/d_a_obj_ice/splits.txt b/config/GZLE01/rels/d_a_obj_ice/splits.txt index 537db80..bd981eb 100644 --- a/config/GZLE01/rels/d_a_obj_ice/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ice/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ice.cpp: +d/actor/d_a_obj_ice.cpp: .text start:0x00000078 end:0x00001520 .text start:0x00001520 end:0x0000154C .rodata start:0x00000000 end:0x000000C3 diff --git a/config/GZLE01/rels/d_a_obj_iceisland/splits.txt b/config/GZLE01/rels/d_a_obj_iceisland/splits.txt index d1f7adc..7f3c0b1 100644 --- a/config/GZLE01/rels/d_a_obj_iceisland/splits.txt +++ b/config/GZLE01/rels/d_a_obj_iceisland/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_iceisland.cpp: +d/actor/d_a_obj_iceisland.cpp: .text start:0x00000078 end:0x00000EC8 .rodata start:0x00000000 end:0x00000076 .data start:0x00000000 end:0x00000094 diff --git a/config/GZLE01/rels/d_a_obj_ikada/splits.txt b/config/GZLE01/rels/d_a_obj_ikada/splits.txt index 9cec548..581fe3e 100644 --- a/config/GZLE01/rels/d_a_obj_ikada/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ikada/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ikada.cpp: +d/actor/d_a_obj_ikada.cpp: .text start:0x000000EC end:0x00005840 .text start:0x00005840 end:0x0000585C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_jump/splits.txt b/config/GZLE01/rels/d_a_obj_jump/splits.txt index 1288aaf..9bebb88 100644 --- a/config/GZLE01/rels/d_a_obj_jump/splits.txt +++ b/config/GZLE01/rels/d_a_obj_jump/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_jump.cpp: +d/actor/d_a_obj_jump.cpp: .text start:0x00000078 end:0x0000164C .text start:0x0000164C end:0x000016D4 .text start:0x000016D4 end:0x00001730 diff --git a/config/GZLE01/rels/d_a_obj_kanat/splits.txt b/config/GZLE01/rels/d_a_obj_kanat/splits.txt index 2a2eff9..87d03f6 100644 --- a/config/GZLE01/rels/d_a_obj_kanat/splits.txt +++ b/config/GZLE01/rels/d_a_obj_kanat/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_kanat.cpp: +d/actor/d_a_obj_kanat.cpp: .text start:0x00000078 end:0x000006FC .text start:0x000006FC end:0x00000714 .text start:0x00000714 end:0x00000730 diff --git a/config/GZLE01/rels/d_a_obj_kanoke/splits.txt b/config/GZLE01/rels/d_a_obj_kanoke/splits.txt index aed47de..689bce2 100644 --- a/config/GZLE01/rels/d_a_obj_kanoke/splits.txt +++ b/config/GZLE01/rels/d_a_obj_kanoke/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_kanoke.cpp: +d/actor/d_a_obj_kanoke.cpp: .text start:0x000000EC end:0x000020AC .text start:0x000020AC end:0x00002370 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_ladder/splits.txt b/config/GZLE01/rels/d_a_obj_ladder/splits.txt index 141baf6..0011b34 100644 --- a/config/GZLE01/rels/d_a_obj_ladder/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ladder/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ladder.cpp: +d/actor/d_a_obj_ladder.cpp: .text start:0x00000078 end:0x000011F8 .text start:0x000011F8 end:0x00001280 .text start:0x00001280 end:0x000012DC diff --git a/config/GZLE01/rels/d_a_obj_leaves/splits.txt b/config/GZLE01/rels/d_a_obj_leaves/splits.txt index 8298793..f62ed07 100644 --- a/config/GZLE01/rels/d_a_obj_leaves/splits.txt +++ b/config/GZLE01/rels/d_a_obj_leaves/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_leaves.cpp: +d/actor/d_a_obj_leaves.cpp: .text start:0x00000078 end:0x00001410 .text start:0x00001410 end:0x0000143C .rodata start:0x00000000 end:0x0000009A diff --git a/config/GZLE01/rels/d_a_obj_light/splits.txt b/config/GZLE01/rels/d_a_obj_light/splits.txt index 7716580..5583555 100644 --- a/config/GZLE01/rels/d_a_obj_light/splits.txt +++ b/config/GZLE01/rels/d_a_obj_light/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_light.cpp: +d/actor/d_a_obj_light.cpp: .text start:0x000000EC end:0x000016B8 .rodata start:0x00000000 end:0x000000F2 .data start:0x00000000 end:0x00000144 diff --git a/config/GZLE01/rels/d_a_obj_lpalm/splits.txt b/config/GZLE01/rels/d_a_obj_lpalm/splits.txt index 5e55d4a..966a63a 100644 --- a/config/GZLE01/rels/d_a_obj_lpalm/splits.txt +++ b/config/GZLE01/rels/d_a_obj_lpalm/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_lpalm.cpp: +d/actor/d_a_obj_lpalm.cpp: .text start:0x00000078 end:0x00000958 .rodata start:0x00000000 end:0x00000068 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_magmarock/splits.txt b/config/GZLE01/rels/d_a_obj_magmarock/splits.txt index 634b416..21fa452 100644 --- a/config/GZLE01/rels/d_a_obj_magmarock/splits.txt +++ b/config/GZLE01/rels/d_a_obj_magmarock/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_magmarock.cpp: +d/actor/d_a_obj_magmarock.cpp: .text start:0x00000078 end:0x00002130 .rodata start:0x00000000 end:0x00000106 .data start:0x00000000 end:0x0000013C diff --git a/config/GZLE01/rels/d_a_obj_majyuu_door/splits.txt b/config/GZLE01/rels/d_a_obj_majyuu_door/splits.txt index b2e940f..24910c6 100644 --- a/config/GZLE01/rels/d_a_obj_majyuu_door/splits.txt +++ b/config/GZLE01/rels/d_a_obj_majyuu_door/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_majyuu_door.cpp: +d/actor/d_a_obj_majyuu_door.cpp: .text start:0x000000EC end:0x0000116C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000078 diff --git a/config/GZLE01/rels/d_a_obj_mkie/splits.txt b/config/GZLE01/rels/d_a_obj_mkie/splits.txt index 5e245e2..51a7236 100644 --- a/config/GZLE01/rels/d_a_obj_mkie/splits.txt +++ b/config/GZLE01/rels/d_a_obj_mkie/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mkie.cpp: +d/actor/d_a_obj_mkie.cpp: .text start:0x00000078 end:0x00001670 .text start:0x00001670 end:0x000017EC .text start:0x000017EC end:0x00001818 diff --git a/config/GZLE01/rels/d_a_obj_mkiek/splits.txt b/config/GZLE01/rels/d_a_obj_mkiek/splits.txt index 1987bd6..dbe72f6 100644 --- a/config/GZLE01/rels/d_a_obj_mkiek/splits.txt +++ b/config/GZLE01/rels/d_a_obj_mkiek/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mkiek.cpp: +d/actor/d_a_obj_mkiek.cpp: .text start:0x00000078 end:0x00000ED4 .text start:0x00000ED4 end:0x00000FD8 .text start:0x00000FD8 end:0x00001004 diff --git a/config/GZLE01/rels/d_a_obj_mknjd/splits.txt b/config/GZLE01/rels/d_a_obj_mknjd/splits.txt index ee0ea6f..18ad603 100644 --- a/config/GZLE01/rels/d_a_obj_mknjd/splits.txt +++ b/config/GZLE01/rels/d_a_obj_mknjd/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mknjd.cpp: +d/actor/d_a_obj_mknjd.cpp: .text start:0x00000078 end:0x000024E8 .text start:0x000024E8 end:0x000024E8 .text start:0x000024E8 end:0x000025B4 diff --git a/config/GZLE01/rels/d_a_obj_mmrr/splits.txt b/config/GZLE01/rels/d_a_obj_mmrr/splits.txt index 499b660..2307520 100644 --- a/config/GZLE01/rels/d_a_obj_mmrr/splits.txt +++ b/config/GZLE01/rels/d_a_obj_mmrr/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mmrr.cpp: +d/actor/d_a_obj_mmrr.cpp: .text start:0x00000078 end:0x00001B74 .text start:0x00001B74 end:0x000021C8 .rodata start:0x00000000 end:0x00000208 diff --git a/config/GZLE01/rels/d_a_obj_monument/splits.txt b/config/GZLE01/rels/d_a_obj_monument/splits.txt index 3da8c5f..a0e1ebc 100644 --- a/config/GZLE01/rels/d_a_obj_monument/splits.txt +++ b/config/GZLE01/rels/d_a_obj_monument/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_monument.cpp: +d/actor/d_a_obj_monument.cpp: .text start:0x00000078 end:0x000005CC .text start:0x000005CC end:0x000005E8 .rodata start:0x00000000 end:0x00000031 diff --git a/config/GZLE01/rels/d_a_obj_movebox/splits.txt b/config/GZLE01/rels/d_a_obj_movebox/splits.txt index 97313d9..d152ce8 100644 --- a/config/GZLE01/rels/d_a_obj_movebox/splits.txt +++ b/config/GZLE01/rels/d_a_obj_movebox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_movebox.cpp: +d/actor/d_a_obj_movebox.cpp: .text start:0x000000EC end:0x000045BC .text start:0x000045BC end:0x0000489C .text start:0x0000489C end:0x00004AC4 diff --git a/config/GZLE01/rels/d_a_obj_msdan/splits.txt b/config/GZLE01/rels/d_a_obj_msdan/splits.txt index 05d6368..0a61df0 100644 --- a/config/GZLE01/rels/d_a_obj_msdan/splits.txt +++ b/config/GZLE01/rels/d_a_obj_msdan/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan.cpp: +d/actor/d_a_obj_msdan.cpp: .text start:0x00000078 end:0x00000660 .text start:0x00000660 end:0x0000067C .rodata start:0x00000000 end:0x0000002A diff --git a/config/GZLE01/rels/d_a_obj_msdan2/splits.txt b/config/GZLE01/rels/d_a_obj_msdan2/splits.txt index 6a09ad9..97dd469 100644 --- a/config/GZLE01/rels/d_a_obj_msdan2/splits.txt +++ b/config/GZLE01/rels/d_a_obj_msdan2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan2.cpp: +d/actor/d_a_obj_msdan2.cpp: .text start:0x00000078 end:0x000003BC .text start:0x000003BC end:0x000003D8 .rodata start:0x00000000 end:0x0000000F diff --git a/config/GZLE01/rels/d_a_obj_msdan_sub/splits.txt b/config/GZLE01/rels/d_a_obj_msdan_sub/splits.txt index 2dd7fb2..6aa5372 100644 --- a/config/GZLE01/rels/d_a_obj_msdan_sub/splits.txt +++ b/config/GZLE01/rels/d_a_obj_msdan_sub/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan_sub.cpp: +d/actor/d_a_obj_msdan_sub.cpp: .text start:0x00000078 end:0x00000D0C .text start:0x00000D0C end:0x00000D24 .text start:0x00000D24 end:0x00000D40 diff --git a/config/GZLE01/rels/d_a_obj_msdan_sub2/splits.txt b/config/GZLE01/rels/d_a_obj_msdan_sub2/splits.txt index 9e137cf..0bc5fc0 100644 --- a/config/GZLE01/rels/d_a_obj_msdan_sub2/splits.txt +++ b/config/GZLE01/rels/d_a_obj_msdan_sub2/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan_sub2.cpp: +d/actor/d_a_obj_msdan_sub2.cpp: .text start:0x00000078 end:0x00000A64 .text start:0x00000A64 end:0x00000A7C .text start:0x00000A7C end:0x00000A98 diff --git a/config/GZLE01/rels/d_a_obj_mshokki/splits.txt b/config/GZLE01/rels/d_a_obj_mshokki/splits.txt index 88d4711..a991d21 100644 --- a/config/GZLE01/rels/d_a_obj_mshokki/splits.txt +++ b/config/GZLE01/rels/d_a_obj_mshokki/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mshokki.cpp: +d/actor/d_a_obj_mshokki.cpp: .text start:0x00000078 end:0x00001004 .text start:0x00001004 end:0x00001040 .rodata start:0x00000000 end:0x000000F3 diff --git a/config/GZLE01/rels/d_a_obj_mtest/splits.txt b/config/GZLE01/rels/d_a_obj_mtest/splits.txt index a2a97cb..04353f3 100644 --- a/config/GZLE01/rels/d_a_obj_mtest/splits.txt +++ b/config/GZLE01/rels/d_a_obj_mtest/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_mtest.cpp: +d/actor/d_a_obj_mtest.cpp: .text start:0x000000EC end:0x00000D1C .text start:0x00000D1C end:0x00000E90 .text start:0x00000E90 end:0x000010A0 diff --git a/config/GZLE01/rels/d_a_obj_nest/splits.txt b/config/GZLE01/rels/d_a_obj_nest/splits.txt index e3a39e0..672b0e0 100644 --- a/config/GZLE01/rels/d_a_obj_nest/splits.txt +++ b/config/GZLE01/rels/d_a_obj_nest/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_nest.cpp: +d/actor/d_a_obj_nest.cpp: .text start:0x00000078 end:0x000008B4 .text start:0x000008B4 end:0x000008CC .rodata start:0x00000000 end:0x000000C1 diff --git a/config/GZLE01/rels/d_a_obj_ohatch/splits.txt b/config/GZLE01/rels/d_a_obj_ohatch/splits.txt index 68c294b..a58b1f4 100644 --- a/config/GZLE01/rels/d_a_obj_ohatch/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ohatch/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ohatch.cpp: +d/actor/d_a_obj_ohatch.cpp: .text start:0x00000078 end:0x00000BF8 .text start:0x00000BF8 end:0x00000C14 .rodata start:0x00000000 end:0x0000007C diff --git a/config/GZLE01/rels/d_a_obj_ojtree/splits.txt b/config/GZLE01/rels/d_a_obj_ojtree/splits.txt index 73d845b..f70c506 100644 --- a/config/GZLE01/rels/d_a_obj_ojtree/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ojtree/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ojtree.cpp: +d/actor/d_a_obj_ojtree.cpp: .text start:0x00000078 end:0x000005B4 .text start:0x000005B4 end:0x000005CC .rodata start:0x00000000 end:0x0000008B diff --git a/config/GZLE01/rels/d_a_obj_ospbox/splits.txt b/config/GZLE01/rels/d_a_obj_ospbox/splits.txt index 38e5f41..0302943 100644 --- a/config/GZLE01/rels/d_a_obj_ospbox/splits.txt +++ b/config/GZLE01/rels/d_a_obj_ospbox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ospbox.cpp: +d/actor/d_a_obj_ospbox.cpp: .text start:0x000000EC end:0x0000125C .text start:0x0000125C end:0x000013A8 .text start:0x000013A8 end:0x00001414 diff --git a/config/GZLE01/rels/d_a_obj_otble/splits.txt b/config/GZLE01/rels/d_a_obj_otble/splits.txt index 9d2e2e4..dd70aeb 100644 --- a/config/GZLE01/rels/d_a_obj_otble/splits.txt +++ b/config/GZLE01/rels/d_a_obj_otble/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_otble.cpp: +d/actor/d_a_obj_otble.cpp: .text start:0x00000078 end:0x000007F4 .rodata start:0x00000000 end:0x00000079 .data start:0x00000000 end:0x00000074 diff --git a/config/GZLE01/rels/d_a_obj_paper/splits.txt b/config/GZLE01/rels/d_a_obj_paper/splits.txt index 2897021..d7dab83 100644 --- a/config/GZLE01/rels/d_a_obj_paper/splits.txt +++ b/config/GZLE01/rels/d_a_obj_paper/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_paper.cpp: +d/actor/d_a_obj_paper.cpp: .text start:0x00000078 end:0x00000D9C .text start:0x00000D9C end:0x00000DC8 .rodata start:0x00000000 end:0x000000DE diff --git a/config/GZLE01/rels/d_a_obj_pbco/splits.txt b/config/GZLE01/rels/d_a_obj_pbco/splits.txt index bdda05e..c872668 100644 --- a/config/GZLE01/rels/d_a_obj_pbco/splits.txt +++ b/config/GZLE01/rels/d_a_obj_pbco/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_pbco.cpp: +d/actor/d_a_obj_pbco.cpp: .text start:0x000000EC end:0x000005C8 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000002D diff --git a/config/GZLE01/rels/d_a_obj_pbka/splits.txt b/config/GZLE01/rels/d_a_obj_pbka/splits.txt index 4fd8aca..8d46771 100644 --- a/config/GZLE01/rels/d_a_obj_pbka/splits.txt +++ b/config/GZLE01/rels/d_a_obj_pbka/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_pbka.cpp: +d/actor/d_a_obj_pbka.cpp: .text start:0x00000078 end:0x00000458 .rodata start:0x00000000 end:0x0000003A .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_pfall/splits.txt b/config/GZLE01/rels/d_a_obj_pfall/splits.txt index 7a099d6..8ae4237 100644 --- a/config/GZLE01/rels/d_a_obj_pfall/splits.txt +++ b/config/GZLE01/rels/d_a_obj_pfall/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_pfall.cpp: +d/actor/d_a_obj_pfall.cpp: .text start:0x000000EC end:0x00001620 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000113 diff --git a/config/GZLE01/rels/d_a_obj_pirateship/splits.txt b/config/GZLE01/rels/d_a_obj_pirateship/splits.txt index a76b788..ff6240a 100644 --- a/config/GZLE01/rels/d_a_obj_pirateship/splits.txt +++ b/config/GZLE01/rels/d_a_obj_pirateship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_pirateship.cpp: +d/actor/d_a_obj_pirateship.cpp: .text start:0x000000EC end:0x00002044 .text start:0x00002044 end:0x000022DC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_plant/splits.txt b/config/GZLE01/rels/d_a_obj_plant/splits.txt index 44b0536..c9dcd48 100644 --- a/config/GZLE01/rels/d_a_obj_plant/splits.txt +++ b/config/GZLE01/rels/d_a_obj_plant/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_plant.cpp: +d/actor/d_a_obj_plant.cpp: .text start:0x00000078 end:0x00000B5C .rodata start:0x00000000 end:0x0000006B .data start:0x00000000 end:0x00000188 diff --git a/config/GZLE01/rels/d_a_obj_quake/splits.txt b/config/GZLE01/rels/d_a_obj_quake/splits.txt index fdf3459..ed372f9 100644 --- a/config/GZLE01/rels/d_a_obj_quake/splits.txt +++ b/config/GZLE01/rels/d_a_obj_quake/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_quake.cpp: +d/actor/d_a_obj_quake.cpp: .text start:0x000000EC end:0x000007C8 .text start:0x000007C8 end:0x00000820 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_rcloud/splits.txt b/config/GZLE01/rels/d_a_obj_rcloud/splits.txt index 65cf715..d7f435c 100644 --- a/config/GZLE01/rels/d_a_obj_rcloud/splits.txt +++ b/config/GZLE01/rels/d_a_obj_rcloud/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_rcloud.cpp: +d/actor/d_a_obj_rcloud.cpp: .text start:0x00000078 end:0x000008DC .text start:0x000008DC end:0x000008F8 .rodata start:0x00000000 end:0x0000004A diff --git a/config/GZLE01/rels/d_a_obj_rflw/splits.txt b/config/GZLE01/rels/d_a_obj_rflw/splits.txt index adab6bc..eb10fa5 100644 --- a/config/GZLE01/rels/d_a_obj_rflw/splits.txt +++ b/config/GZLE01/rels/d_a_obj_rflw/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_rflw.cpp: +d/actor/d_a_obj_rflw.cpp: .text start:0x00000078 end:0x00000AF0 .rodata start:0x00000000 end:0x00000059 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLE01/rels/d_a_obj_rforce/splits.txt b/config/GZLE01/rels/d_a_obj_rforce/splits.txt index ecb6854..125a2af 100644 --- a/config/GZLE01/rels/d_a_obj_rforce/splits.txt +++ b/config/GZLE01/rels/d_a_obj_rforce/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_rforce.cpp: +d/actor/d_a_obj_rforce.cpp: .text start:0x00000078 end:0x0000059C .text start:0x0000059C end:0x000005FC .rodata start:0x00000000 end:0x0000003C diff --git a/config/GZLE01/rels/d_a_obj_roten/splits.txt b/config/GZLE01/rels/d_a_obj_roten/splits.txt index a6b2d01..d3ee9d2 100644 --- a/config/GZLE01/rels/d_a_obj_roten/splits.txt +++ b/config/GZLE01/rels/d_a_obj_roten/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_roten.cpp: +d/actor/d_a_obj_roten.cpp: .text start:0x000000EC end:0x000006BC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000003E diff --git a/config/GZLE01/rels/d_a_obj_shelf/splits.txt b/config/GZLE01/rels/d_a_obj_shelf/splits.txt index e05e801..b419a06 100644 --- a/config/GZLE01/rels/d_a_obj_shelf/splits.txt +++ b/config/GZLE01/rels/d_a_obj_shelf/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_shelf.cpp: +d/actor/d_a_obj_shelf.cpp: .text start:0x00000078 end:0x00000B08 .text start:0x00000B08 end:0x00000B48 .text start:0x00000B48 end:0x00000B64 diff --git a/config/GZLE01/rels/d_a_obj_shmrgrd/splits.txt b/config/GZLE01/rels/d_a_obj_shmrgrd/splits.txt index ab2c8b1..523a1d6 100644 --- a/config/GZLE01/rels/d_a_obj_shmrgrd/splits.txt +++ b/config/GZLE01/rels/d_a_obj_shmrgrd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_shmrgrd.cpp: +d/actor/d_a_obj_shmrgrd.cpp: .text start:0x000000EC end:0x00001CF0 .text start:0x00001CF0 end:0x00002124 .text start:0x00002124 end:0x00002150 diff --git a/config/GZLE01/rels/d_a_obj_smplbg/splits.txt b/config/GZLE01/rels/d_a_obj_smplbg/splits.txt index 9c50490..3734e8e 100644 --- a/config/GZLE01/rels/d_a_obj_smplbg/splits.txt +++ b/config/GZLE01/rels/d_a_obj_smplbg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_smplbg.cpp: +d/actor/d_a_obj_smplbg.cpp: .text start:0x00000078 end:0x0000081C .text start:0x0000081C end:0x00000834 .text start:0x00000834 end:0x00000850 diff --git a/config/GZLE01/rels/d_a_obj_stair/splits.txt b/config/GZLE01/rels/d_a_obj_stair/splits.txt index 9ee5970..320eeed 100644 --- a/config/GZLE01/rels/d_a_obj_stair/splits.txt +++ b/config/GZLE01/rels/d_a_obj_stair/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_stair.cpp: +d/actor/d_a_obj_stair.cpp: .text start:0x000000EC end:0x00001438 .text start:0x00001438 end:0x0000152C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_swflat/splits.txt b/config/GZLE01/rels/d_a_obj_swflat/splits.txt index 3c872fe..183d8f5 100644 --- a/config/GZLE01/rels/d_a_obj_swflat/splits.txt +++ b/config/GZLE01/rels/d_a_obj_swflat/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swflat.cpp: +d/actor/d_a_obj_swflat.cpp: .text start:0x000000EC end:0x000013DC .text start:0x000013DC end:0x00001534 .text start:0x00001534 end:0x0000159C diff --git a/config/GZLE01/rels/d_a_obj_swhammer/splits.txt b/config/GZLE01/rels/d_a_obj_swhammer/splits.txt index a4b28a9..c92c93d 100644 --- a/config/GZLE01/rels/d_a_obj_swhammer/splits.txt +++ b/config/GZLE01/rels/d_a_obj_swhammer/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swhammer.cpp: +d/actor/d_a_obj_swhammer.cpp: .text start:0x000000EC end:0x00001620 .text start:0x00001620 end:0x00001848 .text start:0x00001848 end:0x00001AD0 diff --git a/config/GZLE01/rels/d_a_obj_swheavy/splits.txt b/config/GZLE01/rels/d_a_obj_swheavy/splits.txt index 99a5cd5..5c24f13 100644 --- a/config/GZLE01/rels/d_a_obj_swheavy/splits.txt +++ b/config/GZLE01/rels/d_a_obj_swheavy/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_swheavy.cpp: +d/actor/d_a_obj_swheavy.cpp: .text start:0x00000078 end:0x00001254 .text start:0x00001254 end:0x00001270 .rodata start:0x00000000 end:0x000000FD diff --git a/config/GZLE01/rels/d_a_obj_swlight/splits.txt b/config/GZLE01/rels/d_a_obj_swlight/splits.txt index d763e1f..73c1858 100644 --- a/config/GZLE01/rels/d_a_obj_swlight/splits.txt +++ b/config/GZLE01/rels/d_a_obj_swlight/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swlight.cpp: +d/actor/d_a_obj_swlight.cpp: .text start:0x000000EC end:0x00001C94 .text start:0x00001C94 end:0x00001CC0 .rodata start:0x00000000 end:0x000000F8 diff --git a/config/GZLE01/rels/d_a_obj_swpush/splits.txt b/config/GZLE01/rels/d_a_obj_swpush/splits.txt index e590f0e..473d27e 100644 --- a/config/GZLE01/rels/d_a_obj_swpush/splits.txt +++ b/config/GZLE01/rels/d_a_obj_swpush/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swpush.cpp: +d/actor/d_a_obj_swpush.cpp: .text start:0x000000EC end:0x00002080 .text start:0x00002080 end:0x0000209C .rodata start:0x00000000 end:0x000001CF diff --git a/config/GZLE01/rels/d_a_obj_table/splits.txt b/config/GZLE01/rels/d_a_obj_table/splits.txt index 40c4ef3..6c05082 100644 --- a/config/GZLE01/rels/d_a_obj_table/splits.txt +++ b/config/GZLE01/rels/d_a_obj_table/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_table.cpp: +d/actor/d_a_obj_table.cpp: .text start:0x00000078 end:0x000006C0 .text start:0x000006C0 end:0x000006D8 .text start:0x000006D8 end:0x000006F4 diff --git a/config/GZLE01/rels/d_a_obj_tapestry/splits.txt b/config/GZLE01/rels/d_a_obj_tapestry/splits.txt index 9a86d3d..d060341 100644 --- a/config/GZLE01/rels/d_a_obj_tapestry/splits.txt +++ b/config/GZLE01/rels/d_a_obj_tapestry/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000020 -d/a/d_a_obj_tapestry.cpp: +d/actor/d_a_obj_tapestry.cpp: .text start:0x000000EC end:0x00005F58 .text start:0x00005F58 end:0x00006278 .text start:0x00006278 end:0x00006398 diff --git a/config/GZLE01/rels/d_a_obj_tenmado/splits.txt b/config/GZLE01/rels/d_a_obj_tenmado/splits.txt index fea86e9..9572958 100644 --- a/config/GZLE01/rels/d_a_obj_tenmado/splits.txt +++ b/config/GZLE01/rels/d_a_obj_tenmado/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tenmado.cpp: +d/actor/d_a_obj_tenmado.cpp: .text start:0x00000078 end:0x00000808 .text start:0x00000808 end:0x00000820 .text start:0x00000820 end:0x0000083C diff --git a/config/GZLE01/rels/d_a_obj_tide/splits.txt b/config/GZLE01/rels/d_a_obj_tide/splits.txt index 8a044a6..0248803 100644 --- a/config/GZLE01/rels/d_a_obj_tide/splits.txt +++ b/config/GZLE01/rels/d_a_obj_tide/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tide.cpp: +d/actor/d_a_obj_tide.cpp: .text start:0x00000078 end:0x00001E88 .text start:0x00001E88 end:0x00001FDC .text start:0x00001FDC end:0x00001FF8 diff --git a/config/GZLE01/rels/d_a_obj_timer/splits.txt b/config/GZLE01/rels/d_a_obj_timer/splits.txt index 956e466..162441e 100644 --- a/config/GZLE01/rels/d_a_obj_timer/splits.txt +++ b/config/GZLE01/rels/d_a_obj_timer/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_timer.cpp: +d/actor/d_a_obj_timer.cpp: .text start:0x00000078 end:0x0000040C .text start:0x0000040C end:0x00000428 .rodata start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_tntrap/splits.txt b/config/GZLE01/rels/d_a_obj_tntrap/splits.txt index 96e6362..31738ad 100644 --- a/config/GZLE01/rels/d_a_obj_tntrap/splits.txt +++ b/config/GZLE01/rels/d_a_obj_tntrap/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tntrap.cpp: +d/actor/d_a_obj_tntrap.cpp: .text start:0x00000078 end:0x00001DC0 .text start:0x00001DC0 end:0x00001DEC .rodata start:0x00000000 end:0x00000173 diff --git a/config/GZLE01/rels/d_a_obj_toripost/splits.txt b/config/GZLE01/rels/d_a_obj_toripost/splits.txt index f77f570..16007bf 100644 --- a/config/GZLE01/rels/d_a_obj_toripost/splits.txt +++ b/config/GZLE01/rels/d_a_obj_toripost/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_toripost.cpp: +d/actor/d_a_obj_toripost.cpp: .text start:0x000000EC end:0x00002438 .text start:0x00002438 end:0x0000244C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_tousekiki/splits.txt b/config/GZLE01/rels/d_a_obj_tousekiki/splits.txt index 3eedcb7..daa1763 100644 --- a/config/GZLE01/rels/d_a_obj_tousekiki/splits.txt +++ b/config/GZLE01/rels/d_a_obj_tousekiki/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_tousekiki.cpp: +d/actor/d_a_obj_tousekiki.cpp: .text start:0x000000EC end:0x00000A38 .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000144 diff --git a/config/GZLE01/rels/d_a_obj_tower/splits.txt b/config/GZLE01/rels/d_a_obj_tower/splits.txt index c7fba0a..c181478 100644 --- a/config/GZLE01/rels/d_a_obj_tower/splits.txt +++ b/config/GZLE01/rels/d_a_obj_tower/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tower.cpp: +d/actor/d_a_obj_tower.cpp: .text start:0x00000078 end:0x00000570 .rodata start:0x00000000 end:0x0000003E .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_trap/splits.txt b/config/GZLE01/rels/d_a_obj_trap/splits.txt index 2402a10..295a9c2 100644 --- a/config/GZLE01/rels/d_a_obj_trap/splits.txt +++ b/config/GZLE01/rels/d_a_obj_trap/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_trap.cpp: +d/actor/d_a_obj_trap.cpp: .text start:0x000000EC end:0x00002F5C .rodata start:0x00000000 end:0x000000C2 .data start:0x00000000 end:0x000002F4 diff --git a/config/GZLE01/rels/d_a_obj_tribox/splits.txt b/config/GZLE01/rels/d_a_obj_tribox/splits.txt index 6749e23..12d337a 100644 --- a/config/GZLE01/rels/d_a_obj_tribox/splits.txt +++ b/config/GZLE01/rels/d_a_obj_tribox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_tribox.cpp: +d/actor/d_a_obj_tribox.cpp: .text start:0x000000EC end:0x000036C8 .text start:0x000036C8 end:0x00003D78 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_try/splits.txt b/config/GZLE01/rels/d_a_obj_try/splits.txt index 4432218..a99398c 100644 --- a/config/GZLE01/rels/d_a_obj_try/splits.txt +++ b/config/GZLE01/rels/d_a_obj_try/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_try.cpp: +d/actor/d_a_obj_try.cpp: .text start:0x00000078 end:0x000034F0 .text start:0x000034F0 end:0x00003564 .rodata start:0x00000000 end:0x00000710 diff --git a/config/GZLE01/rels/d_a_obj_usovmc/splits.txt b/config/GZLE01/rels/d_a_obj_usovmc/splits.txt index 9060ce0..c03bd0d 100644 --- a/config/GZLE01/rels/d_a_obj_usovmc/splits.txt +++ b/config/GZLE01/rels/d_a_obj_usovmc/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_usovmc.cpp: +d/actor/d_a_obj_usovmc.cpp: .text start:0x00000078 end:0x00000534 .text start:0x00000534 end:0x0000054C .rodata start:0x00000000 end:0x00000083 diff --git a/config/GZLE01/rels/d_a_obj_vfan/splits.txt b/config/GZLE01/rels/d_a_obj_vfan/splits.txt index 149cf01..9942399 100644 --- a/config/GZLE01/rels/d_a_obj_vfan/splits.txt +++ b/config/GZLE01/rels/d_a_obj_vfan/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vfan.cpp: +d/actor/d_a_obj_vfan.cpp: .text start:0x00000078 end:0x00000DD8 .text start:0x00000DD8 end:0x00000EDC .text start:0x00000EDC end:0x00000F08 diff --git a/config/GZLE01/rels/d_a_obj_vgnfd/splits.txt b/config/GZLE01/rels/d_a_obj_vgnfd/splits.txt index 1401541..70e0bde 100644 --- a/config/GZLE01/rels/d_a_obj_vgnfd/splits.txt +++ b/config/GZLE01/rels/d_a_obj_vgnfd/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vgnfd.cpp: +d/actor/d_a_obj_vgnfd.cpp: .text start:0x00000078 end:0x00001538 .rodata start:0x00000000 end:0x00000130 .data start:0x00000000 end:0x0000011C diff --git a/config/GZLE01/rels/d_a_obj_vmc/splits.txt b/config/GZLE01/rels/d_a_obj_vmc/splits.txt index c16936e..baa6c27 100644 --- a/config/GZLE01/rels/d_a_obj_vmc/splits.txt +++ b/config/GZLE01/rels/d_a_obj_vmc/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vmc.cpp: +d/actor/d_a_obj_vmc.cpp: .text start:0x00000078 end:0x0000144C .text start:0x0000144C end:0x00001478 .rodata start:0x00000000 end:0x000000AA diff --git a/config/GZLE01/rels/d_a_obj_vmsdz/splits.txt b/config/GZLE01/rels/d_a_obj_vmsdz/splits.txt index dc59069..addf58a 100644 --- a/config/GZLE01/rels/d_a_obj_vmsdz/splits.txt +++ b/config/GZLE01/rels/d_a_obj_vmsdz/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vmsdz.cpp: +d/actor/d_a_obj_vmsdz.cpp: .text start:0x00000078 end:0x00000394 .rodata start:0x00000000 end:0x0000002D .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_vmsms/splits.txt b/config/GZLE01/rels/d_a_obj_vmsms/splits.txt index 60a3039..efd64f5 100644 --- a/config/GZLE01/rels/d_a_obj_vmsms/splits.txt +++ b/config/GZLE01/rels/d_a_obj_vmsms/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vmsms.cpp: +d/actor/d_a_obj_vmsms.cpp: .text start:0x00000078 end:0x00000400 .rodata start:0x00000000 end:0x0000003A .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_obj_volcano/splits.txt b/config/GZLE01/rels/d_a_obj_volcano/splits.txt index 9aac53a..e0701d7 100644 --- a/config/GZLE01/rels/d_a_obj_volcano/splits.txt +++ b/config/GZLE01/rels/d_a_obj_volcano/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_volcano.cpp: +d/actor/d_a_obj_volcano.cpp: .text start:0x00000078 end:0x00001C44 .text start:0x00001C44 end:0x00001D48 .text start:0x00001D48 end:0x00001D74 diff --git a/config/GZLE01/rels/d_a_obj_vtil/splits.txt b/config/GZLE01/rels/d_a_obj_vtil/splits.txt index b5a862d..22793da 100644 --- a/config/GZLE01/rels/d_a_obj_vtil/splits.txt +++ b/config/GZLE01/rels/d_a_obj_vtil/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vtil.cpp: +d/actor/d_a_obj_vtil.cpp: .text start:0x00000078 end:0x00001B18 .text start:0x00001B18 end:0x00001B54 .rodata start:0x00000000 end:0x00000130 diff --git a/config/GZLE01/rels/d_a_obj_vyasi/splits.txt b/config/GZLE01/rels/d_a_obj_vyasi/splits.txt index 76580b3..f9c1034 100644 --- a/config/GZLE01/rels/d_a_obj_vyasi/splits.txt +++ b/config/GZLE01/rels/d_a_obj_vyasi/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_vyasi.cpp: +d/actor/d_a_obj_vyasi.cpp: .text start:0x000000EC end:0x00002D94 .text start:0x00002D94 end:0x00002F68 .text start:0x00002F68 end:0x00002FB4 diff --git a/config/GZLE01/rels/d_a_obj_warpt/splits.txt b/config/GZLE01/rels/d_a_obj_warpt/splits.txt index ab4fa8f..d32c4e5 100644 --- a/config/GZLE01/rels/d_a_obj_warpt/splits.txt +++ b/config/GZLE01/rels/d_a_obj_warpt/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_warpt.cpp: +d/actor/d_a_obj_warpt.cpp: .text start:0x000000EC end:0x00002CB0 .text start:0x00002CB0 end:0x00002CB0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_obj_wood/splits.txt b/config/GZLE01/rels/d_a_obj_wood/splits.txt index e7f634c..64face4 100644 --- a/config/GZLE01/rels/d_a_obj_wood/splits.txt +++ b/config/GZLE01/rels/d_a_obj_wood/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_wood.cpp: +d/actor/d_a_obj_wood.cpp: .text start:0x00000078 end:0x0000048C .data start:0x00000000 end:0x00000144 diff --git a/config/GZLE01/rels/d_a_obj_xfuta/splits.txt b/config/GZLE01/rels/d_a_obj_xfuta/splits.txt index 6ff70af..b0404b9 100644 --- a/config/GZLE01/rels/d_a_obj_xfuta/splits.txt +++ b/config/GZLE01/rels/d_a_obj_xfuta/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_xfuta.cpp: +d/actor/d_a_obj_xfuta.cpp: .text start:0x00000078 end:0x000004A0 .text start:0x000004A0 end:0x00000500 .rodata start:0x00000000 end:0x00000031 diff --git a/config/GZLE01/rels/d_a_obj_zouK/splits.txt b/config/GZLE01/rels/d_a_obj_zouK/splits.txt index 8161d38..0934d91 100644 --- a/config/GZLE01/rels/d_a_obj_zouK/splits.txt +++ b/config/GZLE01/rels/d_a_obj_zouK/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_zouK.cpp: +d/actor/d_a_obj_zouK.cpp: .text start:0x00000078 end:0x00001A14 .text start:0x00001A14 end:0x00001E18 .text start:0x00001E18 end:0x00001E84 diff --git a/config/GZLE01/rels/d_a_oq/splits.txt b/config/GZLE01/rels/d_a_oq/splits.txt index 3618cd4..96547c6 100644 --- a/config/GZLE01/rels/d_a_oq/splits.txt +++ b/config/GZLE01/rels/d_a_oq/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_oq.cpp: +d/actor/d_a_oq.cpp: .text start:0x000000EC end:0x00005A50 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000132 diff --git a/config/GZLE01/rels/d_a_oship/splits.txt b/config/GZLE01/rels/d_a_oship/splits.txt index 9eedc6b..6c0b2c8 100644 --- a/config/GZLE01/rels/d_a_oship/splits.txt +++ b/config/GZLE01/rels/d_a_oship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_oship.cpp: +d/actor/d_a_oship.cpp: .text start:0x000000EC end:0x000042B0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000001F3 diff --git a/config/GZLE01/rels/d_a_pedestal/splits.txt b/config/GZLE01/rels/d_a_pedestal/splits.txt index 895563a..60865b8 100644 --- a/config/GZLE01/rels/d_a_pedestal/splits.txt +++ b/config/GZLE01/rels/d_a_pedestal/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_pedestal.cpp: +d/actor/d_a_pedestal.cpp: .text start:0x00000078 end:0x000010D4 .text start:0x000010D4 end:0x00001374 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_ph/splits.txt b/config/GZLE01/rels/d_a_ph/splits.txt index b4c5d3f..f269945 100644 --- a/config/GZLE01/rels/d_a_ph/splits.txt +++ b/config/GZLE01/rels/d_a_ph/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ph.cpp: +d/actor/d_a_ph.cpp: .text start:0x00000078 end:0x00007874 .rodata start:0x00000000 end:0x0000014C .data start:0x00000000 end:0x000004C8 diff --git a/config/GZLE01/rels/d_a_pirate_flag/splits.txt b/config/GZLE01/rels/d_a_pirate_flag/splits.txt index 487a894..135aff7 100644 --- a/config/GZLE01/rels/d_a_pirate_flag/splits.txt +++ b/config/GZLE01/rels/d_a_pirate_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_pirate_flag.cpp: +d/actor/d_a_pirate_flag.cpp: .text start:0x000000EC end:0x00001D6C .text start:0x00001D6C end:0x00001E3C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_pt/splits.txt b/config/GZLE01/rels/d_a_pt/splits.txt index 9a7bebc..0cdc19f 100644 --- a/config/GZLE01/rels/d_a_pt/splits.txt +++ b/config/GZLE01/rels/d_a_pt/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_pt.cpp: +d/actor/d_a_pt.cpp: .text start:0x000000EC end:0x000059A0 .text start:0x000059A0 end:0x000059A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_pw/splits.txt b/config/GZLE01/rels/d_a_pw/splits.txt index 06d9a21..a82ddbe 100644 --- a/config/GZLE01/rels/d_a_pw/splits.txt +++ b/config/GZLE01/rels/d_a_pw/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_pw.cpp: +d/actor/d_a_pw.cpp: .text start:0x00000078 end:0x00007704 .rodata start:0x00000000 end:0x00000113 .data start:0x00000000 end:0x000006AC diff --git a/config/GZLE01/rels/d_a_pz/splits.txt b/config/GZLE01/rels/d_a_pz/splits.txt index 9f719de..6f1a154 100644 --- a/config/GZLE01/rels/d_a_pz/splits.txt +++ b/config/GZLE01/rels/d_a_pz/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_pz.cpp: +d/actor/d_a_pz.cpp: .text start:0x000000EC end:0x000082AC .text start:0x000082AC end:0x00008350 .text start:0x00008350 end:0x000083AC diff --git a/config/GZLE01/rels/d_a_race_item/splits.txt b/config/GZLE01/rels/d_a_race_item/splits.txt index ba5a0c1..4636ccd 100644 --- a/config/GZLE01/rels/d_a_race_item/splits.txt +++ b/config/GZLE01/rels/d_a_race_item/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_race_item.cpp: +d/actor/d_a_race_item.cpp: .text start:0x00000078 end:0x00000C8C .text start:0x00000C8C end:0x00000CA8 .text start:0x00000CA8 end:0x00000DB8 diff --git a/config/GZLE01/rels/d_a_rd/splits.txt b/config/GZLE01/rels/d_a_rd/splits.txt index d5d9453..72c5b74 100644 --- a/config/GZLE01/rels/d_a_rd/splits.txt +++ b/config/GZLE01/rels/d_a_rd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_rd.cpp: +d/actor/d_a_rd.cpp: .text start:0x000000EC end:0x00005450 .text start:0x00005450 end:0x00005498 .text start:0x00005498 end:0x00005528 diff --git a/config/GZLE01/rels/d_a_rectangle/splits.txt b/config/GZLE01/rels/d_a_rectangle/splits.txt index cd04c36..9861d3b 100644 --- a/config/GZLE01/rels/d_a_rectangle/splits.txt +++ b/config/GZLE01/rels/d_a_rectangle/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_rectangle.cpp: +d/actor/d_a_rectangle.cpp: .text start:0x00000078 end:0x000000A0 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_sail/splits.txt b/config/GZLE01/rels/d_a_sail/splits.txt index 81a93ae..245bcfd 100644 --- a/config/GZLE01/rels/d_a_sail/splits.txt +++ b/config/GZLE01/rels/d_a_sail/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sail.cpp: +d/actor/d_a_sail.cpp: .text start:0x000000EC end:0x0000259C .text start:0x0000259C end:0x0000266C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_saku/splits.txt b/config/GZLE01/rels/d_a_saku/splits.txt index 29400c9..8ef6f37 100644 --- a/config/GZLE01/rels/d_a_saku/splits.txt +++ b/config/GZLE01/rels/d_a_saku/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_saku.cpp: +d/actor/d_a_saku.cpp: .text start:0x000000EC end:0x00002840 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000014C diff --git a/config/GZLE01/rels/d_a_salvage/splits.txt b/config/GZLE01/rels/d_a_salvage/splits.txt index 205709d..aa69585 100644 --- a/config/GZLE01/rels/d_a_salvage/splits.txt +++ b/config/GZLE01/rels/d_a_salvage/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_salvage.cpp: +d/actor/d_a_salvage.cpp: .text start:0x00000078 end:0x000025A4 .text start:0x000025A4 end:0x000026B0 .rodata start:0x00000000 end:0x000000EB diff --git a/config/GZLE01/rels/d_a_salvage_tbox/splits.txt b/config/GZLE01/rels/d_a_salvage_tbox/splits.txt index b623b42..a92bff1 100644 --- a/config/GZLE01/rels/d_a_salvage_tbox/splits.txt +++ b/config/GZLE01/rels/d_a_salvage_tbox/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_salvage_tbox.cpp: +d/actor/d_a_salvage_tbox.cpp: .text start:0x00000078 end:0x000014A8 .text start:0x000014A8 end:0x000016D4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_sbox/splits.txt b/config/GZLE01/rels/d_a_sbox/splits.txt index bfb551e..f4d7afb 100644 --- a/config/GZLE01/rels/d_a_sbox/splits.txt +++ b/config/GZLE01/rels/d_a_sbox/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_sbox.cpp: +d/actor/d_a_sbox.cpp: .text start:0x00000078 end:0x00001660 .rodata start:0x00000000 end:0x000000BA .data start:0x00000000 end:0x0000008C diff --git a/config/GZLE01/rels/d_a_scene_change/splits.txt b/config/GZLE01/rels/d_a_scene_change/splits.txt index 03cf2d5..83746d6 100644 --- a/config/GZLE01/rels/d_a_scene_change/splits.txt +++ b/config/GZLE01/rels/d_a_scene_change/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_scene_change.cpp: +d/actor/d_a_scene_change.cpp: .text start:0x000000EC end:0x00000254 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000004 diff --git a/config/GZLE01/rels/d_a_seatag/splits.txt b/config/GZLE01/rels/d_a_seatag/splits.txt index 8325b88..9e6142b 100644 --- a/config/GZLE01/rels/d_a_seatag/splits.txt +++ b/config/GZLE01/rels/d_a_seatag/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_seatag.cpp: +d/actor/d_a_seatag.cpp: .text start:0x00000078 end:0x00000110 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_shand/splits.txt b/config/GZLE01/rels/d_a_shand/splits.txt index ef371ba..c6198c0 100644 --- a/config/GZLE01/rels/d_a_shand/splits.txt +++ b/config/GZLE01/rels/d_a_shand/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_shand.cpp: +d/actor/d_a_shand.cpp: .text start:0x000000EC end:0x00002C80 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000093 diff --git a/config/GZLE01/rels/d_a_ship/splits.txt b/config/GZLE01/rels/d_a_ship/splits.txt index fc6a38c..58799bc 100644 --- a/config/GZLE01/rels/d_a_ship/splits.txt +++ b/config/GZLE01/rels/d_a_ship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ship.cpp: +d/actor/d_a_ship.cpp: .text start:0x000000EC end:0x0000D3FC .text start:0x0000D3FC end:0x0000D498 .text start:0x0000D498 end:0x0000D500 diff --git a/config/GZLE01/rels/d_a_shop_item/splits.txt b/config/GZLE01/rels/d_a_shop_item/splits.txt index 8068f1c..1a803c7 100644 --- a/config/GZLE01/rels/d_a_shop_item/splits.txt +++ b/config/GZLE01/rels/d_a_shop_item/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_shop_item.cpp: +d/actor/d_a_shop_item.cpp: .text start:0x00000078 end:0x00000E68 .text start:0x00000E68 end:0x00000E84 .text start:0x00000E84 end:0x00000EA8 diff --git a/config/GZLE01/rels/d_a_shutter/splits.txt b/config/GZLE01/rels/d_a_shutter/splits.txt index c0a9829..67eb0a5 100644 --- a/config/GZLE01/rels/d_a_shutter/splits.txt +++ b/config/GZLE01/rels/d_a_shutter/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_shutter.cpp: +d/actor/d_a_shutter.cpp: .text start:0x00000078 end:0x00000E7C .rodata start:0x00000000 end:0x000000EA .data start:0x00000000 end:0x00000080 diff --git a/config/GZLE01/rels/d_a_shutter2/splits.txt b/config/GZLE01/rels/d_a_shutter2/splits.txt index 4761bbb..ed55be2 100644 --- a/config/GZLE01/rels/d_a_shutter2/splits.txt +++ b/config/GZLE01/rels/d_a_shutter2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_shutter2.cpp: +d/actor/d_a_shutter2.cpp: .text start:0x00000078 end:0x000009E4 .text start:0x000009E4 end:0x000009FC .rodata start:0x00000000 end:0x000000AB diff --git a/config/GZLE01/rels/d_a_sie_flag/splits.txt b/config/GZLE01/rels/d_a_sie_flag/splits.txt index 34a39e9..abef897 100644 --- a/config/GZLE01/rels/d_a_sie_flag/splits.txt +++ b/config/GZLE01/rels/d_a_sie_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sie_flag.cpp: +d/actor/d_a_sie_flag.cpp: .text start:0x000000EC end:0x00000E10 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000087 diff --git a/config/GZLE01/rels/d_a_sitem/splits.txt b/config/GZLE01/rels/d_a_sitem/splits.txt index d2247b3..689075d 100644 --- a/config/GZLE01/rels/d_a_sitem/splits.txt +++ b/config/GZLE01/rels/d_a_sitem/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sitem.cpp: +d/actor/d_a_sitem.cpp: .text start:0x000000EC end:0x000031F0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000086 diff --git a/config/GZLE01/rels/d_a_sk/splits.txt b/config/GZLE01/rels/d_a_sk/splits.txt index 5985903..507867c 100644 --- a/config/GZLE01/rels/d_a_sk/splits.txt +++ b/config/GZLE01/rels/d_a_sk/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_sk.cpp: +d/actor/d_a_sk.cpp: .text start:0x00000078 end:0x000011AC .rodata start:0x00000000 end:0x0000003F .data start:0x00000000 end:0x000001B4 diff --git a/config/GZLE01/rels/d_a_sk2/splits.txt b/config/GZLE01/rels/d_a_sk2/splits.txt index d2d84e5..b96314e 100644 --- a/config/GZLE01/rels/d_a_sk2/splits.txt +++ b/config/GZLE01/rels/d_a_sk2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_sk2.cpp: +d/actor/d_a_sk2.cpp: .text start:0x00000078 end:0x00000C78 .text start:0x00000C78 end:0x00000C7C .text start:0x00000C7C end:0x00000D38 diff --git a/config/GZLE01/rels/d_a_spotbox/splits.txt b/config/GZLE01/rels/d_a_spotbox/splits.txt index 093b55b..98bd808 100644 --- a/config/GZLE01/rels/d_a_spotbox/splits.txt +++ b/config/GZLE01/rels/d_a_spotbox/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_spotbox.cpp: +d/actor/d_a_spotbox.cpp: .text start:0x00000078 end:0x00000250 .rodata start:0x00000000 end:0x00000014 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_ss/splits.txt b/config/GZLE01/rels/d_a_ss/splits.txt index 63dcda7..809c19e 100644 --- a/config/GZLE01/rels/d_a_ss/splits.txt +++ b/config/GZLE01/rels/d_a_ss/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ss.cpp: +d/actor/d_a_ss.cpp: .text start:0x000000EC end:0x0000387C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000BE diff --git a/config/GZLE01/rels/d_a_ssk/splits.txt b/config/GZLE01/rels/d_a_ssk/splits.txt index 2aec56f..5ffdf5d 100644 --- a/config/GZLE01/rels/d_a_ssk/splits.txt +++ b/config/GZLE01/rels/d_a_ssk/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ssk.cpp: +d/actor/d_a_ssk.cpp: .text start:0x00000078 end:0x000015BC .rodata start:0x00000000 end:0x0000005C .data start:0x00000000 end:0x000001DC diff --git a/config/GZLE01/rels/d_a_sss/splits.txt b/config/GZLE01/rels/d_a_sss/splits.txt index ac93ea2..63ab59c 100644 --- a/config/GZLE01/rels/d_a_sss/splits.txt +++ b/config/GZLE01/rels/d_a_sss/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sss.cpp: +d/actor/d_a_sss.cpp: .text start:0x000000EC end:0x00002FD4 .text start:0x00002FD4 end:0x00003354 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_st/splits.txt b/config/GZLE01/rels/d_a_st/splits.txt index a56c22a..faa4b05 100644 --- a/config/GZLE01/rels/d_a_st/splits.txt +++ b/config/GZLE01/rels/d_a_st/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_st.cpp: +d/actor/d_a_st.cpp: .text start:0x000000EC end:0x00009DBC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000159 diff --git a/config/GZLE01/rels/d_a_steam_tag/splits.txt b/config/GZLE01/rels/d_a_steam_tag/splits.txt index 9a9fa6e..b0dbb10 100644 --- a/config/GZLE01/rels/d_a_steam_tag/splits.txt +++ b/config/GZLE01/rels/d_a_steam_tag/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_steam_tag.cpp: +d/actor/d_a_steam_tag.cpp: .text start:0x00000078 end:0x00001064 .rodata start:0x00000000 end:0x0000002C .data start:0x00000000 end:0x00000258 diff --git a/config/GZLE01/rels/d_a_stone/splits.txt b/config/GZLE01/rels/d_a_stone/splits.txt index 4fa911a..0b982fb 100644 --- a/config/GZLE01/rels/d_a_stone/splits.txt +++ b/config/GZLE01/rels/d_a_stone/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_stone.cpp: +d/actor/d_a_stone.cpp: .text start:0x000000EC end:0x00003700 .text start:0x00003700 end:0x00003700 .text start:0x00003700 end:0x000037E8 diff --git a/config/GZLE01/rels/d_a_stone2/splits.txt b/config/GZLE01/rels/d_a_stone2/splits.txt index 53f3f74..93feacf 100644 --- a/config/GZLE01/rels/d_a_stone2/splits.txt +++ b/config/GZLE01/rels/d_a_stone2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_stone2.cpp: +d/actor/d_a_stone2.cpp: .text start:0x000000EC end:0x000027F4 .text start:0x000027F4 end:0x00002B08 .text start:0x00002B08 end:0x00002D80 diff --git a/config/GZLE01/rels/d_a_swattack/splits.txt b/config/GZLE01/rels/d_a_swattack/splits.txt index e4f3858..455374a 100644 --- a/config/GZLE01/rels/d_a_swattack/splits.txt +++ b/config/GZLE01/rels/d_a_swattack/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swattack.cpp: +d/actor/d_a_swattack.cpp: .text start:0x00000078 end:0x000006F4 .rodata start:0x00000000 end:0x00000008 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLE01/rels/d_a_swc00/splits.txt b/config/GZLE01/rels/d_a_swc00/splits.txt index 8664d0e..7ec2062 100644 --- a/config/GZLE01/rels/d_a_swc00/splits.txt +++ b/config/GZLE01/rels/d_a_swc00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swc00.cpp: +d/actor/d_a_swc00.cpp: .text start:0x00000078 end:0x00000274 .rodata start:0x00000000 end:0x0000000C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_swhit0/splits.txt b/config/GZLE01/rels/d_a_swhit0/splits.txt index 2776ed9..b21e624 100644 --- a/config/GZLE01/rels/d_a_swhit0/splits.txt +++ b/config/GZLE01/rels/d_a_swhit0/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swhit0.cpp: +d/actor/d_a_swhit0.cpp: .text start:0x00000078 end:0x00001698 .text start:0x00001698 end:0x000018A8 .rodata start:0x00000000 end:0x0000006F diff --git a/config/GZLE01/rels/d_a_switem/splits.txt b/config/GZLE01/rels/d_a_switem/splits.txt index 45dcd7e..e2d5eae 100644 --- a/config/GZLE01/rels/d_a_switem/splits.txt +++ b/config/GZLE01/rels/d_a_switem/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_switem.cpp: +d/actor/d_a_switem.cpp: .text start:0x00000078 end:0x00000904 .rodata start:0x00000000 end:0x00000010 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLE01/rels/d_a_swpropeller/splits.txt b/config/GZLE01/rels/d_a_swpropeller/splits.txt index 027f610..1ee8ed3 100644 --- a/config/GZLE01/rels/d_a_swpropeller/splits.txt +++ b/config/GZLE01/rels/d_a_swpropeller/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swpropeller.cpp: +d/actor/d_a_swpropeller.cpp: .text start:0x00000078 end:0x00000DA0 .rodata start:0x00000000 end:0x00000087 .data start:0x00000000 end:0x000001B4 diff --git a/config/GZLE01/rels/d_a_swtact/splits.txt b/config/GZLE01/rels/d_a_swtact/splits.txt index 0b7d244..f2d1e7e 100644 --- a/config/GZLE01/rels/d_a_swtact/splits.txt +++ b/config/GZLE01/rels/d_a_swtact/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swtact.cpp: +d/actor/d_a_swtact.cpp: .text start:0x00000078 end:0x000007B4 .text start:0x000007B4 end:0x000007B4 .rodata start:0x00000000 end:0x00000069 diff --git a/config/GZLE01/rels/d_a_swtdoor/splits.txt b/config/GZLE01/rels/d_a_swtdoor/splits.txt index 6d8402b..a0af862 100644 --- a/config/GZLE01/rels/d_a_swtdoor/splits.txt +++ b/config/GZLE01/rels/d_a_swtdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swtdoor.cpp: +d/actor/d_a_swtdoor.cpp: .text start:0x00000078 end:0x00000374 .rodata start:0x00000000 end:0x00000024 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_syan/splits.txt b/config/GZLE01/rels/d_a_syan/splits.txt index 00e6ec3..9bf3a13 100644 --- a/config/GZLE01/rels/d_a_syan/splits.txt +++ b/config/GZLE01/rels/d_a_syan/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_syan.cpp: +d/actor/d_a_syan.cpp: .text start:0x000000EC end:0x0000116C .rodata start:0x00000000 end:0x000000A5 .data start:0x00000000 end:0x00000110 diff --git a/config/GZLE01/rels/d_a_tag_attention/splits.txt b/config/GZLE01/rels/d_a_tag_attention/splits.txt index 4dfdcd4..dbedfae 100644 --- a/config/GZLE01/rels/d_a_tag_attention/splits.txt +++ b/config/GZLE01/rels/d_a_tag_attention/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_attention.cpp: +d/actor/d_a_tag_attention.cpp: .text start:0x00000078 end:0x000005C4 .text start:0x000005C4 end:0x000007E0 .text start:0x000007E0 end:0x0000080C diff --git a/config/GZLE01/rels/d_a_tag_ba1/splits.txt b/config/GZLE01/rels/d_a_tag_ba1/splits.txt index 379cdc1..3e7e3ce 100644 --- a/config/GZLE01/rels/d_a_tag_ba1/splits.txt +++ b/config/GZLE01/rels/d_a_tag_ba1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_ba1.cpp: +d/actor/d_a_tag_ba1.cpp: .text start:0x000000EC end:0x00000560 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000022 diff --git a/config/GZLE01/rels/d_a_tag_etc/splits.txt b/config/GZLE01/rels/d_a_tag_etc/splits.txt index 0a35785..0a07536 100644 --- a/config/GZLE01/rels/d_a_tag_etc/splits.txt +++ b/config/GZLE01/rels/d_a_tag_etc/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_etc.cpp: +d/actor/d_a_tag_etc.cpp: .text start:0x00000078 end:0x00000788 .rodata start:0x00000000 end:0x0000002E .data start:0x00000000 end:0x00000064 diff --git a/config/GZLE01/rels/d_a_tag_event/splits.txt b/config/GZLE01/rels/d_a_tag_event/splits.txt index a24eaa0..411f375 100644 --- a/config/GZLE01/rels/d_a_tag_event/splits.txt +++ b/config/GZLE01/rels/d_a_tag_event/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_event.cpp: +d/actor/d_a_tag_event.cpp: .text start:0x00000078 end:0x00001524 .rodata start:0x00000000 end:0x00000057 .data start:0x00000000 end:0x000000E4 diff --git a/config/GZLE01/rels/d_a_tag_evsw/splits.txt b/config/GZLE01/rels/d_a_tag_evsw/splits.txt index ba2a120..595935f 100644 --- a/config/GZLE01/rels/d_a_tag_evsw/splits.txt +++ b/config/GZLE01/rels/d_a_tag_evsw/splits.txt @@ -7,7 +7,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_evsw.cpp: +d/actor/d_a_tag_evsw.cpp: .text start:0x00000078 end:0x00000604 .text start:0x00000604 end:0x00000630 .data start:0x00000000 end:0x00000144 diff --git a/config/GZLE01/rels/d_a_tag_ghostship/splits.txt b/config/GZLE01/rels/d_a_tag_ghostship/splits.txt index a855c58..bab6807 100644 --- a/config/GZLE01/rels/d_a_tag_ghostship/splits.txt +++ b/config/GZLE01/rels/d_a_tag_ghostship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_ghostship.cpp: +d/actor/d_a_tag_ghostship.cpp: .text start:0x000000EC end:0x0000070C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000008E diff --git a/config/GZLE01/rels/d_a_tag_hint/splits.txt b/config/GZLE01/rels/d_a_tag_hint/splits.txt index e31c7c9..0747b40 100644 --- a/config/GZLE01/rels/d_a_tag_hint/splits.txt +++ b/config/GZLE01/rels/d_a_tag_hint/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_hint.cpp: +d/actor/d_a_tag_hint.cpp: .text start:0x000000EC end:0x00002264 .text start:0x00002264 end:0x00002280 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_tag_island/splits.txt b/config/GZLE01/rels/d_a_tag_island/splits.txt index ce90485..89d2487 100644 --- a/config/GZLE01/rels/d_a_tag_island/splits.txt +++ b/config/GZLE01/rels/d_a_tag_island/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_island.cpp: +d/actor/d_a_tag_island.cpp: .text start:0x00000078 end:0x000013D8 .text start:0x000013D8 end:0x000013D8 .rodata start:0x00000000 end:0x0000011E diff --git a/config/GZLE01/rels/d_a_tag_kb_item/splits.txt b/config/GZLE01/rels/d_a_tag_kb_item/splits.txt index 9f4ed36..b01664e 100644 --- a/config/GZLE01/rels/d_a_tag_kb_item/splits.txt +++ b/config/GZLE01/rels/d_a_tag_kb_item/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_kb_item.cpp: +d/actor/d_a_tag_kb_item.cpp: .text start:0x00000078 end:0x00000260 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_tag_kf1/splits.txt b/config/GZLE01/rels/d_a_tag_kf1/splits.txt index 2a616fa..5008033 100644 --- a/config/GZLE01/rels/d_a_tag_kf1/splits.txt +++ b/config/GZLE01/rels/d_a_tag_kf1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_kf1.cpp: +d/actor/d_a_tag_kf1.cpp: .text start:0x000000EC end:0x0000127C .text start:0x0000127C end:0x00001290 .text start:0x00001290 end:0x00001308 diff --git a/config/GZLE01/rels/d_a_tag_kk1/splits.txt b/config/GZLE01/rels/d_a_tag_kk1/splits.txt index 856b4a1..367f15e 100644 --- a/config/GZLE01/rels/d_a_tag_kk1/splits.txt +++ b/config/GZLE01/rels/d_a_tag_kk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_kk1.cpp: +d/actor/d_a_tag_kk1.cpp: .text start:0x000000EC end:0x000007C0 .text start:0x000007C0 end:0x000008C0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_tag_light/splits.txt b/config/GZLE01/rels/d_a_tag_light/splits.txt index 144c6f8..d4cec52 100644 --- a/config/GZLE01/rels/d_a_tag_light/splits.txt +++ b/config/GZLE01/rels/d_a_tag_light/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_light.cpp: +d/actor/d_a_tag_light.cpp: .text start:0x00000078 end:0x00002088 .text start:0x00002088 end:0x000020F4 .rodata start:0x00000000 end:0x0000012C diff --git a/config/GZLE01/rels/d_a_tag_md_cb/splits.txt b/config/GZLE01/rels/d_a_tag_md_cb/splits.txt index 289f265..150f73d 100644 --- a/config/GZLE01/rels/d_a_tag_md_cb/splits.txt +++ b/config/GZLE01/rels/d_a_tag_md_cb/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_md_cb.cpp: +d/actor/d_a_tag_md_cb.cpp: .text start:0x000000EC end:0x00001B88 .text start:0x00001B88 end:0x00001B88 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_tag_mk/splits.txt b/config/GZLE01/rels/d_a_tag_mk/splits.txt index 0326d8d..eeafc56 100644 --- a/config/GZLE01/rels/d_a_tag_mk/splits.txt +++ b/config/GZLE01/rels/d_a_tag_mk/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_mk.cpp: +d/actor/d_a_tag_mk.cpp: .text start:0x00000078 end:0x000011E4 .rodata start:0x00000000 end:0x00000093 .data start:0x00000000 end:0x000000BC diff --git a/config/GZLE01/rels/d_a_tag_msg/splits.txt b/config/GZLE01/rels/d_a_tag_msg/splits.txt index 9fd4638..4858dde 100644 --- a/config/GZLE01/rels/d_a_tag_msg/splits.txt +++ b/config/GZLE01/rels/d_a_tag_msg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_msg.cpp: +d/actor/d_a_tag_msg.cpp: .text start:0x00000078 end:0x00000964 .rodata start:0x00000000 end:0x00000046 .data start:0x00000000 end:0x00000060 diff --git a/config/GZLE01/rels/d_a_tag_photo/splits.txt b/config/GZLE01/rels/d_a_tag_photo/splits.txt index 22e7671..5ce0228 100644 --- a/config/GZLE01/rels/d_a_tag_photo/splits.txt +++ b/config/GZLE01/rels/d_a_tag_photo/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_photo.cpp: +d/actor/d_a_tag_photo.cpp: .text start:0x00000078 end:0x000009B0 .text start:0x000009B0 end:0x00000A0C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_tag_ret/splits.txt b/config/GZLE01/rels/d_a_tag_ret/splits.txt index 3b1672c..e10cf0a 100644 --- a/config/GZLE01/rels/d_a_tag_ret/splits.txt +++ b/config/GZLE01/rels/d_a_tag_ret/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_ret.cpp: +d/actor/d_a_tag_ret.cpp: .text start:0x00000078 end:0x000005E8 .text start:0x000005E8 end:0x00000614 .rodata start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_tag_so/splits.txt b/config/GZLE01/rels/d_a_tag_so/splits.txt index 2c07a38..5d83bb4 100644 --- a/config/GZLE01/rels/d_a_tag_so/splits.txt +++ b/config/GZLE01/rels/d_a_tag_so/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_so.cpp: +d/actor/d_a_tag_so.cpp: .text start:0x000000EC end:0x0000039C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000018 diff --git a/config/GZLE01/rels/d_a_tag_volcano/splits.txt b/config/GZLE01/rels/d_a_tag_volcano/splits.txt index 0862d75..3bce29d 100644 --- a/config/GZLE01/rels/d_a_tag_volcano/splits.txt +++ b/config/GZLE01/rels/d_a_tag_volcano/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_volcano.cpp: +d/actor/d_a_tag_volcano.cpp: .text start:0x00000078 end:0x00000A34 .text start:0x00000A34 end:0x00000A50 .rodata start:0x00000000 end:0x00000058 diff --git a/config/GZLE01/rels/d_a_tag_waterlevel/splits.txt b/config/GZLE01/rels/d_a_tag_waterlevel/splits.txt index 4e97882..7687a03 100644 --- a/config/GZLE01/rels/d_a_tag_waterlevel/splits.txt +++ b/config/GZLE01/rels/d_a_tag_waterlevel/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_waterlevel.cpp: +d/actor/d_a_tag_waterlevel.cpp: .text start:0x00000078 end:0x00000400 .text start:0x00000400 end:0x0000041C .rodata start:0x00000000 end:0x00000024 diff --git a/config/GZLE01/rels/d_a_tama/splits.txt b/config/GZLE01/rels/d_a_tama/splits.txt index c154694..1b95705 100644 --- a/config/GZLE01/rels/d_a_tama/splits.txt +++ b/config/GZLE01/rels/d_a_tama/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tama.cpp: +d/actor/d_a_tama.cpp: .text start:0x00000078 end:0x000007CC .rodata start:0x00000000 end:0x00000010 .data start:0x00000000 end:0x000001A8 diff --git a/config/GZLE01/rels/d_a_tbox/splits.txt b/config/GZLE01/rels/d_a_tbox/splits.txt index c88ba79..f965722 100644 --- a/config/GZLE01/rels/d_a_tbox/splits.txt +++ b/config/GZLE01/rels/d_a_tbox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tbox.cpp: +d/actor/d_a_tbox.cpp: .text start:0x000000EC end:0x00003A88 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000015C diff --git a/config/GZLE01/rels/d_a_title/splits.txt b/config/GZLE01/rels/d_a_title/splits.txt index ac42e90..f4773bc 100644 --- a/config/GZLE01/rels/d_a_title/splits.txt +++ b/config/GZLE01/rels/d_a_title/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_title.cpp: +d/actor/d_a_title.cpp: .text start:0x00000078 end:0x00001E28 .text start:0x00001E28 end:0x00001E4C .rodata start:0x00000000 end:0x000001DC diff --git a/config/GZLE01/rels/d_a_tn/splits.txt b/config/GZLE01/rels/d_a_tn/splits.txt index 03734a7..1900e84 100644 --- a/config/GZLE01/rels/d_a_tn/splits.txt +++ b/config/GZLE01/rels/d_a_tn/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tn.cpp: +d/actor/d_a_tn.cpp: .text start:0x000000EC end:0x0000DBEC .text start:0x0000DBEC end:0x0000DBEC .text start:0x0000DBEC end:0x0000DCAC diff --git a/config/GZLE01/rels/d_a_toge/splits.txt b/config/GZLE01/rels/d_a_toge/splits.txt index f11c82c..10d5a18 100644 --- a/config/GZLE01/rels/d_a_toge/splits.txt +++ b/config/GZLE01/rels/d_a_toge/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_toge.cpp: +d/actor/d_a_toge.cpp: .text start:0x00000078 end:0x00000EE4 .rodata start:0x00000000 end:0x0000006A .data start:0x00000000 end:0x00000188 diff --git a/config/GZLE01/rels/d_a_tori_flag/splits.txt b/config/GZLE01/rels/d_a_tori_flag/splits.txt index cab8985..bea92da 100644 --- a/config/GZLE01/rels/d_a_tori_flag/splits.txt +++ b/config/GZLE01/rels/d_a_tori_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tori_flag.cpp: +d/actor/d_a_tori_flag.cpp: .text start:0x000000EC end:0x00000D78 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000007C diff --git a/config/GZLE01/rels/d_a_tornado/splits.txt b/config/GZLE01/rels/d_a_tornado/splits.txt index 4c8c115..6878d93 100644 --- a/config/GZLE01/rels/d_a_tornado/splits.txt +++ b/config/GZLE01/rels/d_a_tornado/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tornado.cpp: +d/actor/d_a_tornado.cpp: .text start:0x000000EC end:0x0000164C .rodata start:0x00000000 end:0x000000DC .data start:0x00000000 end:0x00000088 diff --git a/config/GZLE01/rels/d_a_tpota/splits.txt b/config/GZLE01/rels/d_a_tpota/splits.txt index 674a456..fb7b612 100644 --- a/config/GZLE01/rels/d_a_tpota/splits.txt +++ b/config/GZLE01/rels/d_a_tpota/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tpota.cpp: +d/actor/d_a_tpota.cpp: .text start:0x00000078 end:0x00000564 .rodata start:0x00000000 end:0x0000000C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLE01/rels/d_a_tsubo/splits.txt b/config/GZLE01/rels/d_a_tsubo/splits.txt index b5f3514..0fb1896 100644 --- a/config/GZLE01/rels/d_a_tsubo/splits.txt +++ b/config/GZLE01/rels/d_a_tsubo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tsubo.cpp: +d/actor/d_a_tsubo.cpp: .text start:0x000000EC end:0x0000810C .text start:0x0000810C end:0x0000810C .text start:0x0000810C end:0x000081A0 diff --git a/config/GZLE01/rels/d_a_wall/splits.txt b/config/GZLE01/rels/d_a_wall/splits.txt index 1c8e5e5..358fb98 100644 --- a/config/GZLE01/rels/d_a_wall/splits.txt +++ b/config/GZLE01/rels/d_a_wall/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wall.cpp: +d/actor/d_a_wall.cpp: .text start:0x00000078 end:0x000012D8 .rodata start:0x00000000 end:0x00000144 .data start:0x00000000 end:0x00000268 diff --git a/config/GZLE01/rels/d_a_warpdm20/splits.txt b/config/GZLE01/rels/d_a_warpdm20/splits.txt index 7d580f3..49ddf8f 100644 --- a/config/GZLE01/rels/d_a_warpdm20/splits.txt +++ b/config/GZLE01/rels/d_a_warpdm20/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpdm20.cpp: +d/actor/d_a_warpdm20.cpp: .text start:0x00000078 end:0x00001AAC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000F5 diff --git a/config/GZLE01/rels/d_a_warpf/splits.txt b/config/GZLE01/rels/d_a_warpf/splits.txt index 089bc0c..3cc81e1 100644 --- a/config/GZLE01/rels/d_a_warpf/splits.txt +++ b/config/GZLE01/rels/d_a_warpf/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpf.cpp: +d/actor/d_a_warpf.cpp: .text start:0x00000078 end:0x00002638 .text start:0x00002638 end:0x00002638 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_warpfout/splits.txt b/config/GZLE01/rels/d_a_warpfout/splits.txt index 4ba4781..de43b6d 100644 --- a/config/GZLE01/rels/d_a_warpfout/splits.txt +++ b/config/GZLE01/rels/d_a_warpfout/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpfout.cpp: +d/actor/d_a_warpfout.cpp: .text start:0x00000078 end:0x00000808 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000037 diff --git a/config/GZLE01/rels/d_a_warpgn/splits.txt b/config/GZLE01/rels/d_a_warpgn/splits.txt index 973aa9b..84893c4 100644 --- a/config/GZLE01/rels/d_a_warpgn/splits.txt +++ b/config/GZLE01/rels/d_a_warpgn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpgn.cpp: +d/actor/d_a_warpgn.cpp: .text start:0x00000078 end:0x00001BCC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000DF diff --git a/config/GZLE01/rels/d_a_warphr/splits.txt b/config/GZLE01/rels/d_a_warphr/splits.txt index c190dc3..a205393 100644 --- a/config/GZLE01/rels/d_a_warphr/splits.txt +++ b/config/GZLE01/rels/d_a_warphr/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_warphr.cpp: +d/actor/d_a_warphr.cpp: .text start:0x000000EC end:0x00001930 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000FE diff --git a/config/GZLE01/rels/d_a_warpls/splits.txt b/config/GZLE01/rels/d_a_warpls/splits.txt index 328a64d..33d5bd7 100644 --- a/config/GZLE01/rels/d_a_warpls/splits.txt +++ b/config/GZLE01/rels/d_a_warpls/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpls.cpp: +d/actor/d_a_warpls.cpp: .text start:0x00000078 end:0x000012B4 .rodata start:0x00000000 end:0x000000D8 .data start:0x00000000 end:0x0000007C diff --git a/config/GZLE01/rels/d_a_warpmj/splits.txt b/config/GZLE01/rels/d_a_warpmj/splits.txt index 877edd4..5b18f08 100644 --- a/config/GZLE01/rels/d_a_warpmj/splits.txt +++ b/config/GZLE01/rels/d_a_warpmj/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpmj.cpp: +d/actor/d_a_warpmj.cpp: .text start:0x00000078 end:0x00001398 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000B8 diff --git a/config/GZLE01/rels/d_a_waterfall/splits.txt b/config/GZLE01/rels/d_a_waterfall/splits.txt index 07d394d..7291a9d 100644 --- a/config/GZLE01/rels/d_a_waterfall/splits.txt +++ b/config/GZLE01/rels/d_a_waterfall/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_waterfall.cpp: +d/actor/d_a_waterfall.cpp: .text start:0x00000078 end:0x00001994 .rodata start:0x00000000 end:0x000000AC .data start:0x00000000 end:0x000001C4 diff --git a/config/GZLE01/rels/d_a_wbird/splits.txt b/config/GZLE01/rels/d_a_wbird/splits.txt index dc25d25..68f4b40 100644 --- a/config/GZLE01/rels/d_a_wbird/splits.txt +++ b/config/GZLE01/rels/d_a_wbird/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wbird.cpp: +d/actor/d_a_wbird.cpp: .text start:0x00000078 end:0x00000928 .text start:0x00000928 end:0x00000928 .rodata start:0x00000000 end:0x00000063 diff --git a/config/GZLE01/rels/d_a_wind_tag/splits.txt b/config/GZLE01/rels/d_a_wind_tag/splits.txt index 46152d5..8d35ac8 100644 --- a/config/GZLE01/rels/d_a_wind_tag/splits.txt +++ b/config/GZLE01/rels/d_a_wind_tag/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wind_tag.cpp: +d/actor/d_a_wind_tag.cpp: .text start:0x00000078 end:0x00001CC8 .rodata start:0x00000000 end:0x0000008D .data start:0x00000000 end:0x00000208 diff --git a/config/GZLE01/rels/d_a_windmill/splits.txt b/config/GZLE01/rels/d_a_windmill/splits.txt index b1266d6..cafe8ee 100644 --- a/config/GZLE01/rels/d_a_windmill/splits.txt +++ b/config/GZLE01/rels/d_a_windmill/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_windmill.cpp: +d/actor/d_a_windmill.cpp: .text start:0x00000078 end:0x00001AFC .rodata start:0x00000000 end:0x000000B7 .data start:0x00000000 end:0x00000398 diff --git a/config/GZLE01/rels/d_a_wz/splits.txt b/config/GZLE01/rels/d_a_wz/splits.txt index 835009e..1807db7 100644 --- a/config/GZLE01/rels/d_a_wz/splits.txt +++ b/config/GZLE01/rels/d_a_wz/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wz.cpp: +d/actor/d_a_wz.cpp: .text start:0x00000078 end:0x00007D08 .text start:0x00007D08 end:0x00007D08 .rodata start:0x00000000 end:0x0000018A diff --git a/config/GZLE01/rels/d_a_ygcwp/splits.txt b/config/GZLE01/rels/d_a_ygcwp/splits.txt index 8e7f94f..98f7ccf 100644 --- a/config/GZLE01/rels/d_a_ygcwp/splits.txt +++ b/config/GZLE01/rels/d_a_ygcwp/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ygcwp.cpp: +d/actor/d_a_ygcwp.cpp: .text start:0x00000078 end:0x00000970 .rodata start:0x00000000 end:0x000000A2 .data start:0x00000000 end:0x00000074 diff --git a/config/GZLE01/rels/d_a_ykgr/splits.txt b/config/GZLE01/rels/d_a_ykgr/splits.txt index 8b6abcf..e6296ce 100644 --- a/config/GZLE01/rels/d_a_ykgr/splits.txt +++ b/config/GZLE01/rels/d_a_ykgr/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ykgr.cpp: +d/actor/d_a_ykgr.cpp: .text start:0x000000EC end:0x000009A0 .text start:0x000009A0 end:0x00000B54 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/rels/d_a_yougan/splits.txt b/config/GZLE01/rels/d_a_yougan/splits.txt index 3af3df9..34570cc 100644 --- a/config/GZLE01/rels/d_a_yougan/splits.txt +++ b/config/GZLE01/rels/d_a_yougan/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_yougan.cpp: +d/actor/d_a_yougan.cpp: .text start:0x000000EC end:0x00000A4C .text start:0x00000A4C end:0x00000C1C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLE01/splits.txt b/config/GZLE01/splits.txt index 343fa78..6c171fd 100644 --- a/config/GZLE01/splits.txt +++ b/config/GZLE01/splits.txt @@ -403,7 +403,7 @@ d/d_stage.cpp: .sbss start:0x803F6A70 end:0x803F6A88 .sdata2 start:0x803F8188 end:0x803F81B8 -d/map/d_map.cpp: +d/d_map.cpp: .text start:0x800455AC end:0x800517AC .text start:0x800517AC end:0x80052134 .ctors start:0x803386B8 end:0x803386BC @@ -414,7 +414,7 @@ d/map/d_map.cpp: .sdata2 start:0x803F81B8 end:0x803F8308 .sbss2 start:0x803FCF28 end:0x803FCF30 -d/com/d_com_inf_game.cpp: +d/d_com_inf_game.cpp: .text start:0x80052134 end:0x800565CC .ctors start:0x803386BC end:0x803386C0 .rodata start:0x8034F530 end:0x8034F6D0 @@ -423,10 +423,10 @@ d/com/d_com_inf_game.cpp: .sdata start:0x803F61A0 end:0x803F61B0 .sdata2 start:0x803F8308 end:0x803F8320 -d/com/d_com_lib_game.cpp: +d/d_com_lib_game.cpp: .text start:0x800565CC end:0x8005662C -d/com/d_com_static.cpp: +d/d_com_static.cpp: .text start:0x8005662C end:0x80057000 .ctors start:0x803386C0 end:0x803386C4 .rodata start:0x8034F6D0 end:0x8034F750 @@ -442,7 +442,7 @@ d/d_lib.cpp: .data start:0x80375D08 end:0x80375D38 .sdata2 start:0x803F8368 end:0x803F8398 -d/save/d_save.cpp: +d/d_save.cpp: .text start:0x800589A8 end:0x8005EF88 .rodata start:0x8034F7D8 end:0x8034FB88 .data start:0x80375D38 end:0x80375DF8 @@ -451,7 +451,7 @@ d/save/d_save.cpp: .sbss start:0x803F6B88 end:0x803F6B90 .sdata2 start:0x803F8398 end:0x803F83A8 -d/save/d_save_init.cpp: +d/d_save_init.cpp: .text start:0x8005EF88 end:0x8005EFDC d/d_shop.cpp: @@ -481,7 +481,7 @@ d/d_cloth_packet.cpp: .sbss start:0x803F6B90 end:0x803F6BA0 .sdata2 start:0x803F8440 end:0x803F84C8 -d/a/d_a_obj.cpp: +d/actor/d_a_obj.cpp: .text start:0x800666EC end:0x80067D1C .rodata start:0x8034FBB8 end:0x8034FC58 .data start:0x80376FB8 end:0x80377018 @@ -489,52 +489,52 @@ d/a/d_a_obj.cpp: .sbss start:0x803F6BA0 end:0x803F6BA8 .sdata2 start:0x803F84C8 end:0x803F8530 -d/a/d_a_obj_tribox_static.cpp: +d/actor/d_a_obj_tribox_static.cpp: .text start:0x80067D1C end:0x80067D94 .ctors start:0x803386C8 end:0x803386CC .bss start:0x803E1F30 end:0x803E1F48 .sbss start:0x803F6BA8 end:0x803F6BC0 -d/a/d_a_ship_static.cpp: +d/actor/d_a_ship_static.cpp: .text start:0x80067D94 end:0x80067E78 .sdata2 start:0x803F8530 end:0x803F8538 -d/a/d_a_boko_static.cpp: +d/actor/d_a_boko_static.cpp: .text start:0x80067E78 end:0x80067FA0 .data start:0x80377018 end:0x80377168 .sdata start:0x803F61E0 end:0x803F61E8 -d/a/d_a_bomb_static.cpp: +d/actor/d_a_bomb_static.cpp: .text start:0x80067FA0 end:0x800684F4 .text start:0x800684F4 end:0x80068510 .rodata start:0x8034FC58 end:0x8034FC90 -d/a/d_a_branch_static.cpp: +d/actor/d_a_branch_static.cpp: .text start:0x80068510 end:0x800685F8 .rodata start:0x8034FC90 end:0x8034FCC0 -d/a/d_a_mgameboard_static.cpp: +d/actor/d_a_mgameboard_static.cpp: .text start:0x800685F8 end:0x80068650 -d/a/d_a_itembase_static.cpp: +d/actor/d_a_itembase_static.cpp: .text start:0x80068650 end:0x80068820 .rodata start:0x8034FCC0 end:0x8034FD10 -d/a/d_a_item_static.cpp: +d/actor/d_a_item_static.cpp: .text start:0x80068820 end:0x800689F0 .sdata2 start:0x803F8538 end:0x803F8540 -d/a/d_a_shop_item_static.cpp: +d/actor/d_a_shop_item_static.cpp: .text start:0x800689F0 end:0x80068A58 .rodata start:0x8034FD10 end:0x80351DF0 .sdata2 start:0x803F8540 end:0x803F8550 -d/a/d_a_race_item_static.cpp: +d/actor/d_a_race_item_static.cpp: .text start:0x80068A58 end:0x800690E4 .data start:0x80377168 end:0x80377228 .sdata2 start:0x803F8550 end:0x803F8558 -d/a/d_a_leaflift_static.cpp: +d/actor/d_a_leaflift_static.cpp: .text start:0x800690E4 end:0x800692C4 .sdata2 start:0x803F8558 end:0x803F8580 @@ -573,7 +573,7 @@ d/d_event.cpp: .data start:0x803775F0 end:0x80377628 .sdata2 start:0x803F8640 end:0x803F8650 -d/event/d_event_data.cpp: +d/d_event_data.cpp: .text start:0x80071778 end:0x800737DC .rodata start:0x803525C8 end:0x80352828 .data start:0x80377628 end:0x803777B0 @@ -581,7 +581,7 @@ d/event/d_event_data.cpp: .sbss start:0x803F6BE0 end:0x803F6BF0 .sdata2 start:0x803F8650 end:0x803F8678 -d/event/d_event_manager.cpp: +d/d_event_manager.cpp: .text start:0x800737DC end:0x800755A4 .rodata start:0x80352828 end:0x803529B0 .data start:0x803777B0 end:0x80377800 @@ -621,7 +621,7 @@ d/d_tree.cpp: .sbss start:0x803F6C08 end:0x803F6C10 .sdata2 start:0x803F87F0 end:0x803F8880 -d/particle/d_particle.cpp: +d/d_particle.cpp: .text start:0x8007A4D8 end:0x80080018 .ctors start:0x803386D8 end:0x803386DC .rodata start:0x80352A80 end:0x80352BB8 @@ -631,7 +631,7 @@ d/particle/d_particle.cpp: .sdata2 start:0x803F8880 end:0x803F88F0 .sbss2 start:0x803FCF30 end:0x803FCF38 -d/particle/d_particle_name.cpp: +d/d_particle_name.cpp: .text start:0x80080018 end:0x80080018 .data start:0x8037B630 end:0x8037B6A0 @@ -651,11 +651,11 @@ d/d_drawlist.cpp: .sbss start:0x803F6C48 end:0x803F6C60 .sdata2 start:0x803F88F8 end:0x803F89D0 -d/kankyo/d_kankyo_data.cpp: +d/d_kankyo_data.cpp: .text start:0x80086EE0 end:0x80086F74 .data start:0x8037CD28 end:0x8037D2E8 -d/kankyo/d_kankyo_wether.cpp: +d/d_kankyo_wether.cpp: .text start:0x80086F74 end:0x8008AA30 .rodata start:0x80352C90 end:0x80352D88 .data start:0x8037D2E8 end:0x8037D3D8 @@ -663,7 +663,7 @@ d/kankyo/d_kankyo_wether.cpp: .sbss start:0x803F6C60 end:0x803F6C68 .sdata2 start:0x803F89D0 end:0x803F8A98 -d/kankyo/d_kankyo_rain.cpp: +d/d_kankyo_rain.cpp: .text start:0x8008AA30 end:0x8009BE1C .text start:0x8009BE1C end:0x8009BE64 .rodata start:0x80352D88 end:0x80352FD0 @@ -673,7 +673,7 @@ d/kankyo/d_kankyo_rain.cpp: .sbss start:0x803F6C68 end:0x803F6CA8 .sdata2 start:0x803F8A98 end:0x803F8E40 -d/kankyo/d_kankyo_demo.cpp: +d/d_kankyo_demo.cpp: .text start:0x8009BE64 end:0x8009BFD4 .sdata2 start:0x803F8E40 end:0x803F8E58 @@ -706,7 +706,7 @@ d/d_att_dist.cpp: .text start:0x800A0270 end:0x800A0270 .data start:0x8037D4E8 end:0x8037E940 -d/bg/d_bg_s.cpp: +d/d_bg_s.cpp: .text start:0x800A0270 end:0x800A2550 .text start:0x800A2550 end:0x800A2550 .text start:0x800A2550 end:0x800A2550 @@ -726,7 +726,7 @@ d/bg/d_bg_s.cpp: .data start:0x8037E940 end:0x8037E9D8 .sdata2 start:0x803F8EE8 end:0x803F8F08 -d/bg/d_bg_s_acch.cpp: +d/d_bg_s_acch.cpp: .text start:0x800A257C end:0x800A4348 .text start:0x800A4348 end:0x800A43A4 .text start:0x800A43A4 end:0x800A43EC @@ -752,7 +752,7 @@ d/bg/d_bg_s_acch.cpp: .data start:0x8037E9D8 end:0x8037EA50 .sdata2 start:0x803F8F08 end:0x803F8F40 -d/bg/d_bg_s_func.cpp: +d/d_bg_s_func.cpp: .text start:0x800A4564 end:0x800A54F8 .text start:0x800A54F8 end:0x800A5660 .text start:0x800A5660 end:0x800A5660 @@ -768,16 +768,16 @@ d/bg/d_bg_s_func.cpp: .data start:0x8037EA50 end:0x8037EA80 .sdata2 start:0x803F8F40 end:0x803F8F48 -d/bg/d_bg_s_lin_chk.cpp: +d/d_bg_s_lin_chk.cpp: .text start:0x800A5678 end:0x800A56B8 -d/bg/d_bg_s_movebg_actor.cpp: +d/d_bg_s_movebg_actor.cpp: .text start:0x800A56B8 end:0x800A5A3C .text start:0x800A5A3C end:0x800A5A7C .data start:0x8037EA80 end:0x8037EAA8 .sbss start:0x803F6CB0 end:0x803F6CC0 -d/bg/d_bg_s_spl_grp_chk.cpp: +d/d_bg_s_spl_grp_chk.cpp: .text start:0x800A5A7C end:0x800A5BDC .text start:0x800A5BDC end:0x800A5BDC .text start:0x800A5BDC end:0x800A5BDC @@ -789,7 +789,7 @@ d/bg/d_bg_s_spl_grp_chk.cpp: .text start:0x800A5BDC end:0x800A5BDC .sdata2 start:0x803F8F48 end:0x803F8F50 -d/bg/d_bg_s_wtr_chk.cpp: +d/d_bg_s_wtr_chk.cpp: .text start:0x800A5BDC end:0x800A5C3C .text start:0x800A5C3C end:0x800A5C3C .text start:0x800A5C3C end:0x800A5C3C @@ -800,7 +800,7 @@ d/bg/d_bg_s_wtr_chk.cpp: .text start:0x800A5C3C end:0x800A5C3C .text start:0x800A5C3C end:0x800A5C3C -d/bg/d_bg_w.cpp: +d/d_bg_w.cpp: .text start:0x800A5C3C end:0x800A986C .text start:0x800A986C end:0x800A98C8 .text start:0x800A98C8 end:0x800A98C8 @@ -810,11 +810,11 @@ d/bg/d_bg_w.cpp: .data start:0x8037EAA8 end:0x8037EAE8 .sdata2 start:0x803F8F50 end:0x803F8F80 -d/bg/d_bg_w_deform.cpp: +d/d_bg_w_deform.cpp: .text start:0x800A9928 end:0x800A9A48 .rodata start:0x80353AE0 end:0x80353B38 -d/bg/d_bg_w_hf.cpp: +d/d_bg_w_hf.cpp: .text start:0x800A9A48 end:0x800AAB78 .text start:0x800AAB78 end:0x800AABF8 .text start:0x800AABF8 end:0x800AABFC @@ -822,14 +822,14 @@ d/bg/d_bg_w_hf.cpp: .data start:0x8037EAE8 end:0x8037EB18 .sdata2 start:0x803F8F80 end:0x803F8F90 -d/bg/d_bg_w_sv.cpp: +d/d_bg_w_sv.cpp: .text start:0x800AABFC end:0x800AB23C .text start:0x800AB23C end:0x800AB23C .text start:0x800AB23C end:0x800AB2AC .data start:0x8037EB18 end:0x8037EB48 .sdata2 start:0x803F8F90 end:0x803F8F98 -d/cc/d_cc_d.cpp: +d/d_cc_d.cpp: .text start:0x800AB2AC end:0x800AC0E8 .text start:0x800AC0E8 end:0x800AC594 .text start:0x800AC594 end:0x800AC810 @@ -837,7 +837,7 @@ d/cc/d_cc_d.cpp: .rodata start:0x80353F88 end:0x80353FA8 .data start:0x8037EB48 end:0x8037EC68 -d/cc/d_cc_mass_s.cpp: +d/d_cc_mass_s.cpp: .text start:0x800AC810 end:0x800AD3F8 .text start:0x800AD3F8 end:0x800AD594 .text start:0x800AD594 end:0x800AD594 @@ -849,7 +849,7 @@ d/cc/d_cc_mass_s.cpp: .rodata start:0x80353FA8 end:0x80353FD8 .sdata2 start:0x803F8F98 end:0x803F8FB0 -d/cc/d_cc_s.cpp: +d/d_cc_s.cpp: .text start:0x800AD5B0 end:0x800AE89C .text start:0x800AE89C end:0x800AE89C .text start:0x800AE89C end:0x800AE89C @@ -864,7 +864,7 @@ d/cc/d_cc_s.cpp: .data start:0x8037EC68 end:0x8037ED18 .sdata2 start:0x803F8FB0 end:0x803F8FD8 -d/cc/d_cc_uty.cpp: +d/d_cc_uty.cpp: .text start:0x800AE938 end:0x800AF368 .text start:0x800AF368 end:0x800AF384 .sdata2 start:0x803F8FD8 end:0x803F9000 @@ -935,7 +935,7 @@ d/d_spline_path.cpp: .text start:0x800C26D4 end:0x800C26D4 .sdata2 start:0x803F9460 end:0x803F9470 -d/s/d_s_actor_data_mng.cpp: +d/d_s_actor_data_mng.cpp: .text start:0x800C26D4 end:0x800C2DFC .rodata start:0x8035AA18 end:0x8035AB30 .data start:0x803888B8 end:0x803888C8 @@ -952,11 +952,11 @@ d/d_2dnumber.cpp: .data start:0x803890C8 end:0x80389138 .sdata2 start:0x803F9488 end:0x803F9508 -d/a/d_a_npc_cb1_static.cpp: +d/actor/d_a_npc_cb1_static.cpp: .text start:0x800CB5C4 end:0x800CB5CC .sbss start:0x803F6E60 end:0x803F6E68 -d/a/d_a_npc_mk_static.cpp: +d/actor/d_a_npc_mk_static.cpp: .text start:0x800CB5CC end:0x800CC734 .sdata2 start:0x803F9508 end:0x803F9560 @@ -983,7 +983,7 @@ d/d_point_wind.cpp: .rodata start:0x8035B7A0 end:0x8035B7A8 .sdata2 start:0x803F95D0 end:0x803F9600 -d/a/d_a_agb.cpp: +d/actor/d_a_agb.cpp: .text start:0x800CF5EC end:0x800D4554 .text start:0x800D4554 end:0x800D455C .ctors start:0x803386F0 end:0x803386F4 @@ -993,7 +993,7 @@ d/a/d_a_agb.cpp: .sbss start:0x803F6E68 end:0x803F6E90 .sdata2 start:0x803F9600 end:0x803F96C0 -d/a/d_a_arrow.cpp: +d/actor/d_a_arrow.cpp: .text start:0x800D455C end:0x800D8434 .rodata start:0x8035B860 end:0x8035B968 .data start:0x80389890 end:0x80389C90 @@ -1001,14 +1001,14 @@ d/a/d_a_arrow.cpp: .sbss start:0x803F6E90 end:0x803F6E98 .sdata2 start:0x803F96C0 end:0x803F9788 -d/a/d_a_bg.cpp: +d/actor/d_a_bg.cpp: .text start:0x800D8434 end:0x800D9318 .rodata start:0x8035B968 end:0x8035B9A0 .data start:0x80389C90 end:0x80389DB8 .bss start:0x803E3668 end:0x803E3688 .sdata2 start:0x803F9788 end:0x803F97A0 -d/a/d_a_bomb.cpp: +d/actor/d_a_bomb.cpp: .text start:0x800D9318 end:0x800D9318 .text start:0x800D9318 end:0x800DD1A4 .text start:0x800DD1A4 end:0x800DD1A4 @@ -1020,7 +1020,7 @@ d/a/d_a_bomb.cpp: .sdata2 start:0x803F97A0 end:0x803F9890 .sbss2 start:0x803FCF38 end:0x803FCF40 -d/a/d_a_bomb2.cpp: +d/actor/d_a_bomb2.cpp: .text start:0x800DD37C end:0x800E0B14 .text start:0x800E0B14 end:0x800E0BEC .text start:0x800E0BEC end:0x800E0BEC @@ -1032,7 +1032,7 @@ d/a/d_a_bomb2.cpp: .sdata2 start:0x803F9890 end:0x803F9940 .sbss2 start:0x803FCF40 end:0x803FCF48 -d/a/d_a_boomerang.cpp: +d/actor/d_a_boomerang.cpp: .text start:0x800E0C08 end:0x800E34A4 .text start:0x800E34A4 end:0x800E34AC .text start:0x800E34AC end:0x800E3510 @@ -1045,7 +1045,7 @@ d/a/d_a_boomerang.cpp: .sbss start:0x803F6EA8 end:0x803F6EB0 .sdata2 start:0x803F9940 end:0x803F99E0 -d/a/d_a_dai_item.cpp: +d/actor/d_a_dai_item.cpp: .text start:0x800E3638 end:0x800E595C .ctors start:0x803386F8 end:0x803386FC .rodata start:0x8035BB80 end:0x8035BCD0 @@ -1055,18 +1055,18 @@ d/a/d_a_dai_item.cpp: .sbss start:0x803F6EB0 end:0x803F6EB8 .sdata2 start:0x803F99E0 end:0x803F9A50 -d/a/d_a_demo00.cpp: +d/actor/d_a_demo00.cpp: .text start:0x800E595C end:0x800E79C0 .rodata start:0x8035BCD0 end:0x8035BDE8 .data start:0x8038B018 end:0x8038B0C0 .sdata2 start:0x803F9A50 end:0x803F9A98 -d/a/d_a_disappear.cpp: +d/actor/d_a_disappear.cpp: .text start:0x800E79C0 end:0x800E7E60 .data start:0x8038B0C0 end:0x8038B158 .sdata2 start:0x803F9A98 end:0x803F9AB0 -d/a/d_a_esa.cpp: +d/actor/d_a_esa.cpp: .text start:0x800E7E60 end:0x800E8CA4 .text start:0x800E8CA4 end:0x800E8CC0 .rodata start:0x8035BDE8 end:0x8035BE18 @@ -1075,7 +1075,7 @@ d/a/d_a_esa.cpp: .sbss start:0x803F6EB8 end:0x803F6EC0 .sdata2 start:0x803F9AB0 end:0x803F9B28 -d/a/d_a_grid.cpp: +d/actor/d_a_grid.cpp: .text start:0x800E8CC0 end:0x800EB520 .text start:0x800EB520 end:0x800EB5D8 .text start:0x800EB5D8 end:0x800EB60C @@ -1086,7 +1086,7 @@ d/a/d_a_grid.cpp: .sbss start:0x803F6EC0 end:0x803F6EC8 .sdata2 start:0x803F9B28 end:0x803F9C28 -d/a/d_a_himo2.cpp: +d/actor/d_a_himo2.cpp: .text start:0x800EB60C end:0x800F0BE0 .text start:0x800F0BE0 end:0x800F0C54 .text start:0x800F0C54 end:0x800F0CCC @@ -1099,7 +1099,7 @@ d/a/d_a_himo2.cpp: .sbss start:0x803F6EC8 end:0x803F6ED8 .sdata2 start:0x803F9C28 end:0x803F9DD0 -d/a/d_a_hookshot.cpp: +d/actor/d_a_hookshot.cpp: .text start:0x800F104C end:0x800F3198 .text start:0x800F3198 end:0x800F31CC .text start:0x800F31CC end:0x800F3228 @@ -1108,14 +1108,14 @@ d/a/d_a_hookshot.cpp: .data start:0x8038BD20 end:0x8038C500 .sdata2 start:0x803F9DD0 end:0x803F9E28 -d/a/d_a_ib.cpp: +d/actor/d_a_ib.cpp: .text start:0x800F3228 end:0x800F4BC8 .rodata start:0x8035BE78 end:0x8035BF08 .data start:0x8038C500 end:0x8038C8A0 .sbss start:0x803F6ED8 end:0x803F6EE0 .sdata2 start:0x803F9E28 end:0x803F9E80 -d/a/d_a_item.cpp: +d/actor/d_a_item.cpp: .text start:0x800F4BC8 end:0x800F89F8 .text start:0x800F89F8 end:0x800F8A14 .rodata start:0x8035BF08 end:0x8035BF18 @@ -1124,13 +1124,13 @@ d/a/d_a_item.cpp: .sbss start:0x803F6EE0 end:0x803F6EE8 .sdata2 start:0x803F9E80 end:0x803F9EF8 -d/a/d_a_itembase.cpp: +d/actor/d_a_itembase.cpp: .text start:0x800F8A14 end:0x800F95B8 .rodata start:0x8035BF18 end:0x8035BF80 .data start:0x8038D120 end:0x8038D148 .sdata2 start:0x803F9EF8 end:0x803F9F18 -d/a/d_a_nh.cpp: +d/actor/d_a_nh.cpp: .text start:0x800F95B8 end:0x800FAFC0 .ctors start:0x80338708 end:0x8033870C .rodata start:0x8035BF80 end:0x8035BFF8 @@ -1139,7 +1139,7 @@ d/a/d_a_nh.cpp: .sbss start:0x803F6EE8 end:0x803F6EF0 .sdata2 start:0x803F9F18 end:0x803F9F58 -d/a/d_a_npc_fa1.cpp: +d/actor/d_a_npc_fa1.cpp: .text start:0x800FAFC0 end:0x800FDAE8 .text start:0x800FDAE8 end:0x800FDAFC .ctors start:0x8033870C end:0x80338710 @@ -1149,7 +1149,7 @@ d/a/d_a_npc_fa1.cpp: .sbss start:0x803F6EF0 end:0x803F6F00 .sdata2 start:0x803F9F58 end:0x803F9FC0 -d/a/d_a_obj_search.cpp: +d/actor/d_a_obj_search.cpp: .text start:0x800FDAFC end:0x801028FC .text start:0x801028FC end:0x801028FC .rodata start:0x8035C090 end:0x8035C210 @@ -1160,7 +1160,7 @@ d/a/d_a_obj_search.cpp: .sdata2 start:0x803F9FC0 end:0x803FA0B8 .sbss2 start:0x803FCF48 end:0x803FCF50 -d/a/d_a_player.cpp: +d/actor/d_a_player.cpp: .text start:0x801028FC end:0x80102E18 .text start:0x80102E18 end:0x80102E18 .text start:0x80102E18 end:0x80102E8C @@ -1168,7 +1168,7 @@ d/a/d_a_player.cpp: .data start:0x8038DC50 end:0x8038DC80 .sdata2 start:0x803FA0B8 end:0x803FA0E0 -d/a/d_a_player_main.cpp: +d/actor/d_a_player_main.cpp: .text start:0x80102E8C end:0x8012901C .text start:0x8012901C end:0x8012CD60 .text start:0x8012CD60 end:0x80132F34 @@ -1207,14 +1207,14 @@ d/a/d_a_player_main.cpp: .sdata2 start:0x803FA0E0 end:0x803FA5B8 .sbss2 start:0x803FCF50 end:0x803FCF58 -d/a/d_a_player_npc.cpp: +d/actor/d_a_player_npc.cpp: .text start:0x8015A37C end:0x8015B0A4 .rodata start:0x8035E4A0 end:0x8035E540 .bss start:0x803E4720 end:0x803E4738 .sbss start:0x803F6F58 end:0x803F6F60 .sdata2 start:0x803FA5B8 end:0x803FA5E8 -d/a/d_a_sea.cpp: +d/actor/d_a_sea.cpp: .text start:0x8015B0A4 end:0x8015D99C .text start:0x8015D99C end:0x8015DAAC .text start:0x8015DAAC end:0x8015DAF4 @@ -1225,18 +1225,18 @@ d/a/d_a_sea.cpp: .sdata start:0x803F62C0 end:0x803F62C8 .sdata2 start:0x803FA5E8 end:0x803FA678 -d/a/d_a_spc_item01.cpp: +d/actor/d_a_spc_item01.cpp: .text start:0x8015DAF4 end:0x8015E3F0 .data start:0x80390788 end:0x80390840 .sdata2 start:0x803FA678 end:0x803FA6A8 -d/a/d_a_vrbox.cpp: +d/actor/d_a_vrbox.cpp: .text start:0x8015E3F0 end:0x8015EA14 .rodata start:0x8035E578 end:0x8035E5C8 .data start:0x80390840 end:0x80390890 .sdata2 start:0x803FA6A8 end:0x803FA6B0 -d/a/d_a_vrbox2.cpp: +d/actor/d_a_vrbox2.cpp: .text start:0x8015EA14 end:0x8015F550 .rodata start:0x8035E5C8 end:0x8035E658 .data start:0x80390890 end:0x803908E0 @@ -1282,7 +1282,7 @@ d/d_envse.cpp: .sdata2 start:0x803FA9A0 end:0x803FA9A8 .sbss2 start:0x803FCF58 end:0x803FCF60 -d/file/d_file_error.cpp: +d/d_file_error.cpp: .text start:0x8017DB40 end:0x8017F67C .text start:0x8017F67C end:0x8017F8B0 .ctors start:0x80338720 end:0x80338724 @@ -1292,7 +1292,7 @@ d/file/d_file_error.cpp: .sdata start:0x803F62D0 end:0x803F62E0 .sdata2 start:0x803FA9A8 end:0x803FA9F0 -d/file/d_file_select.cpp: +d/d_file_select.cpp: .text start:0x8017F8B0 end:0x8018DD30 .text start:0x8018DD30 end:0x8018E1CC .ctors start:0x80338724 end:0x80338728 @@ -1311,7 +1311,7 @@ d/d_gameover.cpp: .sdata start:0x803F62E8 end:0x803F62F0 .sdata2 start:0x803FAA58 end:0x803FAAA8 -d/kankyo/d_kankyo.cpp: +d/d_kankyo.cpp: .text start:0x8018F7FC end:0x80197AB8 .text start:0x80197AB8 end:0x80197FE4 .ctors start:0x80338728 end:0x8033872C @@ -1349,7 +1349,7 @@ d/d_level_se.cpp: .data start:0x80391D98 end:0x80391DE0 .sdata2 start:0x803FAC60 end:0x803FAC68 -d/menu/d_menu_cloth.cpp: +d/d_menu_cloth.cpp: .text start:0x8019940C end:0x8019BE8C .ctors start:0x8033872C end:0x80338730 .rodata start:0x8035F048 end:0x8035F088 @@ -1359,7 +1359,7 @@ d/menu/d_menu_cloth.cpp: .sdata2 start:0x803FAC68 end:0x803FAD38 .sbss2 start:0x803FCF60 end:0x803FCF68 -d/menu/d_menu_collect.cpp: +d/d_menu_collect.cpp: .text start:0x8019BE8C end:0x801A84B4 .text start:0x801A84B4 end:0x801A84B4 .text start:0x801A84B4 end:0x801A84FC @@ -1370,7 +1370,7 @@ d/menu/d_menu_collect.cpp: .bss start:0x803E5FC8 end:0x803E6038 .sdata2 start:0x803FAD38 end:0x803FADE0 -d/menu/d_menu_dmap.cpp: +d/d_menu_dmap.cpp: .text start:0x801A86A4 end:0x801AF3B8 .text start:0x801AF3B8 end:0x801AF3B8 .text start:0x801AF3B8 end:0x801AF4F0 @@ -1380,7 +1380,7 @@ d/menu/d_menu_dmap.cpp: .bss start:0x803E6038 end:0x803E6090 .sdata2 start:0x803FADE0 end:0x803FAE58 -d/menu/d_menu_fmap.cpp: +d/d_menu_fmap.cpp: .text start:0x801AF4F0 end:0x801BB088 .text start:0x801BB088 end:0x801BB3E4 .ctors start:0x80338738 end:0x8033873C @@ -1390,7 +1390,7 @@ d/menu/d_menu_fmap.cpp: .sdata start:0x803F6318 end:0x803F6320 .sdata2 start:0x803FAE58 end:0x803FAF28 -d/menu/d_menu_fmap2.cpp: +d/d_menu_fmap2.cpp: .text start:0x801BB3E4 end:0x801C790C .text start:0x801C790C end:0x801C790C .text start:0x801C790C end:0x801C7B4C @@ -1401,7 +1401,7 @@ d/menu/d_menu_fmap2.cpp: .sdata start:0x803F6320 end:0x803F6328 .sdata2 start:0x803FAF28 end:0x803FAFB8 -d/menu/d_menu_item.cpp: +d/d_menu_item.cpp: .text start:0x801C7B4C end:0x801D2A4C .text start:0x801D2A4C end:0x801D2A4C .text start:0x801D2A4C end:0x801D2B68 @@ -1411,7 +1411,7 @@ d/menu/d_menu_item.cpp: .bss start:0x803E6268 end:0x803E62D8 .sdata2 start:0x803FAFB8 end:0x803FB018 -d/menu/d_menu_option.cpp: +d/d_menu_option.cpp: .text start:0x801D2B68 end:0x801D5D38 .text start:0x801D5D38 end:0x801D5DB8 .ctors start:0x80338744 end:0x80338748 @@ -1421,7 +1421,7 @@ d/menu/d_menu_option.cpp: .sbss start:0x803F6FD0 end:0x803F6FD8 .sdata2 start:0x803FB018 end:0x803FB078 -d/menu/d_menu_save.cpp: +d/d_menu_save.cpp: .text start:0x801D5DB8 end:0x801DAED0 .text start:0x801DAED0 end:0x801DAF44 .text start:0x801DAF44 end:0x801DB384 @@ -1431,7 +1431,7 @@ d/menu/d_menu_save.cpp: .bss start:0x803E62E8 end:0x803E6328 .sdata2 start:0x803FB078 end:0x803FB0D0 -d/menu/d_menu_window.cpp: +d/d_menu_window.cpp: .text start:0x801DB384 end:0x801DF684 .text start:0x801DF684 end:0x801DFB28 .text start:0x801DFB28 end:0x801DFB28 @@ -1459,7 +1459,7 @@ d/d_mesg.cpp: .sbss start:0x803F7010 end:0x803F7050 .sdata2 start:0x803FB0E8 end:0x803FB170 -d/message/d_message.cpp: +d/d_message.cpp: .text start:0x801E73B4 end:0x801EB128 .ctors start:0x80338750 end:0x80338754 .rodata start:0x80360BD0 end:0x80360D50 @@ -1469,7 +1469,7 @@ d/message/d_message.cpp: .sdata2 start:0x803FB170 end:0x803FB1F8 .sbss2 start:0x803FCF68 end:0x803FCF70 -d/message/d_message_paper.cpp: +d/d_message_paper.cpp: .text start:0x801EB128 end:0x801EEFDC .ctors start:0x80338754 end:0x80338758 .rodata start:0x80360D50 end:0x80360F38 @@ -1492,7 +1492,7 @@ d/d_meter.cpp: .sdata2 start:0x803FB258 end:0x803FB3E8 .sbss2 start:0x803FCF70 end:0x803FCF78 -d/minigame/d_minigame_starter.cpp: +d/d_minigame_starter.cpp: .text start:0x80205FE8 end:0x80206F64 .text start:0x80206F64 end:0x80206FC0 .rodata start:0x80361990 end:0x803619D0 @@ -1500,7 +1500,7 @@ d/minigame/d_minigame_starter.cpp: .sdata start:0x803F6358 end:0x803F6370 .sdata2 start:0x803FB3E8 end:0x803FB448 -d/minigame/d_minigame_terminater.cpp: +d/d_minigame_terminater.cpp: .text start:0x80206FC0 end:0x8020A5C4 .text start:0x8020A5C4 end:0x8020A620 .rodata start:0x803619D0 end:0x80361D40 @@ -1555,22 +1555,22 @@ d/d_metronome.cpp: .bss start:0x803E6FF0 end:0x803E7020 .sdata2 start:0x803FB6C0 end:0x803FB710 -d/ovlp/d_ovlp_fade.cpp: +d/d_ovlp_fade.cpp: .text start:0x802235CC end:0x802237F4 .data start:0x80393CF8 end:0x80393DD8 .sbss start:0x803F7210 end:0x803F7218 -d/ovlp/d_ovlp_fade2.cpp: +d/d_ovlp_fade2.cpp: .text start:0x802237F4 end:0x80224284 .text start:0x80224284 end:0x8022433C .data start:0x80393DD8 end:0x80393E80 .sdata2 start:0x803FB710 end:0x803FB758 -d/ovlp/d_ovlp_fade3.cpp: +d/d_ovlp_fade3.cpp: .text start:0x8022433C end:0x80224390 .data start:0x80393E80 end:0x80393E90 -d/ovlp/d_ovlp_fade4.cpp: +d/d_ovlp_fade4.cpp: .text start:0x80224390 end:0x802256C0 .text start:0x802256C0 end:0x802258C8 .rodata start:0x803624B8 end:0x803624E0 @@ -1587,7 +1587,7 @@ d/d_picture_box.cpp: .sbss start:0x803F7218 end:0x803F7220 .sdata2 start:0x803FB7B8 end:0x803FB848 -d/s/d_s_logo.cpp: +d/d_s_logo.cpp: .text start:0x8022C0B4 end:0x8022E9F4 .rodata start:0x80362800 end:0x80362BF8 .data start:0x80394000 end:0x80394078 @@ -1595,7 +1595,7 @@ d/s/d_s_logo.cpp: .sdata2 start:0x803FB848 end:0x803FB890 .sbss2 start:0x803FCF80 end:0x803FCF90 -d/s/d_s_menu.cpp: +d/d_s_menu.cpp: .text start:0x8022E9F4 end:0x8022F86C .rodata start:0x80362BF8 end:0x80362E40 .data start:0x80394078 end:0x80394118 @@ -1603,7 +1603,7 @@ d/s/d_s_menu.cpp: .sbss start:0x803F7298 end:0x803F72B0 .sdata2 start:0x803FB890 end:0x803FB8E0 -d/s/d_s_name.cpp: +d/d_s_name.cpp: .text start:0x8022F86C end:0x80232518 .text start:0x80232518 end:0x80232518 .text start:0x80232518 end:0x80232518 @@ -1617,19 +1617,19 @@ d/s/d_s_name.cpp: .sdata2 start:0x803FB8E0 end:0x803FB930 .sbss2 start:0x803FCF90 end:0x803FCF98 -d/s/d_s_open.cpp: +d/d_s_open.cpp: .text start:0x80232A68 end:0x80232EFC .rodata start:0x80362F50 end:0x80362F98 .data start:0x80394658 end:0x803946C0 -d/s/d_s_open_sub.cpp: +d/d_s_open_sub.cpp: .text start:0x80232EFC end:0x80234550 .text start:0x80234550 end:0x80234570 .rodata start:0x80362F98 end:0x80363018 .data start:0x803946C0 end:0x803947A8 .sdata2 start:0x803FB930 end:0x803FB978 -d/s/d_s_play.cpp: +d/d_s_play.cpp: .text start:0x80234570 end:0x80236938 .ctors start:0x80338770 end:0x80338774 .rodata start:0x80363018 end:0x80363770 @@ -1639,13 +1639,13 @@ d/s/d_s_play.cpp: .sbss start:0x803F72B0 end:0x803F72D8 .sdata2 start:0x803FB978 end:0x803FB9B8 -d/s/d_s_room.cpp: +d/d_s_room.cpp: .text start:0x80236938 end:0x802372F4 .rodata start:0x80363770 end:0x80363810 .data start:0x80394CA0 end:0x80394CF0 .bss start:0x803E7FE8 end:0x803E8008 -d/s/d_s_title.cpp: +d/d_s_title.cpp: .text start:0x802372F4 end:0x80237568 .rodata start:0x80363810 end:0x80363828 .data start:0x80394CF0 end:0x80394D58 diff --git a/config/GZLJ01/rels/d_a_acorn_leaf/splits.txt b/config/GZLJ01/rels/d_a_acorn_leaf/splits.txt index ffad599..ca5d024 100644 --- a/config/GZLJ01/rels/d_a_acorn_leaf/splits.txt +++ b/config/GZLJ01/rels/d_a_acorn_leaf/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_acorn_leaf.cpp: +d/actor/d_a_acorn_leaf.cpp: .text start:0x000000EC end:0x00000E60 .text start:0x00000E60 end:0x00000E60 .text start:0x00000E60 end:0x00000EDC diff --git a/config/GZLJ01/rels/d_a_agbsw0/splits.txt b/config/GZLJ01/rels/d_a_agbsw0/splits.txt index 9e1e4d7..ce3ae9f 100644 --- a/config/GZLJ01/rels/d_a_agbsw0/splits.txt +++ b/config/GZLJ01/rels/d_a_agbsw0/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_agbsw0.cpp: +d/actor/d_a_agbsw0.cpp: .text start:0x00000078 end:0x00005624 .rodata start:0x00000000 end:0x00000095 .data start:0x00000000 end:0x00000568 diff --git a/config/GZLJ01/rels/d_a_alldie/splits.txt b/config/GZLJ01/rels/d_a_alldie/splits.txt index c8988cc..3cfa7a3 100644 --- a/config/GZLJ01/rels/d_a_alldie/splits.txt +++ b/config/GZLJ01/rels/d_a_alldie/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_alldie.cpp: +d/actor/d_a_alldie.cpp: .text start:0x00000078 end:0x000002CC .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_am/splits.txt b/config/GZLJ01/rels/d_a_am/splits.txt index 527202d..fbb7cfe 100644 --- a/config/GZLJ01/rels/d_a_am/splits.txt +++ b/config/GZLJ01/rels/d_a_am/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_am.cpp: +d/actor/d_a_am.cpp: .text start:0x00000078 end:0x00004AE4 .rodata start:0x00000000 end:0x000000B8 .data start:0x00000000 end:0x000004C4 diff --git a/config/GZLJ01/rels/d_a_am2/splits.txt b/config/GZLJ01/rels/d_a_am2/splits.txt index f46f905..1620ae6 100644 --- a/config/GZLJ01/rels/d_a_am2/splits.txt +++ b/config/GZLJ01/rels/d_a_am2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_am2.cpp: +d/actor/d_a_am2.cpp: .text start:0x00000078 end:0x00004D98 .rodata start:0x00000000 end:0x000000C2 .data start:0x00000000 end:0x000004D4 diff --git a/config/GZLJ01/rels/d_a_amiprop/splits.txt b/config/GZLJ01/rels/d_a_amiprop/splits.txt index 4a5ba7f..76ad829 100644 --- a/config/GZLJ01/rels/d_a_amiprop/splits.txt +++ b/config/GZLJ01/rels/d_a_amiprop/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_amiprop.cpp: +d/actor/d_a_amiprop.cpp: .text start:0x00000078 end:0x00000AB4 .rodata start:0x00000000 end:0x00000048 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLJ01/rels/d_a_andsw0/splits.txt b/config/GZLJ01/rels/d_a_andsw0/splits.txt index 40d87a2..0dd7c47 100644 --- a/config/GZLJ01/rels/d_a_andsw0/splits.txt +++ b/config/GZLJ01/rels/d_a_andsw0/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_andsw0.cpp: +d/actor/d_a_andsw0.cpp: .text start:0x00000078 end:0x00000A64 .data start:0x00000000 end:0x000000CC .bss start:0x00000000 end:0x00000020 diff --git a/config/GZLJ01/rels/d_a_andsw2/splits.txt b/config/GZLJ01/rels/d_a_andsw2/splits.txt index b2a9a8d..9593e49 100644 --- a/config/GZLJ01/rels/d_a_andsw2/splits.txt +++ b/config/GZLJ01/rels/d_a_andsw2/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_andsw2.cpp: +d/actor/d_a_andsw2.cpp: .text start:0x00000078 end:0x00000724 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLJ01/rels/d_a_arrow_iceeff/splits.txt b/config/GZLJ01/rels/d_a_arrow_iceeff/splits.txt index 5ef62aa..5354e8a 100644 --- a/config/GZLJ01/rels/d_a_arrow_iceeff/splits.txt +++ b/config/GZLJ01/rels/d_a_arrow_iceeff/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_arrow_iceeff.cpp: +d/actor/d_a_arrow_iceeff.cpp: .text start:0x000000EC end:0x00001058 .rodata start:0x00000000 end:0x00000083 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLJ01/rels/d_a_arrow_lighteff/splits.txt b/config/GZLJ01/rels/d_a_arrow_lighteff/splits.txt index 725bff5..fb141a3 100644 --- a/config/GZLJ01/rels/d_a_arrow_lighteff/splits.txt +++ b/config/GZLJ01/rels/d_a_arrow_lighteff/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_arrow_lighteff.cpp: +d/actor/d_a_arrow_lighteff.cpp: .text start:0x00000078 end:0x000011AC .rodata start:0x00000000 end:0x000000AE .data start:0x00000000 end:0x00000074 diff --git a/config/GZLJ01/rels/d_a_atdoor/splits.txt b/config/GZLJ01/rels/d_a_atdoor/splits.txt index ee6272e..d88c39d 100644 --- a/config/GZLJ01/rels/d_a_atdoor/splits.txt +++ b/config/GZLJ01/rels/d_a_atdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_atdoor.cpp: +d/actor/d_a_atdoor.cpp: .text start:0x00000078 end:0x0000072C .rodata start:0x00000000 end:0x00000039 .data start:0x00000000 end:0x00000064 diff --git a/config/GZLJ01/rels/d_a_att/splits.txt b/config/GZLJ01/rels/d_a_att/splits.txt index dee64a6..f44ed96 100644 --- a/config/GZLJ01/rels/d_a_att/splits.txt +++ b/config/GZLJ01/rels/d_a_att/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_att.cpp: +d/actor/d_a_att.cpp: .text start:0x000000EC end:0x00000B88 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000018 diff --git a/config/GZLJ01/rels/d_a_auction/splits.txt b/config/GZLJ01/rels/d_a_auction/splits.txt index 8418460..16da51a 100644 --- a/config/GZLJ01/rels/d_a_auction/splits.txt +++ b/config/GZLJ01/rels/d_a_auction/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_auction.cpp: +d/actor/d_a_auction.cpp: .text start:0x000000EC end:0x00003C90 .text start:0x00003C90 end:0x0000416C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_bb/splits.txt b/config/GZLJ01/rels/d_a_bb/splits.txt index bfb065c..7520d7f 100644 --- a/config/GZLJ01/rels/d_a_bb/splits.txt +++ b/config/GZLJ01/rels/d_a_bb/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bb.cpp: +d/actor/d_a_bb.cpp: .text start:0x000000EC end:0x00008DE4 .text start:0x00008DE4 end:0x00008DE4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_bdk/splits.txt b/config/GZLJ01/rels/d_a_bdk/splits.txt index c4d19e8..307f137 100644 --- a/config/GZLJ01/rels/d_a_bdk/splits.txt +++ b/config/GZLJ01/rels/d_a_bdk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bdk.cpp: +d/actor/d_a_bdk.cpp: .text start:0x000000EC end:0x0000DD98 .text start:0x0000DD98 end:0x0000DD98 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_bdkobj/splits.txt b/config/GZLJ01/rels/d_a_bdkobj/splits.txt index 4e36c7e..ead8a19 100644 --- a/config/GZLJ01/rels/d_a_bdkobj/splits.txt +++ b/config/GZLJ01/rels/d_a_bdkobj/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bdkobj.cpp: +d/actor/d_a_bdkobj.cpp: .text start:0x000000EC end:0x00002F98 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000E3 diff --git a/config/GZLJ01/rels/d_a_beam/splits.txt b/config/GZLJ01/rels/d_a_beam/splits.txt index 86a5ce7..e63fe7c 100644 --- a/config/GZLJ01/rels/d_a_beam/splits.txt +++ b/config/GZLJ01/rels/d_a_beam/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_beam.cpp: +d/actor/d_a_beam.cpp: .text start:0x000000EC end:0x00002CA0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000B2 diff --git a/config/GZLJ01/rels/d_a_bflower/splits.txt b/config/GZLJ01/rels/d_a_bflower/splits.txt index cb5acfb..63e5a52 100644 --- a/config/GZLJ01/rels/d_a_bflower/splits.txt +++ b/config/GZLJ01/rels/d_a_bflower/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bflower.cpp: +d/actor/d_a_bflower.cpp: .text start:0x000000EC end:0x00001DF4 .text start:0x00001DF4 end:0x00001DF4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_bgn/splits.txt b/config/GZLJ01/rels/d_a_bgn/splits.txt index 0f622d9..52231fd 100644 --- a/config/GZLJ01/rels/d_a_bgn/splits.txt +++ b/config/GZLJ01/rels/d_a_bgn/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bgn.cpp: +d/actor/d_a_bgn.cpp: .text start:0x000000EC end:0x0000EE24 .text start:0x0000EE24 end:0x0000EE24 .text start:0x0000EE24 end:0x0000EE80 diff --git a/config/GZLJ01/rels/d_a_bgn2/splits.txt b/config/GZLJ01/rels/d_a_bgn2/splits.txt index 78f6a52..20a2209 100644 --- a/config/GZLJ01/rels/d_a_bgn2/splits.txt +++ b/config/GZLJ01/rels/d_a_bgn2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bgn2.cpp: +d/actor/d_a_bgn2.cpp: .text start:0x000000EC end:0x000049A8 .text start:0x000049A8 end:0x000049A8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_bgn3/splits.txt b/config/GZLJ01/rels/d_a_bgn3/splits.txt index fcd8ed9..526bff4 100644 --- a/config/GZLJ01/rels/d_a_bgn3/splits.txt +++ b/config/GZLJ01/rels/d_a_bgn3/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bgn3.cpp: +d/actor/d_a_bgn3.cpp: .text start:0x000000EC end:0x000055B0 .text start:0x000055B0 end:0x000055B0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_bigelf/splits.txt b/config/GZLJ01/rels/d_a_bigelf/splits.txt index b703342..fc894fc 100644 --- a/config/GZLJ01/rels/d_a_bigelf/splits.txt +++ b/config/GZLJ01/rels/d_a_bigelf/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bigelf.cpp: +d/actor/d_a_bigelf.cpp: .text start:0x00000078 end:0x00003890 .text start:0x00003890 end:0x000038C8 .rodata start:0x00000000 end:0x000001FD diff --git a/config/GZLJ01/rels/d_a_bita/splits.txt b/config/GZLJ01/rels/d_a_bita/splits.txt index 08679fe..daf174f 100644 --- a/config/GZLJ01/rels/d_a_bita/splits.txt +++ b/config/GZLJ01/rels/d_a_bita/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bita.cpp: +d/actor/d_a_bita.cpp: .text start:0x00000078 end:0x000010D4 .rodata start:0x00000000 end:0x0000007A .data start:0x00000000 end:0x00000208 diff --git a/config/GZLJ01/rels/d_a_bk/splits.txt b/config/GZLJ01/rels/d_a_bk/splits.txt index 730efe1..4b207aa 100644 --- a/config/GZLJ01/rels/d_a_bk/splits.txt +++ b/config/GZLJ01/rels/d_a_bk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bk.cpp: +d/actor/d_a_bk.cpp: .text start:0x000000EC end:0x0000F910 .text start:0x0000F910 end:0x0000F910 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_bl/splits.txt b/config/GZLJ01/rels/d_a_bl/splits.txt index 06c70af..40f358c 100644 --- a/config/GZLJ01/rels/d_a_bl/splits.txt +++ b/config/GZLJ01/rels/d_a_bl/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bl.cpp: +d/actor/d_a_bl.cpp: .text start:0x00000078 end:0x00006834 .text start:0x00006834 end:0x0000688C .rodata start:0x00000000 end:0x000000F9 diff --git a/config/GZLJ01/rels/d_a_bmd/splits.txt b/config/GZLJ01/rels/d_a_bmd/splits.txt index f74e25e..811cb8f 100644 --- a/config/GZLJ01/rels/d_a_bmd/splits.txt +++ b/config/GZLJ01/rels/d_a_bmd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bmd.cpp: +d/actor/d_a_bmd.cpp: .text start:0x000000EC end:0x000074BC .text start:0x000074BC end:0x000074BC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_bmdfoot/splits.txt b/config/GZLJ01/rels/d_a_bmdfoot/splits.txt index 98b9c34..67f911e 100644 --- a/config/GZLJ01/rels/d_a_bmdfoot/splits.txt +++ b/config/GZLJ01/rels/d_a_bmdfoot/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bmdfoot.cpp: +d/actor/d_a_bmdfoot.cpp: .text start:0x000000EC end:0x0000348C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000CA diff --git a/config/GZLJ01/rels/d_a_bmdhand/splits.txt b/config/GZLJ01/rels/d_a_bmdhand/splits.txt index 6572080..45e9011 100644 --- a/config/GZLJ01/rels/d_a_bmdhand/splits.txt +++ b/config/GZLJ01/rels/d_a_bmdhand/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bmdhand.cpp: +d/actor/d_a_bmdhand.cpp: .text start:0x000000EC end:0x00003894 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000C7 diff --git a/config/GZLJ01/rels/d_a_bo/splits.txt b/config/GZLJ01/rels/d_a_bo/splits.txt index 4dba7e6..e0e8d40 100644 --- a/config/GZLJ01/rels/d_a_bo/splits.txt +++ b/config/GZLJ01/rels/d_a_bo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bo.cpp: +d/actor/d_a_bo.cpp: .text start:0x000000EC end:0x00005D28 .text start:0x00005D28 end:0x00005D80 .text start:0x00005D80 end:0x000063F4 diff --git a/config/GZLJ01/rels/d_a_boko/splits.txt b/config/GZLJ01/rels/d_a_boko/splits.txt index c683db7..1b5248a 100644 --- a/config/GZLJ01/rels/d_a_boko/splits.txt +++ b/config/GZLJ01/rels/d_a_boko/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_boko.cpp: +d/actor/d_a_boko.cpp: .text start:0x000000EC end:0x0000436C .text start:0x0000436C end:0x0000436C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_boss_item/splits.txt b/config/GZLJ01/rels/d_a_boss_item/splits.txt index 4c19f29..18e049a 100644 --- a/config/GZLJ01/rels/d_a_boss_item/splits.txt +++ b/config/GZLJ01/rels/d_a_boss_item/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_boss_item.cpp: +d/actor/d_a_boss_item.cpp: .text start:0x00000078 end:0x00000128 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_bpw/splits.txt b/config/GZLJ01/rels/d_a_bpw/splits.txt index 14ab644..e466e35 100644 --- a/config/GZLJ01/rels/d_a_bpw/splits.txt +++ b/config/GZLJ01/rels/d_a_bpw/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bpw.cpp: +d/actor/d_a_bpw.cpp: .text start:0x00000078 end:0x0000E2E4 .text start:0x0000E2E4 end:0x0000E470 .text start:0x0000E470 end:0x0000E5DC diff --git a/config/GZLJ01/rels/d_a_branch/splits.txt b/config/GZLJ01/rels/d_a_branch/splits.txt index 519bbfd..3686cfc 100644 --- a/config/GZLJ01/rels/d_a_branch/splits.txt +++ b/config/GZLJ01/rels/d_a_branch/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_branch.cpp: +d/actor/d_a_branch.cpp: .text start:0x00000078 end:0x0000080C .rodata start:0x00000000 end:0x00000060 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLJ01/rels/d_a_bridge/splits.txt b/config/GZLJ01/rels/d_a_bridge/splits.txt index 42bbada..6d03ade 100644 --- a/config/GZLJ01/rels/d_a_bridge/splits.txt +++ b/config/GZLJ01/rels/d_a_bridge/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bridge.cpp: +d/actor/d_a_bridge.cpp: .text start:0x00000078 end:0x00004CA4 .text start:0x00004CA4 end:0x00004CA4 .rodata start:0x00000000 end:0x00000169 diff --git a/config/GZLJ01/rels/d_a_bst/splits.txt b/config/GZLJ01/rels/d_a_bst/splits.txt index bf7ac1c..f069ec5 100644 --- a/config/GZLJ01/rels/d_a_bst/splits.txt +++ b/config/GZLJ01/rels/d_a_bst/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bst.cpp: +d/actor/d_a_bst.cpp: .text start:0x000000EC end:0x0000C504 .text start:0x0000C504 end:0x0000C504 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_btd/splits.txt b/config/GZLJ01/rels/d_a_btd/splits.txt index 59d4af3..4a37619 100644 --- a/config/GZLJ01/rels/d_a_btd/splits.txt +++ b/config/GZLJ01/rels/d_a_btd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_btd.cpp: +d/actor/d_a_btd.cpp: .text start:0x000000EC end:0x00009DB8 .text start:0x00009DB8 end:0x00009DB8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_bwd/splits.txt b/config/GZLJ01/rels/d_a_bwd/splits.txt index 1163945..b5930e1 100644 --- a/config/GZLJ01/rels/d_a_bwd/splits.txt +++ b/config/GZLJ01/rels/d_a_bwd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bwd.cpp: +d/actor/d_a_bwd.cpp: .text start:0x000000EC end:0x0000A864 .text start:0x0000A864 end:0x0000A864 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_bwdg/splits.txt b/config/GZLJ01/rels/d_a_bwdg/splits.txt index 42fc08d..051a85b 100644 --- a/config/GZLJ01/rels/d_a_bwdg/splits.txt +++ b/config/GZLJ01/rels/d_a_bwdg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bwdg.cpp: +d/actor/d_a_bwdg.cpp: .text start:0x00000078 end:0x00000B88 .text start:0x00000B88 end:0x00000B88 .text start:0x00000B88 end:0x00000C2C diff --git a/config/GZLJ01/rels/d_a_bwds/splits.txt b/config/GZLJ01/rels/d_a_bwds/splits.txt index e46dace..f6abde7 100644 --- a/config/GZLJ01/rels/d_a_bwds/splits.txt +++ b/config/GZLJ01/rels/d_a_bwds/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bwds.cpp: +d/actor/d_a_bwds.cpp: .text start:0x000000EC end:0x00004078 .text start:0x00004078 end:0x00004078 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_canon/splits.txt b/config/GZLJ01/rels/d_a_canon/splits.txt index d57b076..d1c78b9 100644 --- a/config/GZLJ01/rels/d_a_canon/splits.txt +++ b/config/GZLJ01/rels/d_a_canon/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_canon.cpp: +d/actor/d_a_canon.cpp: .text start:0x000000EC end:0x00002A04 .text start:0x00002A04 end:0x00002A04 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_cc/splits.txt b/config/GZLJ01/rels/d_a_cc/splits.txt index 23b832c..049024a 100644 --- a/config/GZLJ01/rels/d_a_cc/splits.txt +++ b/config/GZLJ01/rels/d_a_cc/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_cc.cpp: +d/actor/d_a_cc.cpp: .text start:0x00000078 end:0x00007CA8 .text start:0x00007CA8 end:0x00007CC4 .text start:0x00007CC4 end:0x00007CC4 diff --git a/config/GZLJ01/rels/d_a_coming2/splits.txt b/config/GZLJ01/rels/d_a_coming2/splits.txt index 17d22c8..0073391 100644 --- a/config/GZLJ01/rels/d_a_coming2/splits.txt +++ b/config/GZLJ01/rels/d_a_coming2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_coming2.cpp: +d/actor/d_a_coming2.cpp: .text start:0x000000EC end:0x0000244C .text start:0x0000244C end:0x00002684 .rodata start:0x00000000 end:0x0000005C diff --git a/config/GZLJ01/rels/d_a_coming3/splits.txt b/config/GZLJ01/rels/d_a_coming3/splits.txt index 561842c..3ebb717 100644 --- a/config/GZLJ01/rels/d_a_coming3/splits.txt +++ b/config/GZLJ01/rels/d_a_coming3/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_coming3.cpp: +d/actor/d_a_coming3.cpp: .text start:0x000000EC end:0x00001ED8 .text start:0x00001ED8 end:0x000021E0 .rodata start:0x00000000 end:0x000000EA diff --git a/config/GZLJ01/rels/d_a_dai/splits.txt b/config/GZLJ01/rels/d_a_dai/splits.txt index 84e637d..8585c6f 100644 --- a/config/GZLJ01/rels/d_a_dai/splits.txt +++ b/config/GZLJ01/rels/d_a_dai/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_dai.cpp: +d/actor/d_a_dai.cpp: .text start:0x00000078 end:0x0000112C .text start:0x0000112C end:0x0000112C .text start:0x0000112C end:0x0000124C diff --git a/config/GZLJ01/rels/d_a_daiocta/splits.txt b/config/GZLJ01/rels/d_a_daiocta/splits.txt index 3f43573..8ee2d3b 100644 --- a/config/GZLJ01/rels/d_a_daiocta/splits.txt +++ b/config/GZLJ01/rels/d_a_daiocta/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_daiocta.cpp: +d/actor/d_a_daiocta.cpp: .text start:0x000000EC end:0x000055F8 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000038F diff --git a/config/GZLJ01/rels/d_a_daiocta_eye/splits.txt b/config/GZLJ01/rels/d_a_daiocta_eye/splits.txt index 7f4dbe6..06a8b57 100644 --- a/config/GZLJ01/rels/d_a_daiocta_eye/splits.txt +++ b/config/GZLJ01/rels/d_a_daiocta_eye/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_daiocta_eye.cpp: +d/actor/d_a_daiocta_eye.cpp: .text start:0x000000EC end:0x00001AF0 .text start:0x00001AF0 end:0x00001B80 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_deku_item/splits.txt b/config/GZLJ01/rels/d_a_deku_item/splits.txt index 783070f..cf903e2 100644 --- a/config/GZLJ01/rels/d_a_deku_item/splits.txt +++ b/config/GZLJ01/rels/d_a_deku_item/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_deku_item.cpp: +d/actor/d_a_deku_item.cpp: .text start:0x00000078 end:0x0000119C .rodata start:0x00000000 end:0x0000006C .data start:0x00000000 end:0x0000029C diff --git a/config/GZLJ01/rels/d_a_demo_dk/splits.txt b/config/GZLJ01/rels/d_a_demo_dk/splits.txt index ebf13c9..7878a9d 100644 --- a/config/GZLJ01/rels/d_a_demo_dk/splits.txt +++ b/config/GZLJ01/rels/d_a_demo_dk/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_demo_dk.cpp: +d/actor/d_a_demo_dk.cpp: .text start:0x00000078 end:0x00000714 .rodata start:0x00000000 end:0x0000002C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_demo_item/splits.txt b/config/GZLJ01/rels/d_a_demo_item/splits.txt index c76341e..4c0e585 100644 --- a/config/GZLJ01/rels/d_a_demo_item/splits.txt +++ b/config/GZLJ01/rels/d_a_demo_item/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_demo_item.cpp: +d/actor/d_a_demo_item.cpp: .text start:0x000000EC end:0x00000F98 .rodata start:0x00000000 end:0x00000024 .data start:0x00000000 end:0x0000028C diff --git a/config/GZLJ01/rels/d_a_demo_kmm/splits.txt b/config/GZLJ01/rels/d_a_demo_kmm/splits.txt index cb79332..e0cbd8a 100644 --- a/config/GZLJ01/rels/d_a_demo_kmm/splits.txt +++ b/config/GZLJ01/rels/d_a_demo_kmm/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_demo_kmm.cpp: +d/actor/d_a_demo_kmm.cpp: .text start:0x00000078 end:0x00000520 .rodata start:0x00000000 end:0x00000018 .data start:0x00000000 end:0x00000054 diff --git a/config/GZLJ01/rels/d_a_dk/splits.txt b/config/GZLJ01/rels/d_a_dk/splits.txt index ee4e379..f27471a 100644 --- a/config/GZLJ01/rels/d_a_dk/splits.txt +++ b/config/GZLJ01/rels/d_a_dk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_dk.cpp: +d/actor/d_a_dk.cpp: .text start:0x000000EC end:0x0000148C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000B3 diff --git a/config/GZLJ01/rels/d_a_door10/splits.txt b/config/GZLJ01/rels/d_a_door10/splits.txt index febd4bb..6c9796b 100644 --- a/config/GZLJ01/rels/d_a_door10/splits.txt +++ b/config/GZLJ01/rels/d_a_door10/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_door10.cpp: +d/actor/d_a_door10.cpp: .text start:0x00000078 end:0x00001F5C .text start:0x00001F5C end:0x00002000 .rodata start:0x00000000 end:0x000000BC diff --git a/config/GZLJ01/rels/d_a_door12/splits.txt b/config/GZLJ01/rels/d_a_door12/splits.txt index de40197..eb09f71 100644 --- a/config/GZLJ01/rels/d_a_door12/splits.txt +++ b/config/GZLJ01/rels/d_a_door12/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_door12.cpp: +d/actor/d_a_door12.cpp: .text start:0x00000078 end:0x00001D3C .text start:0x00001D3C end:0x00001D3C .text start:0x00001D3C end:0x00001DE0 diff --git a/config/GZLJ01/rels/d_a_dr/splits.txt b/config/GZLJ01/rels/d_a_dr/splits.txt index 46db39c..9432b92 100644 --- a/config/GZLJ01/rels/d_a_dr/splits.txt +++ b/config/GZLJ01/rels/d_a_dr/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_dr.cpp: +d/actor/d_a_dr.cpp: .text start:0x000000EC end:0x00000D68 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000002C diff --git a/config/GZLJ01/rels/d_a_dr2/splits.txt b/config/GZLJ01/rels/d_a_dr2/splits.txt index 5a1660d..d566de7 100644 --- a/config/GZLJ01/rels/d_a_dr2/splits.txt +++ b/config/GZLJ01/rels/d_a_dr2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_dr2.cpp: +d/actor/d_a_dr2.cpp: .text start:0x000000EC end:0x000027E4 .text start:0x000027E4 end:0x00002800 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_dummy/splits.txt b/config/GZLJ01/rels/d_a_dummy/splits.txt index 230798c..6dfe25c 100644 --- a/config/GZLJ01/rels/d_a_dummy/splits.txt +++ b/config/GZLJ01/rels/d_a_dummy/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_dummy.cpp: +d/actor/d_a_dummy.cpp: .text start:0x00000078 end:0x00000270 .text start:0x00000270 end:0x000002D0 .rodata start:0x00000000 end:0x0000000C diff --git a/config/GZLJ01/rels/d_a_ep/splits.txt b/config/GZLJ01/rels/d_a_ep/splits.txt index 66701fe..10384bc 100644 --- a/config/GZLJ01/rels/d_a_ep/splits.txt +++ b/config/GZLJ01/rels/d_a_ep/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ep.cpp: +d/actor/d_a_ep.cpp: .text start:0x00000078 end:0x00002FF8 .text start:0x00002FF8 end:0x00002FF8 .rodata start:0x00000000 end:0x00000111 diff --git a/config/GZLJ01/rels/d_a_fallrock/splits.txt b/config/GZLJ01/rels/d_a_fallrock/splits.txt index bbf3a65..004ddcd 100644 --- a/config/GZLJ01/rels/d_a_fallrock/splits.txt +++ b/config/GZLJ01/rels/d_a_fallrock/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fallrock.cpp: +d/actor/d_a_fallrock.cpp: .text start:0x00000078 end:0x00001A2C .rodata start:0x00000000 end:0x00000099 .data start:0x00000000 end:0x000002B0 diff --git a/config/GZLJ01/rels/d_a_fallrock_tag/splits.txt b/config/GZLJ01/rels/d_a_fallrock_tag/splits.txt index 127337c..1112d31 100644 --- a/config/GZLJ01/rels/d_a_fallrock_tag/splits.txt +++ b/config/GZLJ01/rels/d_a_fallrock_tag/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fallrock_tag.cpp: +d/actor/d_a_fallrock_tag.cpp: .text start:0x00000078 end:0x000003E4 .rodata start:0x00000000 end:0x00000018 .data start:0x00000000 end:0x00000070 diff --git a/config/GZLJ01/rels/d_a_fan/splits.txt b/config/GZLJ01/rels/d_a_fan/splits.txt index 6648dd6..07b1b47 100644 --- a/config/GZLJ01/rels/d_a_fan/splits.txt +++ b/config/GZLJ01/rels/d_a_fan/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fan.cpp: +d/actor/d_a_fan.cpp: .text start:0x00000078 end:0x00001220 .text start:0x00001220 end:0x00001324 .rodata start:0x00000000 end:0x00000115 diff --git a/config/GZLJ01/rels/d_a_ff/splits.txt b/config/GZLJ01/rels/d_a_ff/splits.txt index 04e0e65..2a945e6 100644 --- a/config/GZLJ01/rels/d_a_ff/splits.txt +++ b/config/GZLJ01/rels/d_a_ff/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ff.cpp: +d/actor/d_a_ff.cpp: .text start:0x00000078 end:0x000019C8 .rodata start:0x00000000 end:0x000000C2 .data start:0x00000000 end:0x00000248 diff --git a/config/GZLJ01/rels/d_a_fganon/splits.txt b/config/GZLJ01/rels/d_a_fganon/splits.txt index d873ee4..a964fbc 100644 --- a/config/GZLJ01/rels/d_a_fganon/splits.txt +++ b/config/GZLJ01/rels/d_a_fganon/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_fganon.cpp: +d/actor/d_a_fganon.cpp: .text start:0x000000EC end:0x0000A720 .text start:0x0000A720 end:0x0000A720 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_fgmahou/splits.txt b/config/GZLJ01/rels/d_a_fgmahou/splits.txt index 632b310..7fce6a1 100644 --- a/config/GZLJ01/rels/d_a_fgmahou/splits.txt +++ b/config/GZLJ01/rels/d_a_fgmahou/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fgmahou.cpp: +d/actor/d_a_fgmahou.cpp: .text start:0x00000078 end:0x000016FC .rodata start:0x00000000 end:0x00000053 .data start:0x00000000 end:0x00000268 diff --git a/config/GZLJ01/rels/d_a_fire/splits.txt b/config/GZLJ01/rels/d_a_fire/splits.txt index c91c4aa..a5a14a7 100644 --- a/config/GZLJ01/rels/d_a_fire/splits.txt +++ b/config/GZLJ01/rels/d_a_fire/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fire.cpp: +d/actor/d_a_fire.cpp: .text start:0x00000078 end:0x0000179C .rodata start:0x00000000 end:0x00000095 .data start:0x00000000 end:0x0000026C diff --git a/config/GZLJ01/rels/d_a_floor/splits.txt b/config/GZLJ01/rels/d_a_floor/splits.txt index da77f2f..c20497c 100644 --- a/config/GZLJ01/rels/d_a_floor/splits.txt +++ b/config/GZLJ01/rels/d_a_floor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_floor.cpp: +d/actor/d_a_floor.cpp: .text start:0x00000078 end:0x00000774 .text start:0x00000774 end:0x0000078C .rodata start:0x00000000 end:0x00000066 diff --git a/config/GZLJ01/rels/d_a_fm/splits.txt b/config/GZLJ01/rels/d_a_fm/splits.txt index f9f6f83..2554a34 100644 --- a/config/GZLJ01/rels/d_a_fm/splits.txt +++ b/config/GZLJ01/rels/d_a_fm/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_fm.cpp: +d/actor/d_a_fm.cpp: .text start:0x000000EC end:0x0000A504 .text start:0x0000A504 end:0x0000A5D0 .text start:0x0000A5D0 end:0x0000A5EC diff --git a/config/GZLJ01/rels/d_a_ghostship/splits.txt b/config/GZLJ01/rels/d_a_ghostship/splits.txt index 1e3bd70..e0dcf87 100644 --- a/config/GZLJ01/rels/d_a_ghostship/splits.txt +++ b/config/GZLJ01/rels/d_a_ghostship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ghostship.cpp: +d/actor/d_a_ghostship.cpp: .text start:0x000000EC end:0x00001B40 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000138 diff --git a/config/GZLJ01/rels/d_a_gm/splits.txt b/config/GZLJ01/rels/d_a_gm/splits.txt index fbbf828..ea010eb 100644 --- a/config/GZLJ01/rels/d_a_gm/splits.txt +++ b/config/GZLJ01/rels/d_a_gm/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gm.cpp: +d/actor/d_a_gm.cpp: .text start:0x000000EC end:0x00009064 .text start:0x00009064 end:0x00009334 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_gnd/splits.txt b/config/GZLJ01/rels/d_a_gnd/splits.txt index 9348ac4..6fee22c 100644 --- a/config/GZLJ01/rels/d_a_gnd/splits.txt +++ b/config/GZLJ01/rels/d_a_gnd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gnd.cpp: +d/actor/d_a_gnd.cpp: .text start:0x000000EC end:0x00008D4C .text start:0x00008D4C end:0x00008D4C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_goal_flag/splits.txt b/config/GZLJ01/rels/d_a_goal_flag/splits.txt index 53e6d93..55f474c 100644 --- a/config/GZLJ01/rels/d_a_goal_flag/splits.txt +++ b/config/GZLJ01/rels/d_a_goal_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_goal_flag.cpp: +d/actor/d_a_goal_flag.cpp: .text start:0x000000EC end:0x00002D84 .text start:0x00002D84 end:0x00002E6C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_grass/splits.txt b/config/GZLJ01/rels/d_a_grass/splits.txt index a4fd27d..fc21afb 100644 --- a/config/GZLJ01/rels/d_a_grass/splits.txt +++ b/config/GZLJ01/rels/d_a_grass/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_grass.cpp: +d/actor/d_a_grass.cpp: .text start:0x000000EC end:0x0000151C .rodata start:0x00000000 end:0x00000008 .data start:0x00000000 end:0x00000090 diff --git a/config/GZLJ01/rels/d_a_gy/splits.txt b/config/GZLJ01/rels/d_a_gy/splits.txt index 7548b40..1ea0c4a 100644 --- a/config/GZLJ01/rels/d_a_gy/splits.txt +++ b/config/GZLJ01/rels/d_a_gy/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gy.cpp: +d/actor/d_a_gy.cpp: .text start:0x000000EC end:0x00005FBC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000282 diff --git a/config/GZLJ01/rels/d_a_gy_ctrl/splits.txt b/config/GZLJ01/rels/d_a_gy_ctrl/splits.txt index d8f492e..c624203 100644 --- a/config/GZLJ01/rels/d_a_gy_ctrl/splits.txt +++ b/config/GZLJ01/rels/d_a_gy_ctrl/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gy_ctrl.cpp: +d/actor/d_a_gy_ctrl.cpp: .text start:0x000000EC end:0x00001DCC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000080 diff --git a/config/GZLJ01/rels/d_a_himo3/splits.txt b/config/GZLJ01/rels/d_a_himo3/splits.txt index 048385b..2fc5552 100644 --- a/config/GZLJ01/rels/d_a_himo3/splits.txt +++ b/config/GZLJ01/rels/d_a_himo3/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_himo3.cpp: +d/actor/d_a_himo3.cpp: .text start:0x000000EC end:0x00002D2C .text start:0x00002D2C end:0x00002DA0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_hitobj/splits.txt b/config/GZLJ01/rels/d_a_hitobj/splits.txt index 6f0e8a1..2af5575 100644 --- a/config/GZLJ01/rels/d_a_hitobj/splits.txt +++ b/config/GZLJ01/rels/d_a_hitobj/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hitobj.cpp: +d/actor/d_a_hitobj.cpp: .text start:0x00000078 end:0x00000510 .rodata start:0x00000000 end:0x00000007 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLJ01/rels/d_a_hmlif/splits.txt b/config/GZLJ01/rels/d_a_hmlif/splits.txt index 7eedfdb..7b673f5 100644 --- a/config/GZLJ01/rels/d_a_hmlif/splits.txt +++ b/config/GZLJ01/rels/d_a_hmlif/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hmlif.cpp: +d/actor/d_a_hmlif.cpp: .text start:0x00000078 end:0x000016A0 .text start:0x000016A0 end:0x0000186C .rodata start:0x00000000 end:0x00000150 diff --git a/config/GZLJ01/rels/d_a_hot_floor/splits.txt b/config/GZLJ01/rels/d_a_hot_floor/splits.txt index bb8f442..83ddba5 100644 --- a/config/GZLJ01/rels/d_a_hot_floor/splits.txt +++ b/config/GZLJ01/rels/d_a_hot_floor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hot_floor.cpp: +d/actor/d_a_hot_floor.cpp: .text start:0x00000078 end:0x00000614 .rodata start:0x00000000 end:0x00000020 .data start:0x00000000 end:0x00000074 diff --git a/config/GZLJ01/rels/d_a_hys/splits.txt b/config/GZLJ01/rels/d_a_hys/splits.txt index 92fda28..f8995fb 100644 --- a/config/GZLJ01/rels/d_a_hys/splits.txt +++ b/config/GZLJ01/rels/d_a_hys/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hys.cpp: +d/actor/d_a_hys.cpp: .text start:0x00000078 end:0x00000C2C .text start:0x00000C2C end:0x00000DB0 .rodata start:0x00000000 end:0x00000066 diff --git a/config/GZLJ01/rels/d_a_icelift/splits.txt b/config/GZLJ01/rels/d_a_icelift/splits.txt index 3cebd56..0debd5f 100644 --- a/config/GZLJ01/rels/d_a_icelift/splits.txt +++ b/config/GZLJ01/rels/d_a_icelift/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_icelift.cpp: +d/actor/d_a_icelift.cpp: .text start:0x00000078 end:0x0000109C .rodata start:0x00000000 end:0x000000A0 .data start:0x00000000 end:0x0000007C diff --git a/config/GZLJ01/rels/d_a_ikari/splits.txt b/config/GZLJ01/rels/d_a_ikari/splits.txt index e1a0d83..5e26ffc 100644 --- a/config/GZLJ01/rels/d_a_ikari/splits.txt +++ b/config/GZLJ01/rels/d_a_ikari/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ikari.cpp: +d/actor/d_a_ikari.cpp: .text start:0x000000EC end:0x0000077C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000005A diff --git a/config/GZLJ01/rels/d_a_jbo/splits.txt b/config/GZLJ01/rels/d_a_jbo/splits.txt index 5943c8c..7e28625 100644 --- a/config/GZLJ01/rels/d_a_jbo/splits.txt +++ b/config/GZLJ01/rels/d_a_jbo/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_jbo.cpp: +d/actor/d_a_jbo.cpp: .text start:0x00000078 end:0x00000D38 .rodata start:0x00000000 end:0x00000028 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLJ01/rels/d_a_kaji/splits.txt b/config/GZLJ01/rels/d_a_kaji/splits.txt index a56787b..f095669 100644 --- a/config/GZLJ01/rels/d_a_kaji/splits.txt +++ b/config/GZLJ01/rels/d_a_kaji/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kaji.cpp: +d/actor/d_a_kaji.cpp: .text start:0x00000078 end:0x00000570 .rodata start:0x00000000 end:0x0000004A .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_kamome/splits.txt b/config/GZLJ01/rels/d_a_kamome/splits.txt index 2a7e05f..8d62d01 100644 --- a/config/GZLJ01/rels/d_a_kamome/splits.txt +++ b/config/GZLJ01/rels/d_a_kamome/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_kamome.cpp: +d/actor/d_a_kamome.cpp: .text start:0x000000EC end:0x00005394 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000DA diff --git a/config/GZLJ01/rels/d_a_kanban/splits.txt b/config/GZLJ01/rels/d_a_kanban/splits.txt index b1db011..f6b8f4d 100644 --- a/config/GZLJ01/rels/d_a_kanban/splits.txt +++ b/config/GZLJ01/rels/d_a_kanban/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_kanban.cpp: +d/actor/d_a_kanban.cpp: .text start:0x000000EC end:0x00002ED8 .text start:0x00002ED8 end:0x00002EF4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_kantera/splits.txt b/config/GZLJ01/rels/d_a_kantera/splits.txt index 139b093..2b8690d 100644 --- a/config/GZLJ01/rels/d_a_kantera/splits.txt +++ b/config/GZLJ01/rels/d_a_kantera/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_kantera.cpp: +d/actor/d_a_kantera.cpp: .text start:0x000000EC end:0x00002780 .rodata start:0x00000000 end:0x00000129 .data start:0x00000000 end:0x0000025C diff --git a/config/GZLJ01/rels/d_a_kb/splits.txt b/config/GZLJ01/rels/d_a_kb/splits.txt index 6b6376c..d585c56 100644 --- a/config/GZLJ01/rels/d_a_kb/splits.txt +++ b/config/GZLJ01/rels/d_a_kb/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kb.cpp: +d/actor/d_a_kb.cpp: .text start:0x00000078 end:0x00007F78 .text start:0x00007F78 end:0x00007F78 .rodata start:0x00000000 end:0x0000010F diff --git a/config/GZLJ01/rels/d_a_kddoor/splits.txt b/config/GZLJ01/rels/d_a_kddoor/splits.txt index b3e8c3e..4950175 100644 --- a/config/GZLJ01/rels/d_a_kddoor/splits.txt +++ b/config/GZLJ01/rels/d_a_kddoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kddoor.cpp: +d/actor/d_a_kddoor.cpp: .text start:0x00000078 end:0x00002E5C .text start:0x00002E5C end:0x00002FD8 .text start:0x00002FD8 end:0x0000307C diff --git a/config/GZLJ01/rels/d_a_ki/splits.txt b/config/GZLJ01/rels/d_a_ki/splits.txt index 214ca19..a8c2d61 100644 --- a/config/GZLJ01/rels/d_a_ki/splits.txt +++ b/config/GZLJ01/rels/d_a_ki/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ki.cpp: +d/actor/d_a_ki.cpp: .text start:0x000000EC end:0x00005358 .text start:0x00005358 end:0x00005358 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_kita/splits.txt b/config/GZLJ01/rels/d_a_kita/splits.txt index a110aa5..4785172 100644 --- a/config/GZLJ01/rels/d_a_kita/splits.txt +++ b/config/GZLJ01/rels/d_a_kita/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kita.cpp: +d/actor/d_a_kita.cpp: .text start:0x00000078 end:0x000027C8 .rodata start:0x00000000 end:0x000000D5 .data start:0x00000000 end:0x0000039C diff --git a/config/GZLJ01/rels/d_a_klft/splits.txt b/config/GZLJ01/rels/d_a_klft/splits.txt index 4e0de12..638078e 100644 --- a/config/GZLJ01/rels/d_a_klft/splits.txt +++ b/config/GZLJ01/rels/d_a_klft/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_klft.cpp: +d/actor/d_a_klft.cpp: .text start:0x00000078 end:0x000021F4 .rodata start:0x00000000 end:0x000000DA .data start:0x00000000 end:0x00000270 diff --git a/config/GZLJ01/rels/d_a_kmon/splits.txt b/config/GZLJ01/rels/d_a_kmon/splits.txt index 4b2c0db..bcdbd00 100644 --- a/config/GZLJ01/rels/d_a_kmon/splits.txt +++ b/config/GZLJ01/rels/d_a_kmon/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kmon.cpp: +d/actor/d_a_kmon.cpp: .text start:0x00000078 end:0x00000AB4 .rodata start:0x00000000 end:0x0000007E .data start:0x00000000 end:0x000000B0 diff --git a/config/GZLJ01/rels/d_a_kn/splits.txt b/config/GZLJ01/rels/d_a_kn/splits.txt index ddb8843..b939377 100644 --- a/config/GZLJ01/rels/d_a_kn/splits.txt +++ b/config/GZLJ01/rels/d_a_kn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kn.cpp: +d/actor/d_a_kn.cpp: .text start:0x00000078 end:0x00001330 .rodata start:0x00000000 end:0x0000009B .data start:0x00000000 end:0x0000009C diff --git a/config/GZLJ01/rels/d_a_knob00/splits.txt b/config/GZLJ01/rels/d_a_knob00/splits.txt index 2179a5c..d533046 100644 --- a/config/GZLJ01/rels/d_a_knob00/splits.txt +++ b/config/GZLJ01/rels/d_a_knob00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_knob00.cpp: +d/actor/d_a_knob00.cpp: .text start:0x00000078 end:0x00001F1C .text start:0x00001F1C end:0x00001FC0 .text start:0x00001FC0 end:0x00001FC0 diff --git a/config/GZLJ01/rels/d_a_kokiie/splits.txt b/config/GZLJ01/rels/d_a_kokiie/splits.txt index 8e15098..484db5f 100644 --- a/config/GZLJ01/rels/d_a_kokiie/splits.txt +++ b/config/GZLJ01/rels/d_a_kokiie/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kokiie.cpp: +d/actor/d_a_kokiie.cpp: .text start:0x00000078 end:0x000014E4 .rodata start:0x00000000 end:0x000000FE .data start:0x00000000 end:0x00000148 diff --git a/config/GZLJ01/rels/d_a_komore/splits.txt b/config/GZLJ01/rels/d_a_komore/splits.txt index 84fd2d5..cccec59 100644 --- a/config/GZLJ01/rels/d_a_komore/splits.txt +++ b/config/GZLJ01/rels/d_a_komore/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_komore.cpp: +d/actor/d_a_komore.cpp: .text start:0x00000078 end:0x000005AC .text start:0x000005AC end:0x00000638 .rodata start:0x00000000 end:0x00000048 diff --git a/config/GZLJ01/rels/d_a_ks/splits.txt b/config/GZLJ01/rels/d_a_ks/splits.txt index e1353fc..a780afc 100644 --- a/config/GZLJ01/rels/d_a_ks/splits.txt +++ b/config/GZLJ01/rels/d_a_ks/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ks.cpp: +d/actor/d_a_ks.cpp: .text start:0x00000078 end:0x00004578 .text start:0x00004578 end:0x000045B0 .text start:0x000045B0 end:0x000045B0 diff --git a/config/GZLJ01/rels/d_a_kt/splits.txt b/config/GZLJ01/rels/d_a_kt/splits.txt index b219acd..425cf3a 100644 --- a/config/GZLJ01/rels/d_a_kt/splits.txt +++ b/config/GZLJ01/rels/d_a_kt/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kt.cpp: +d/actor/d_a_kt.cpp: .text start:0x00000078 end:0x000015E8 .text start:0x000015E8 end:0x00001984 .rodata start:0x00000000 end:0x0000008B diff --git a/config/GZLJ01/rels/d_a_kui/splits.txt b/config/GZLJ01/rels/d_a_kui/splits.txt index ff7e7cf..97f088d 100644 --- a/config/GZLJ01/rels/d_a_kui/splits.txt +++ b/config/GZLJ01/rels/d_a_kui/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kui.cpp: +d/actor/d_a_kui.cpp: .text start:0x00000078 end:0x000018C8 .text start:0x000018C8 end:0x000018E4 .rodata start:0x00000000 end:0x00000099 diff --git a/config/GZLJ01/rels/d_a_kytag00/splits.txt b/config/GZLJ01/rels/d_a_kytag00/splits.txt index 92be9ee..596dbfe 100644 --- a/config/GZLJ01/rels/d_a_kytag00/splits.txt +++ b/config/GZLJ01/rels/d_a_kytag00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag00.cpp: +d/actor/d_a_kytag00.cpp: .text start:0x00000078 end:0x00000F8C .rodata start:0x00000000 end:0x0000004C .data start:0x00000000 end:0x00000080 diff --git a/config/GZLJ01/rels/d_a_kytag01/splits.txt b/config/GZLJ01/rels/d_a_kytag01/splits.txt index fbd6b40..72626a0 100644 --- a/config/GZLJ01/rels/d_a_kytag01/splits.txt +++ b/config/GZLJ01/rels/d_a_kytag01/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag01.cpp: +d/actor/d_a_kytag01.cpp: .text start:0x00000078 end:0x00000318 .rodata start:0x00000000 end:0x00000053 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_kytag02/splits.txt b/config/GZLJ01/rels/d_a_kytag02/splits.txt index ee426fe..b04c749 100644 --- a/config/GZLJ01/rels/d_a_kytag02/splits.txt +++ b/config/GZLJ01/rels/d_a_kytag02/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag02.cpp: +d/actor/d_a_kytag02.cpp: .text start:0x00000078 end:0x0000047C .rodata start:0x00000000 end:0x00000028 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_kytag03/splits.txt b/config/GZLJ01/rels/d_a_kytag03/splits.txt index 925d057..7319c98 100644 --- a/config/GZLJ01/rels/d_a_kytag03/splits.txt +++ b/config/GZLJ01/rels/d_a_kytag03/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag03.cpp: +d/actor/d_a_kytag03.cpp: .text start:0x00000078 end:0x00000604 .rodata start:0x00000000 end:0x0000000F .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_kytag04/splits.txt b/config/GZLJ01/rels/d_a_kytag04/splits.txt index b44f370..3b6600a 100644 --- a/config/GZLJ01/rels/d_a_kytag04/splits.txt +++ b/config/GZLJ01/rels/d_a_kytag04/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag04.cpp: +d/actor/d_a_kytag04.cpp: .text start:0x00000078 end:0x00000208 .rodata start:0x00000000 end:0x00000004 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_kytag05/splits.txt b/config/GZLJ01/rels/d_a_kytag05/splits.txt index a33a497..40d0c05 100644 --- a/config/GZLJ01/rels/d_a_kytag05/splits.txt +++ b/config/GZLJ01/rels/d_a_kytag05/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag05.cpp: +d/actor/d_a_kytag05.cpp: .text start:0x00000078 end:0x000004C0 .rodata start:0x00000000 end:0x00000057 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_kytag06/splits.txt b/config/GZLJ01/rels/d_a_kytag06/splits.txt index 65a23f1..68d4fa5 100644 --- a/config/GZLJ01/rels/d_a_kytag06/splits.txt +++ b/config/GZLJ01/rels/d_a_kytag06/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag06.cpp: +d/actor/d_a_kytag06.cpp: .text start:0x00000078 end:0x00000224 .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_kytag07/splits.txt b/config/GZLJ01/rels/d_a_kytag07/splits.txt index 474f793..22316d1 100644 --- a/config/GZLJ01/rels/d_a_kytag07/splits.txt +++ b/config/GZLJ01/rels/d_a_kytag07/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag07.cpp: +d/actor/d_a_kytag07.cpp: .text start:0x00000078 end:0x00000350 .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_lamp/splits.txt b/config/GZLJ01/rels/d_a_lamp/splits.txt index 680a4b2..79c49bb 100644 --- a/config/GZLJ01/rels/d_a_lamp/splits.txt +++ b/config/GZLJ01/rels/d_a_lamp/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_lamp.cpp: +d/actor/d_a_lamp.cpp: .text start:0x000000EC end:0x00000BC4 .rodata start:0x00000000 end:0x00000082 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLJ01/rels/d_a_lbridge/splits.txt b/config/GZLJ01/rels/d_a_lbridge/splits.txt index b5147c5..4d3ddc3 100644 --- a/config/GZLJ01/rels/d_a_lbridge/splits.txt +++ b/config/GZLJ01/rels/d_a_lbridge/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lbridge.cpp: +d/actor/d_a_lbridge.cpp: .text start:0x00000078 end:0x00001140 .rodata start:0x00000000 end:0x00000099 .data start:0x00000000 end:0x00000080 diff --git a/config/GZLJ01/rels/d_a_leaflift/splits.txt b/config/GZLJ01/rels/d_a_leaflift/splits.txt index 8c2f221..f58886f 100644 --- a/config/GZLJ01/rels/d_a_leaflift/splits.txt +++ b/config/GZLJ01/rels/d_a_leaflift/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_leaflift.cpp: +d/actor/d_a_leaflift.cpp: .text start:0x000000EC end:0x00001360 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000081 diff --git a/config/GZLJ01/rels/d_a_lod_bg/splits.txt b/config/GZLJ01/rels/d_a_lod_bg/splits.txt index 2db89bb..998fd4d 100644 --- a/config/GZLJ01/rels/d_a_lod_bg/splits.txt +++ b/config/GZLJ01/rels/d_a_lod_bg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lod_bg.cpp: +d/actor/d_a_lod_bg.cpp: .text start:0x00000078 end:0x000011E8 .rodata start:0x00000000 end:0x000001C7 .data start:0x00000000 end:0x000000C8 diff --git a/config/GZLJ01/rels/d_a_lstair/splits.txt b/config/GZLJ01/rels/d_a_lstair/splits.txt index bb0e40f..eb74440 100644 --- a/config/GZLJ01/rels/d_a_lstair/splits.txt +++ b/config/GZLJ01/rels/d_a_lstair/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lstair.cpp: +d/actor/d_a_lstair.cpp: .text start:0x00000078 end:0x000012D4 .rodata start:0x00000000 end:0x000000AF .data start:0x00000000 end:0x0000008C diff --git a/config/GZLJ01/rels/d_a_lwood/splits.txt b/config/GZLJ01/rels/d_a_lwood/splits.txt index 87270cb..712dfd3 100644 --- a/config/GZLJ01/rels/d_a_lwood/splits.txt +++ b/config/GZLJ01/rels/d_a_lwood/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lwood.cpp: +d/actor/d_a_lwood.cpp: .text start:0x00000078 end:0x00000794 .rodata start:0x00000000 end:0x00000074 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_machine/splits.txt b/config/GZLJ01/rels/d_a_machine/splits.txt index 67cf140..c6b98e8 100644 --- a/config/GZLJ01/rels/d_a_machine/splits.txt +++ b/config/GZLJ01/rels/d_a_machine/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_machine.cpp: +d/actor/d_a_machine.cpp: .text start:0x00000078 end:0x000017A4 .rodata start:0x00000000 end:0x000000B1 .data start:0x00000000 end:0x000002A0 diff --git a/config/GZLJ01/rels/d_a_magma/splits.txt b/config/GZLJ01/rels/d_a_magma/splits.txt index 1bc26d2..5f6e463 100644 --- a/config/GZLJ01/rels/d_a_magma/splits.txt +++ b/config/GZLJ01/rels/d_a_magma/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_magma.cpp: +d/actor/d_a_magma.cpp: .text start:0x00000078 end:0x00000178 .rodata start:0x00000000 end:0x00000006 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_majuu_flag/splits.txt b/config/GZLJ01/rels/d_a_majuu_flag/splits.txt index e629088..0d16a61 100644 --- a/config/GZLJ01/rels/d_a_majuu_flag/splits.txt +++ b/config/GZLJ01/rels/d_a_majuu_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_majuu_flag.cpp: +d/actor/d_a_majuu_flag.cpp: .text start:0x000000EC end:0x00001BF4 .text start:0x00001BF4 end:0x00001CC4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_mant/splits.txt b/config/GZLJ01/rels/d_a_mant/splits.txt index 89b07f1..980e6bb 100644 --- a/config/GZLJ01/rels/d_a_mant/splits.txt +++ b/config/GZLJ01/rels/d_a_mant/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mant.cpp: +d/actor/d_a_mant.cpp: .text start:0x000000EC end:0x00002280 .text start:0x00002280 end:0x00002320 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_mbdoor/splits.txt b/config/GZLJ01/rels/d_a_mbdoor/splits.txt index 24a483e..17935b2 100644 --- a/config/GZLJ01/rels/d_a_mbdoor/splits.txt +++ b/config/GZLJ01/rels/d_a_mbdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mbdoor.cpp: +d/actor/d_a_mbdoor.cpp: .text start:0x00000078 end:0x000015F4 .text start:0x000015F4 end:0x000015F4 .rodata start:0x00000000 end:0x000000FB diff --git a/config/GZLJ01/rels/d_a_mdoor/splits.txt b/config/GZLJ01/rels/d_a_mdoor/splits.txt index 56f7087..af08c13 100644 --- a/config/GZLJ01/rels/d_a_mdoor/splits.txt +++ b/config/GZLJ01/rels/d_a_mdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mdoor.cpp: +d/actor/d_a_mdoor.cpp: .text start:0x00000078 end:0x00001128 .rodata start:0x00000000 end:0x000000A2 .data start:0x00000000 end:0x000000D8 diff --git a/config/GZLJ01/rels/d_a_mflft/splits.txt b/config/GZLJ01/rels/d_a_mflft/splits.txt index 170ee87..0e60271 100644 --- a/config/GZLJ01/rels/d_a_mflft/splits.txt +++ b/config/GZLJ01/rels/d_a_mflft/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mflft.cpp: +d/actor/d_a_mflft.cpp: .text start:0x00000078 end:0x00002E08 .rodata start:0x00000000 end:0x000000F6 .data start:0x00000000 end:0x00000300 diff --git a/config/GZLJ01/rels/d_a_mgameboard/splits.txt b/config/GZLJ01/rels/d_a_mgameboard/splits.txt index d14a77b..ec62d2d 100644 --- a/config/GZLJ01/rels/d_a_mgameboard/splits.txt +++ b/config/GZLJ01/rels/d_a_mgameboard/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mgameboard.cpp: +d/actor/d_a_mgameboard.cpp: .text start:0x000000EC end:0x00002C98 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000F3 diff --git a/config/GZLJ01/rels/d_a_mmusic/splits.txt b/config/GZLJ01/rels/d_a_mmusic/splits.txt index 9d86e94..ca72dc6 100644 --- a/config/GZLJ01/rels/d_a_mmusic/splits.txt +++ b/config/GZLJ01/rels/d_a_mmusic/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mmusic.cpp: +d/actor/d_a_mmusic.cpp: .text start:0x00000078 end:0x000005F0 .rodata start:0x00000000 end:0x0000001C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_mo2/splits.txt b/config/GZLJ01/rels/d_a_mo2/splits.txt index 8d1b2d8..63ec737 100644 --- a/config/GZLJ01/rels/d_a_mo2/splits.txt +++ b/config/GZLJ01/rels/d_a_mo2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mo2.cpp: +d/actor/d_a_mo2.cpp: .text start:0x000000EC end:0x0000D378 .text start:0x0000D378 end:0x0000D378 .text start:0x0000D378 end:0x0000D438 diff --git a/config/GZLJ01/rels/d_a_movie_player/splits.txt b/config/GZLJ01/rels/d_a_movie_player/splits.txt index 60e3243..cf74895 100644 --- a/config/GZLJ01/rels/d_a_movie_player/splits.txt +++ b/config/GZLJ01/rels/d_a_movie_player/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000020 -d/a/d_a_movie_player.cpp: +d/actor/d_a_movie_player.cpp: .text start:0x000000EC end:0x0000698C .text start:0x0000698C end:0x00006A08 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_mozo/splits.txt b/config/GZLJ01/rels/d_a_mozo/splits.txt index 24d180c..14b828a 100644 --- a/config/GZLJ01/rels/d_a_mozo/splits.txt +++ b/config/GZLJ01/rels/d_a_mozo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mozo.cpp: +d/actor/d_a_mozo.cpp: .text start:0x000000EC end:0x000027F8 .text start:0x000027F8 end:0x00002834 .text start:0x00002834 end:0x00002834 diff --git a/config/GZLJ01/rels/d_a_msw/splits.txt b/config/GZLJ01/rels/d_a_msw/splits.txt index 1fe512c..867bb4e 100644 --- a/config/GZLJ01/rels/d_a_msw/splits.txt +++ b/config/GZLJ01/rels/d_a_msw/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_msw.cpp: +d/actor/d_a_msw.cpp: .text start:0x00000078 end:0x00001314 .rodata start:0x00000000 end:0x0000008C .data start:0x00000000 end:0x000001A8 diff --git a/config/GZLJ01/rels/d_a_mt/splits.txt b/config/GZLJ01/rels/d_a_mt/splits.txt index 1a416df..ab98305 100644 --- a/config/GZLJ01/rels/d_a_mt/splits.txt +++ b/config/GZLJ01/rels/d_a_mt/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mt.cpp: +d/actor/d_a_mt.cpp: .text start:0x000000EC end:0x00009610 .text start:0x00009610 end:0x00009610 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_mtoge/splits.txt b/config/GZLJ01/rels/d_a_mtoge/splits.txt index a2a41b4..93314ce 100644 --- a/config/GZLJ01/rels/d_a_mtoge/splits.txt +++ b/config/GZLJ01/rels/d_a_mtoge/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mtoge.cpp: +d/actor/d_a_mtoge.cpp: .text start:0x00000078 end:0x000007B0 .rodata start:0x00000000 end:0x00000044 .data start:0x00000000 end:0x00000064 diff --git a/config/GZLJ01/rels/d_a_npc_ac1/splits.txt b/config/GZLJ01/rels/d_a_npc_ac1/splits.txt index a19ec17..6b35286 100644 --- a/config/GZLJ01/rels/d_a_npc_ac1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_ac1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ac1.cpp: +d/actor/d_a_npc_ac1.cpp: .text start:0x000000EC end:0x0000328C .text start:0x0000328C end:0x000032A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_ah/splits.txt b/config/GZLJ01/rels/d_a_npc_ah/splits.txt index 36d6db2..4e15a9e 100644 --- a/config/GZLJ01/rels/d_a_npc_ah/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_ah/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_ah.cpp: +d/actor/d_a_npc_ah.cpp: .text start:0x00000078 end:0x000025EC .text start:0x000025EC end:0x0000261C .text start:0x0000261C end:0x000026E8 diff --git a/config/GZLJ01/rels/d_a_npc_aj1/splits.txt b/config/GZLJ01/rels/d_a_npc_aj1/splits.txt index 7555ca1..5c95b2d 100644 --- a/config/GZLJ01/rels/d_a_npc_aj1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_aj1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_aj1.cpp: +d/actor/d_a_npc_aj1.cpp: .text start:0x000000EC end:0x000042DC .text start:0x000042DC end:0x000042F0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_auction/splits.txt b/config/GZLJ01/rels/d_a_npc_auction/splits.txt index 366b494..bdaf6e2 100644 --- a/config/GZLJ01/rels/d_a_npc_auction/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_auction/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_auction.cpp: +d/actor/d_a_npc_auction.cpp: .text start:0x000000EC end:0x00002F1C .text start:0x00002F1C end:0x00003E70 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_ba1/splits.txt b/config/GZLJ01/rels/d_a_npc_ba1/splits.txt index 7e53545..77d8739 100644 --- a/config/GZLJ01/rels/d_a_npc_ba1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_ba1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ba1.cpp: +d/actor/d_a_npc_ba1.cpp: .text start:0x000000EC end:0x00004AB8 .text start:0x00004AB8 end:0x00004AB8 .text start:0x00004AB8 end:0x00004ACC diff --git a/config/GZLJ01/rels/d_a_npc_bj1/splits.txt b/config/GZLJ01/rels/d_a_npc_bj1/splits.txt index b2cb4f1..02b8a6d 100644 --- a/config/GZLJ01/rels/d_a_npc_bj1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_bj1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bj1.cpp: +d/actor/d_a_npc_bj1.cpp: .text start:0x000000EC end:0x000074B8 .text start:0x000074B8 end:0x000074CC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_bm1/splits.txt b/config/GZLJ01/rels/d_a_npc_bm1/splits.txt index 4a972b4..13f31fc 100644 --- a/config/GZLJ01/rels/d_a_npc_bm1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_bm1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bm1.cpp: +d/actor/d_a_npc_bm1.cpp: .text start:0x000000EC end:0x00009810 .text start:0x00009810 end:0x00009824 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_bmcon1/splits.txt b/config/GZLJ01/rels/d_a_npc_bmcon1/splits.txt index e415d3c..9eaac60 100644 --- a/config/GZLJ01/rels/d_a_npc_bmcon1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_bmcon1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bmcon1.cpp: +d/actor/d_a_npc_bmcon1.cpp: .text start:0x000000EC end:0x000040B0 .text start:0x000040B0 end:0x000040E0 .text start:0x000040E0 end:0x0000429C diff --git a/config/GZLJ01/rels/d_a_npc_bms1/splits.txt b/config/GZLJ01/rels/d_a_npc_bms1/splits.txt index c126732..7e30814 100644 --- a/config/GZLJ01/rels/d_a_npc_bms1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_bms1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bms1.cpp: +d/actor/d_a_npc_bms1.cpp: .text start:0x000000EC end:0x00004764 .text start:0x00004764 end:0x000047AC .text start:0x000047AC end:0x00004820 diff --git a/config/GZLJ01/rels/d_a_npc_bmsw/splits.txt b/config/GZLJ01/rels/d_a_npc_bmsw/splits.txt index 93ba916..c83a124 100644 --- a/config/GZLJ01/rels/d_a_npc_bmsw/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_bmsw/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bmsw.cpp: +d/actor/d_a_npc_bmsw.cpp: .text start:0x000000EC end:0x00005234 .text start:0x00005234 end:0x00005290 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_bs1/splits.txt b/config/GZLJ01/rels/d_a_npc_bs1/splits.txt index 08f4f0d..2027465 100644 --- a/config/GZLJ01/rels/d_a_npc_bs1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_bs1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bs1.cpp: +d/actor/d_a_npc_bs1.cpp: .text start:0x000000EC end:0x00005800 .text start:0x00005800 end:0x00005848 .text start:0x00005848 end:0x000058BC diff --git a/config/GZLJ01/rels/d_a_npc_btsw/splits.txt b/config/GZLJ01/rels/d_a_npc_btsw/splits.txt index 385c648..c413c45 100644 --- a/config/GZLJ01/rels/d_a_npc_btsw/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_btsw/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_btsw.cpp: +d/actor/d_a_npc_btsw.cpp: .text start:0x000000EC end:0x00004CB0 .text start:0x00004CB0 end:0x00004D0C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_btsw2/splits.txt b/config/GZLJ01/rels/d_a_npc_btsw2/splits.txt index 4ee6240..27be6e0 100644 --- a/config/GZLJ01/rels/d_a_npc_btsw2/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_btsw2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_btsw2.cpp: +d/actor/d_a_npc_btsw2.cpp: .text start:0x000000EC end:0x000022EC .text start:0x000022EC end:0x00002348 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_cb1/splits.txt b/config/GZLJ01/rels/d_a_npc_cb1/splits.txt index b75030e..9893c13 100644 --- a/config/GZLJ01/rels/d_a_npc_cb1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_cb1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_cb1.cpp: +d/actor/d_a_npc_cb1.cpp: .text start:0x000000EC end:0x00009A58 .text start:0x00009A58 end:0x00009AA0 .text start:0x00009AA0 end:0x0000A140 diff --git a/config/GZLJ01/rels/d_a_npc_co1/splits.txt b/config/GZLJ01/rels/d_a_npc_co1/splits.txt index fc33365..24b7084 100644 --- a/config/GZLJ01/rels/d_a_npc_co1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_co1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_co1.cpp: +d/actor/d_a_npc_co1.cpp: .text start:0x000000EC end:0x00003A10 .text start:0x00003A10 end:0x00003A24 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_de1/splits.txt b/config/GZLJ01/rels/d_a_npc_de1/splits.txt index 8f03615..efe7849 100644 --- a/config/GZLJ01/rels/d_a_npc_de1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_de1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_de1.cpp: +d/actor/d_a_npc_de1.cpp: .text start:0x000000EC end:0x00002F54 .text start:0x00002F54 end:0x00002F54 .text start:0x00002F54 end:0x00002F58 diff --git a/config/GZLJ01/rels/d_a_npc_ds1/splits.txt b/config/GZLJ01/rels/d_a_npc_ds1/splits.txt index 3dda44e..8ee7775 100644 --- a/config/GZLJ01/rels/d_a_npc_ds1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_ds1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ds1.cpp: +d/actor/d_a_npc_ds1.cpp: .text start:0x000000EC end:0x00005768 .text start:0x00005768 end:0x000057B0 .text start:0x000057B0 end:0x00005824 diff --git a/config/GZLJ01/rels/d_a_npc_gk1/splits.txt b/config/GZLJ01/rels/d_a_npc_gk1/splits.txt index 5302892..e274721 100644 --- a/config/GZLJ01/rels/d_a_npc_gk1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_gk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_gk1.cpp: +d/actor/d_a_npc_gk1.cpp: .text start:0x000000EC end:0x00002FF0 .text start:0x00002FF0 end:0x00003004 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_gp1/splits.txt b/config/GZLJ01/rels/d_a_npc_gp1/splits.txt index 09e3fe5..daa9d17 100644 --- a/config/GZLJ01/rels/d_a_npc_gp1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_gp1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_gp1.cpp: +d/actor/d_a_npc_gp1.cpp: .text start:0x000000EC end:0x00003BE8 .text start:0x00003BE8 end:0x00003BFC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_hi1/splits.txt b/config/GZLJ01/rels/d_a_npc_hi1/splits.txt index 387fa72..115b71b 100644 --- a/config/GZLJ01/rels/d_a_npc_hi1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_hi1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_hi1.cpp: +d/actor/d_a_npc_hi1.cpp: .text start:0x000000EC end:0x00002AB0 .text start:0x00002AB0 end:0x00002AC4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_ho/splits.txt b/config/GZLJ01/rels/d_a_npc_ho/splits.txt index eaa6c18..3651e35 100644 --- a/config/GZLJ01/rels/d_a_npc_ho/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_ho/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_ho.cpp: +d/actor/d_a_npc_ho.cpp: .text start:0x00000078 end:0x00002934 .text start:0x00002934 end:0x0000296C .rodata start:0x00000000 end:0x00000108 diff --git a/config/GZLJ01/rels/d_a_npc_hr/splits.txt b/config/GZLJ01/rels/d_a_npc_hr/splits.txt index 3b0a2c4..cd793f1 100644 --- a/config/GZLJ01/rels/d_a_npc_hr/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_hr/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_hr.cpp: +d/actor/d_a_npc_hr.cpp: .text start:0x00000078 end:0x00005F7C .text start:0x00005F7C end:0x00005F7C .text start:0x00005F7C end:0x00005FB4 diff --git a/config/GZLJ01/rels/d_a_npc_jb1/splits.txt b/config/GZLJ01/rels/d_a_npc_jb1/splits.txt index be56eb5..ab80bb0 100644 --- a/config/GZLJ01/rels/d_a_npc_jb1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_jb1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_jb1.cpp: +d/actor/d_a_npc_jb1.cpp: .text start:0x000000EC end:0x00001E38 .text start:0x00001E38 end:0x00001E4C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_ji1/splits.txt b/config/GZLJ01/rels/d_a_npc_ji1/splits.txt index 78236a0..ea60803 100644 --- a/config/GZLJ01/rels/d_a_npc_ji1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_ji1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ji1.cpp: +d/actor/d_a_npc_ji1.cpp: .text start:0x000000EC end:0x000124AC .text start:0x000124AC end:0x000124C8 .text start:0x000124C8 end:0x000124E4 diff --git a/config/GZLJ01/rels/d_a_npc_kamome/splits.txt b/config/GZLJ01/rels/d_a_npc_kamome/splits.txt index 49c725b..21e9ddb 100644 --- a/config/GZLJ01/rels/d_a_npc_kamome/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_kamome/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kamome.cpp: +d/actor/d_a_npc_kamome.cpp: .text start:0x000000EC end:0x000049A0 .text start:0x000049A0 end:0x00004A98 .text start:0x00004A98 end:0x00004C84 diff --git a/config/GZLJ01/rels/d_a_npc_kf1/splits.txt b/config/GZLJ01/rels/d_a_npc_kf1/splits.txt index a66ecd7..e6736f4 100644 --- a/config/GZLJ01/rels/d_a_npc_kf1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_kf1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kf1.cpp: +d/actor/d_a_npc_kf1.cpp: .text start:0x000000EC end:0x00004760 .text start:0x00004760 end:0x00004774 .text start:0x00004774 end:0x00004884 diff --git a/config/GZLJ01/rels/d_a_npc_kg1/splits.txt b/config/GZLJ01/rels/d_a_npc_kg1/splits.txt index 0aea378..c72f2bc 100644 --- a/config/GZLJ01/rels/d_a_npc_kg1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_kg1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kg1.cpp: +d/actor/d_a_npc_kg1.cpp: .text start:0x000000EC end:0x00002A34 .text start:0x00002A34 end:0x00002ABC .text start:0x00002ABC end:0x00002ABC diff --git a/config/GZLJ01/rels/d_a_npc_kg2/splits.txt b/config/GZLJ01/rels/d_a_npc_kg2/splits.txt index d0581aa..5c00571 100644 --- a/config/GZLJ01/rels/d_a_npc_kg2/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_kg2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kg2.cpp: +d/actor/d_a_npc_kg2.cpp: .text start:0x000000EC end:0x000031F4 .text start:0x000031F4 end:0x00003250 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_kk1/splits.txt b/config/GZLJ01/rels/d_a_npc_kk1/splits.txt index cea0e1e..2de2e16 100644 --- a/config/GZLJ01/rels/d_a_npc_kk1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_kk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kk1.cpp: +d/actor/d_a_npc_kk1.cpp: .text start:0x000000EC end:0x000068C0 .text start:0x000068C0 end:0x000068C0 .text start:0x000068C0 end:0x000068D4 diff --git a/config/GZLJ01/rels/d_a_npc_km1/splits.txt b/config/GZLJ01/rels/d_a_npc_km1/splits.txt index 66de594..36925d1 100644 --- a/config/GZLJ01/rels/d_a_npc_km1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_km1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_km1.cpp: +d/actor/d_a_npc_km1.cpp: .text start:0x000000EC end:0x0000238C .text start:0x0000238C end:0x000023A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_ko1/splits.txt b/config/GZLJ01/rels/d_a_npc_ko1/splits.txt index 5a97fb3..0149130 100644 --- a/config/GZLJ01/rels/d_a_npc_ko1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_ko1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ko1.cpp: +d/actor/d_a_npc_ko1.cpp: .text start:0x000000EC end:0x00008938 .text start:0x00008938 end:0x0000894C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_kp1/splits.txt b/config/GZLJ01/rels/d_a_npc_kp1/splits.txt index 2e42cdd..9f2230d 100644 --- a/config/GZLJ01/rels/d_a_npc_kp1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_kp1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kp1.cpp: +d/actor/d_a_npc_kp1.cpp: .text start:0x000000EC end:0x00002D5C .text start:0x00002D5C end:0x00002D70 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_ls1/splits.txt b/config/GZLJ01/rels/d_a_npc_ls1/splits.txt index 9fbe874..70545e8 100644 --- a/config/GZLJ01/rels/d_a_npc_ls1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_ls1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ls1.cpp: +d/actor/d_a_npc_ls1.cpp: .text start:0x000000EC end:0x00005880 .text start:0x00005880 end:0x00005880 .text start:0x00005880 end:0x00005894 diff --git a/config/GZLJ01/rels/d_a_npc_md/splits.txt b/config/GZLJ01/rels/d_a_npc_md/splits.txt index ba51007..32dbb86 100644 --- a/config/GZLJ01/rels/d_a_npc_md/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_md/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_md.cpp: +d/actor/d_a_npc_md.cpp: .text start:0x000000EC end:0x0001184C .text start:0x0001184C end:0x00011894 .text start:0x00011894 end:0x00011930 diff --git a/config/GZLJ01/rels/d_a_npc_mk/splits.txt b/config/GZLJ01/rels/d_a_npc_mk/splits.txt index 7dd5d63..3d4797c 100644 --- a/config/GZLJ01/rels/d_a_npc_mk/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_mk/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_mk.cpp: +d/actor/d_a_npc_mk.cpp: .text start:0x00000078 end:0x00004C38 .text start:0x00004C38 end:0x00004C70 .rodata start:0x00000000 end:0x00000227 diff --git a/config/GZLJ01/rels/d_a_npc_mn/splits.txt b/config/GZLJ01/rels/d_a_npc_mn/splits.txt index 6f33208..b1c9801 100644 --- a/config/GZLJ01/rels/d_a_npc_mn/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_mn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_mn.cpp: +d/actor/d_a_npc_mn.cpp: .text start:0x00000078 end:0x00003F9C .text start:0x00003F9C end:0x00003FCC .text start:0x00003FCC end:0x00004128 diff --git a/config/GZLJ01/rels/d_a_npc_mt/splits.txt b/config/GZLJ01/rels/d_a_npc_mt/splits.txt index d79aed9..7d3263c 100644 --- a/config/GZLJ01/rels/d_a_npc_mt/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_mt/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_mt.cpp: +d/actor/d_a_npc_mt.cpp: .text start:0x00000078 end:0x00003000 .text start:0x00003000 end:0x00003030 .text start:0x00003030 end:0x000030E0 diff --git a/config/GZLJ01/rels/d_a_npc_nz/splits.txt b/config/GZLJ01/rels/d_a_npc_nz/splits.txt index 7b1a863..b951be7 100644 --- a/config/GZLJ01/rels/d_a_npc_nz/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_nz/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_nz.cpp: +d/actor/d_a_npc_nz.cpp: .text start:0x000000EC end:0x000032BC .text start:0x000032BC end:0x00004554 .text start:0x00004554 end:0x00004554 diff --git a/config/GZLJ01/rels/d_a_npc_ob1/splits.txt b/config/GZLJ01/rels/d_a_npc_ob1/splits.txt index 93c7f00..f52a8e5 100644 --- a/config/GZLJ01/rels/d_a_npc_ob1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_ob1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ob1.cpp: +d/actor/d_a_npc_ob1.cpp: .text start:0x000000EC end:0x00003EAC .text start:0x00003EAC end:0x00003EC0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_os/splits.txt b/config/GZLJ01/rels/d_a_npc_os/splits.txt index dc56fa5..af4de04 100644 --- a/config/GZLJ01/rels/d_a_npc_os/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_os/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_os.cpp: +d/actor/d_a_npc_os.cpp: .text start:0x000000EC end:0x000074CC .text start:0x000074CC end:0x00007514 .text start:0x00007514 end:0x00007B48 diff --git a/config/GZLJ01/rels/d_a_npc_p1/splits.txt b/config/GZLJ01/rels/d_a_npc_p1/splits.txt index 9e9efbd..6f2cde8 100644 --- a/config/GZLJ01/rels/d_a_npc_p1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_p1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_p1.cpp: +d/actor/d_a_npc_p1.cpp: .text start:0x000000EC end:0x00004F14 .text start:0x00004F14 end:0x00004F30 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_p2/splits.txt b/config/GZLJ01/rels/d_a_npc_p2/splits.txt index 5cb2107..32e3b8f 100644 --- a/config/GZLJ01/rels/d_a_npc_p2/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_p2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_p2.cpp: +d/actor/d_a_npc_p2.cpp: .text start:0x000000EC end:0x000051D4 .text start:0x000051D4 end:0x00005238 .text start:0x00005238 end:0x000083FC diff --git a/config/GZLJ01/rels/d_a_npc_people/splits.txt b/config/GZLJ01/rels/d_a_npc_people/splits.txt index 0b4839f..3052534 100644 --- a/config/GZLJ01/rels/d_a_npc_people/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_people/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_people.cpp: +d/actor/d_a_npc_people.cpp: .text start:0x00000078 end:0x00009B58 .text start:0x00009B58 end:0x00009B7C .text start:0x00009B7C end:0x00009BC4 diff --git a/config/GZLJ01/rels/d_a_npc_pf1/splits.txt b/config/GZLJ01/rels/d_a_npc_pf1/splits.txt index 50f23bc..2e70056 100644 --- a/config/GZLJ01/rels/d_a_npc_pf1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_pf1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_pf1.cpp: +d/actor/d_a_npc_pf1.cpp: .text start:0x000000EC end:0x00003AE0 .text start:0x00003AE0 end:0x00003AF4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_photo/splits.txt b/config/GZLJ01/rels/d_a_npc_photo/splits.txt index d983776..5e2b47e 100644 --- a/config/GZLJ01/rels/d_a_npc_photo/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_photo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_photo.cpp: +d/actor/d_a_npc_photo.cpp: .text start:0x000000EC end:0x00004FEC .text start:0x00004FEC end:0x00005034 .text start:0x00005034 end:0x00005064 diff --git a/config/GZLJ01/rels/d_a_npc_pm1/splits.txt b/config/GZLJ01/rels/d_a_npc_pm1/splits.txt index fe31f87..874b80d 100644 --- a/config/GZLJ01/rels/d_a_npc_pm1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_pm1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_pm1.cpp: +d/actor/d_a_npc_pm1.cpp: .text start:0x000000EC end:0x0000239C .text start:0x0000239C end:0x000023B0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_roten/splits.txt b/config/GZLJ01/rels/d_a_npc_roten/splits.txt index 5e94826..cb65777 100644 --- a/config/GZLJ01/rels/d_a_npc_roten/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_roten/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_roten.cpp: +d/actor/d_a_npc_roten.cpp: .text start:0x00000078 end:0x00003F98 .text start:0x00003F98 end:0x00003FB4 .text start:0x00003FB4 end:0x000042BC diff --git a/config/GZLJ01/rels/d_a_npc_rsh1/splits.txt b/config/GZLJ01/rels/d_a_npc_rsh1/splits.txt index ee54801..5509d55 100644 --- a/config/GZLJ01/rels/d_a_npc_rsh1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_rsh1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_rsh1.cpp: +d/actor/d_a_npc_rsh1.cpp: .text start:0x000000EC end:0x00004F90 .text start:0x00004F90 end:0x00004FD8 .text start:0x00004FD8 end:0x00005010 diff --git a/config/GZLJ01/rels/d_a_npc_sarace/splits.txt b/config/GZLJ01/rels/d_a_npc_sarace/splits.txt index d5962fd..6e3b517 100644 --- a/config/GZLJ01/rels/d_a_npc_sarace/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_sarace/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_sarace.cpp: +d/actor/d_a_npc_sarace.cpp: .text start:0x000000EC end:0x00002818 .text start:0x00002818 end:0x00002874 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_so/splits.txt b/config/GZLJ01/rels/d_a_npc_so/splits.txt index 3eae01d..be402ea 100644 --- a/config/GZLJ01/rels/d_a_npc_so/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_so/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_so.cpp: +d/actor/d_a_npc_so.cpp: .text start:0x000000EC end:0x00004BCC .text start:0x00004BCC end:0x00004C14 .text start:0x00004C14 end:0x00004CD4 diff --git a/config/GZLJ01/rels/d_a_npc_sv/splits.txt b/config/GZLJ01/rels/d_a_npc_sv/splits.txt index e89782a..6b09755 100644 --- a/config/GZLJ01/rels/d_a_npc_sv/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_sv/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_sv.cpp: +d/actor/d_a_npc_sv.cpp: .text start:0x00000078 end:0x00002BFC .text start:0x00002BFC end:0x00002C18 .text start:0x00002C18 end:0x00002C48 diff --git a/config/GZLJ01/rels/d_a_npc_tc/splits.txt b/config/GZLJ01/rels/d_a_npc_tc/splits.txt index fe8ff76..ed8b361 100644 --- a/config/GZLJ01/rels/d_a_npc_tc/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_tc/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_tc.cpp: +d/actor/d_a_npc_tc.cpp: .text start:0x000000EC end:0x00004BA4 .text start:0x00004BA4 end:0x00005078 .text start:0x00005078 end:0x000053B8 diff --git a/config/GZLJ01/rels/d_a_npc_tt/splits.txt b/config/GZLJ01/rels/d_a_npc_tt/splits.txt index 2f49b20..3a06d97 100644 --- a/config/GZLJ01/rels/d_a_npc_tt/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_tt/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_tt.cpp: +d/actor/d_a_npc_tt.cpp: .text start:0x00000078 end:0x00002C60 .text start:0x00002C60 end:0x00002CD4 .text start:0x00002CD4 end:0x00003210 diff --git a/config/GZLJ01/rels/d_a_npc_uk/splits.txt b/config/GZLJ01/rels/d_a_npc_uk/splits.txt index 2037503..aad16a6 100644 --- a/config/GZLJ01/rels/d_a_npc_uk/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_uk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_uk.cpp: +d/actor/d_a_npc_uk.cpp: .text start:0x000000EC end:0x00005A0C .text start:0x00005A0C end:0x00005A44 .rodata start:0x00000000 end:0x0000026A diff --git a/config/GZLJ01/rels/d_a_npc_ym1/splits.txt b/config/GZLJ01/rels/d_a_npc_ym1/splits.txt index c83aa76..d6dc7b7 100644 --- a/config/GZLJ01/rels/d_a_npc_ym1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_ym1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ym1.cpp: +d/actor/d_a_npc_ym1.cpp: .text start:0x000000EC end:0x000048E4 .text start:0x000048E4 end:0x000048F8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_yw1/splits.txt b/config/GZLJ01/rels/d_a_npc_yw1/splits.txt index ba85811..1c3b742 100644 --- a/config/GZLJ01/rels/d_a_npc_yw1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_yw1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_yw1.cpp: +d/actor/d_a_npc_yw1.cpp: .text start:0x000000EC end:0x00003F50 .text start:0x00003F50 end:0x00003F64 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_zk1/splits.txt b/config/GZLJ01/rels/d_a_npc_zk1/splits.txt index bc2d0ea..aaaa80d 100644 --- a/config/GZLJ01/rels/d_a_npc_zk1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_zk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_zk1.cpp: +d/actor/d_a_npc_zk1.cpp: .text start:0x000000EC end:0x000029D0 .text start:0x000029D0 end:0x000029E4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_npc_zl1/splits.txt b/config/GZLJ01/rels/d_a_npc_zl1/splits.txt index 9a5a697..329d0c3 100644 --- a/config/GZLJ01/rels/d_a_npc_zl1/splits.txt +++ b/config/GZLJ01/rels/d_a_npc_zl1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_zl1.cpp: +d/actor/d_a_npc_zl1.cpp: .text start:0x000000EC end:0x00007C74 .text start:0x00007C74 end:0x00007C90 .text start:0x00007C90 end:0x00007CA4 diff --git a/config/GZLJ01/rels/d_a_nz/splits.txt b/config/GZLJ01/rels/d_a_nz/splits.txt index 20563e9..f42d88c 100644 --- a/config/GZLJ01/rels/d_a_nz/splits.txt +++ b/config/GZLJ01/rels/d_a_nz/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_nz.cpp: +d/actor/d_a_nz.cpp: .text start:0x000000EC end:0x00008E44 .text start:0x00008E44 end:0x00008E60 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_nzg/splits.txt b/config/GZLJ01/rels/d_a_nzg/splits.txt index c9f99f7..ed6d0c5 100644 --- a/config/GZLJ01/rels/d_a_nzg/splits.txt +++ b/config/GZLJ01/rels/d_a_nzg/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_nzg.cpp: +d/actor/d_a_nzg.cpp: .text start:0x00000078 end:0x00000B14 .rodata start:0x00000000 end:0x00000072 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLJ01/rels/d_a_obj_AjavW/splits.txt b/config/GZLJ01/rels/d_a_obj_AjavW/splits.txt index 62ed544..d79baf4 100644 --- a/config/GZLJ01/rels/d_a_obj_AjavW/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_AjavW/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_AjavW.cpp: +d/actor/d_a_obj_AjavW.cpp: .text start:0x00000078 end:0x00000600 .rodata start:0x00000000 end:0x00000025 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLJ01/rels/d_a_obj_Itnak/splits.txt b/config/GZLJ01/rels/d_a_obj_Itnak/splits.txt index d0bce2f..026a89f 100644 --- a/config/GZLJ01/rels/d_a_obj_Itnak/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_Itnak/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Itnak.cpp: +d/actor/d_a_obj_Itnak.cpp: .text start:0x00000078 end:0x00001448 .text start:0x00001448 end:0x0000184C .text start:0x0000184C end:0x000018B8 diff --git a/config/GZLJ01/rels/d_a_obj_Vds/splits.txt b/config/GZLJ01/rels/d_a_obj_Vds/splits.txt index 2354c0f..263aa35 100644 --- a/config/GZLJ01/rels/d_a_obj_Vds/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_Vds/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Vds.cpp: +d/actor/d_a_obj_Vds.cpp: .text start:0x00000078 end:0x0000163C .text start:0x0000163C end:0x00001720 .text start:0x00001720 end:0x0000173C diff --git a/config/GZLJ01/rels/d_a_obj_Vteng/splits.txt b/config/GZLJ01/rels/d_a_obj_Vteng/splits.txt index 27a6c37..1871d8e 100644 --- a/config/GZLJ01/rels/d_a_obj_Vteng/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_Vteng/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Vteng.cpp: +d/actor/d_a_obj_Vteng.cpp: .text start:0x00000078 end:0x0000060C .rodata start:0x00000000 end:0x0000002B .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_YLzou/splits.txt b/config/GZLJ01/rels/d_a_obj_YLzou/splits.txt index 959c35c..c4b47f4 100644 --- a/config/GZLJ01/rels/d_a_obj_YLzou/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_YLzou/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_YLzou.cpp: +d/actor/d_a_obj_YLzou.cpp: .text start:0x000000EC end:0x0000197C .text start:0x0000197C end:0x00001A48 .text start:0x00001A48 end:0x00001A64 diff --git a/config/GZLJ01/rels/d_a_obj_Yboil/splits.txt b/config/GZLJ01/rels/d_a_obj_Yboil/splits.txt index ac082ea..d60cbf5 100644 --- a/config/GZLJ01/rels/d_a_obj_Yboil/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_Yboil/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Yboil.cpp: +d/actor/d_a_obj_Yboil.cpp: .text start:0x00000078 end:0x00000DFC .text start:0x00000DFC end:0x00000E18 .rodata start:0x00000000 end:0x0000007F diff --git a/config/GZLJ01/rels/d_a_obj_Ygush00/splits.txt b/config/GZLJ01/rels/d_a_obj_Ygush00/splits.txt index c47dd80..f5a2f9c 100644 --- a/config/GZLJ01/rels/d_a_obj_Ygush00/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_Ygush00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Ygush00.cpp: +d/actor/d_a_obj_Ygush00.cpp: .text start:0x00000078 end:0x00000790 .text start:0x00000790 end:0x000007AC .rodata start:0x00000000 end:0x0000003B diff --git a/config/GZLJ01/rels/d_a_obj_adnno/splits.txt b/config/GZLJ01/rels/d_a_obj_adnno/splits.txt index 7269693..7e593ff 100644 --- a/config/GZLJ01/rels/d_a_obj_adnno/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_adnno/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_adnno.cpp: +d/actor/d_a_obj_adnno.cpp: .text start:0x00000078 end:0x00000524 .rodata start:0x00000000 end:0x000000B4 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_ajav/splits.txt b/config/GZLJ01/rels/d_a_obj_ajav/splits.txt index 57e20c1..be8bdb0 100644 --- a/config/GZLJ01/rels/d_a_obj_ajav/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ajav/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ajav.cpp: +d/actor/d_a_obj_ajav.cpp: .text start:0x000000EC end:0x00003564 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000001C1 diff --git a/config/GZLJ01/rels/d_a_obj_akabe/splits.txt b/config/GZLJ01/rels/d_a_obj_akabe/splits.txt index 30de780..e7012b1 100644 --- a/config/GZLJ01/rels/d_a_obj_akabe/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_akabe/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_akabe.cpp: +d/actor/d_a_obj_akabe.cpp: .text start:0x00000078 end:0x00000680 .text start:0x00000680 end:0x0000069C .rodata start:0x00000000 end:0x0000007E diff --git a/config/GZLJ01/rels/d_a_obj_apzl/splits.txt b/config/GZLJ01/rels/d_a_obj_apzl/splits.txt index 1940dc7..63299c9 100644 --- a/config/GZLJ01/rels/d_a_obj_apzl/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_apzl/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_apzl.cpp: +d/actor/d_a_obj_apzl.cpp: .text start:0x00000078 end:0x00001E7C .rodata start:0x00000000 end:0x0000052B .data start:0x00000000 end:0x000000F8 diff --git a/config/GZLJ01/rels/d_a_obj_ashut/splits.txt b/config/GZLJ01/rels/d_a_obj_ashut/splits.txt index 13b26a6..7be5e4b 100644 --- a/config/GZLJ01/rels/d_a_obj_ashut/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ashut/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ashut.cpp: +d/actor/d_a_obj_ashut.cpp: .text start:0x00000078 end:0x00000E24 .text start:0x00000E24 end:0x00000E64 .text start:0x00000E64 end:0x00000E80 diff --git a/config/GZLJ01/rels/d_a_obj_auzu/splits.txt b/config/GZLJ01/rels/d_a_obj_auzu/splits.txt index 463f62d..c324d0c 100644 --- a/config/GZLJ01/rels/d_a_obj_auzu/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_auzu/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_auzu.cpp: +d/actor/d_a_obj_auzu.cpp: .text start:0x00000078 end:0x00000CC0 .text start:0x00000CC0 end:0x00000CDC .rodata start:0x00000000 end:0x0000008E diff --git a/config/GZLJ01/rels/d_a_obj_aygr/splits.txt b/config/GZLJ01/rels/d_a_obj_aygr/splits.txt index 5837805..e93d469 100644 --- a/config/GZLJ01/rels/d_a_obj_aygr/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_aygr/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_aygr.cpp: +d/actor/d_a_obj_aygr.cpp: .text start:0x00000078 end:0x00000854 .text start:0x00000854 end:0x0000086C .text start:0x0000086C end:0x00000888 diff --git a/config/GZLJ01/rels/d_a_obj_balancelift/splits.txt b/config/GZLJ01/rels/d_a_obj_balancelift/splits.txt index e460e58..09d8380 100644 --- a/config/GZLJ01/rels/d_a_obj_balancelift/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_balancelift/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_balancelift.cpp: +d/actor/d_a_obj_balancelift.cpp: .text start:0x000000EC end:0x000018F8 .text start:0x000018F8 end:0x000018F8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_barrel/splits.txt b/config/GZLJ01/rels/d_a_obj_barrel/splits.txt index a052d30..5146a35 100644 --- a/config/GZLJ01/rels/d_a_obj_barrel/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_barrel/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_barrel.cpp: +d/actor/d_a_obj_barrel.cpp: .text start:0x00000078 end:0x000026C4 .text start:0x000026C4 end:0x00002700 .rodata start:0x00000000 end:0x000001A9 diff --git a/config/GZLJ01/rels/d_a_obj_barrel2/splits.txt b/config/GZLJ01/rels/d_a_obj_barrel2/splits.txt index 440802e..ab9f3ce 100644 --- a/config/GZLJ01/rels/d_a_obj_barrel2/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_barrel2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_barrel2.cpp: +d/actor/d_a_obj_barrel2.cpp: .text start:0x000000EC end:0x000034C8 .text start:0x000034C8 end:0x0000352C .rodata start:0x00000000 end:0x00000305 diff --git a/config/GZLJ01/rels/d_a_obj_barrier/splits.txt b/config/GZLJ01/rels/d_a_obj_barrier/splits.txt index 034dea3..6b1f310 100644 --- a/config/GZLJ01/rels/d_a_obj_barrier/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_barrier/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_barrier.cpp: +d/actor/d_a_obj_barrier.cpp: .text start:0x000000EC end:0x00001C28 .text start:0x00001C28 end:0x00001FBC .text start:0x00001FBC end:0x00002030 diff --git a/config/GZLJ01/rels/d_a_obj_bemos/splits.txt b/config/GZLJ01/rels/d_a_obj_bemos/splits.txt index f34123d..6e9f532 100644 --- a/config/GZLJ01/rels/d_a_obj_bemos/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_bemos/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_bemos.cpp: +d/actor/d_a_obj_bemos.cpp: .text start:0x000000EC end:0x000050D8 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000120 diff --git a/config/GZLJ01/rels/d_a_obj_bscurtain/splits.txt b/config/GZLJ01/rels/d_a_obj_bscurtain/splits.txt index 7f0caa2..48c9a23 100644 --- a/config/GZLJ01/rels/d_a_obj_bscurtain/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_bscurtain/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_bscurtain.cpp: +d/actor/d_a_obj_bscurtain.cpp: .text start:0x000000EC end:0x00000584 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000032 diff --git a/config/GZLJ01/rels/d_a_obj_buoyflag/splits.txt b/config/GZLJ01/rels/d_a_obj_buoyflag/splits.txt index 6a8d853..05dfc20 100644 --- a/config/GZLJ01/rels/d_a_obj_buoyflag/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_buoyflag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_buoyflag.cpp: +d/actor/d_a_obj_buoyflag.cpp: .text start:0x000000EC end:0x00002C74 .text start:0x00002C74 end:0x0000304C .text start:0x0000304C end:0x00003108 diff --git a/config/GZLJ01/rels/d_a_obj_buoyrace/splits.txt b/config/GZLJ01/rels/d_a_obj_buoyrace/splits.txt index bce9ddb..8c797b2 100644 --- a/config/GZLJ01/rels/d_a_obj_buoyrace/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_buoyrace/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_buoyrace.cpp: +d/actor/d_a_obj_buoyrace.cpp: .text start:0x00000078 end:0x00000BBC .text start:0x00000BBC end:0x00000BD8 .rodata start:0x00000000 end:0x000000EA diff --git a/config/GZLJ01/rels/d_a_obj_cafelmp/splits.txt b/config/GZLJ01/rels/d_a_obj_cafelmp/splits.txt index 07f79dc..fd1ebe2 100644 --- a/config/GZLJ01/rels/d_a_obj_cafelmp/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_cafelmp/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_cafelmp.cpp: +d/actor/d_a_obj_cafelmp.cpp: .text start:0x00000078 end:0x000003F8 .rodata start:0x00000000 end:0x00000044 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_canon/splits.txt b/config/GZLJ01/rels/d_a_obj_canon/splits.txt index 8b883f7..638a00a 100644 --- a/config/GZLJ01/rels/d_a_obj_canon/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_canon/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_canon.cpp: +d/actor/d_a_obj_canon.cpp: .text start:0x000000EC end:0x00001F90 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000140 diff --git a/config/GZLJ01/rels/d_a_obj_coming/splits.txt b/config/GZLJ01/rels/d_a_obj_coming/splits.txt index 5d72ede..9496612 100644 --- a/config/GZLJ01/rels/d_a_obj_coming/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_coming/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_coming.cpp: +d/actor/d_a_obj_coming.cpp: .text start:0x000000EC end:0x000016D8 .text start:0x000016D8 end:0x0000205C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_correct/splits.txt b/config/GZLJ01/rels/d_a_obj_correct/splits.txt index 8c7f277..5279c6a 100644 --- a/config/GZLJ01/rels/d_a_obj_correct/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_correct/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_correct.cpp: +d/actor/d_a_obj_correct.cpp: .text start:0x00000078 end:0x00000E50 .text start:0x00000E50 end:0x00000E50 .text start:0x00000E50 end:0x00000EA4 diff --git a/config/GZLJ01/rels/d_a_obj_demo_barrel/splits.txt b/config/GZLJ01/rels/d_a_obj_demo_barrel/splits.txt index 60cc0c5..497d0f9 100644 --- a/config/GZLJ01/rels/d_a_obj_demo_barrel/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_demo_barrel/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_demo_barrel.cpp: +d/actor/d_a_obj_demo_barrel.cpp: .text start:0x00000078 end:0x0000081C .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_dmgroom/splits.txt b/config/GZLJ01/rels/d_a_obj_dmgroom/splits.txt index 3803eba..b2bf856 100644 --- a/config/GZLJ01/rels/d_a_obj_dmgroom/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_dmgroom/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_dmgroom.cpp: +d/actor/d_a_obj_dmgroom.cpp: .text start:0x00000078 end:0x000005D4 .rodata start:0x00000000 end:0x0000004D .data start:0x00000000 end:0x00000068 diff --git a/config/GZLJ01/rels/d_a_obj_doguu/splits.txt b/config/GZLJ01/rels/d_a_obj_doguu/splits.txt index a03f9c8..5e9944f 100644 --- a/config/GZLJ01/rels/d_a_obj_doguu/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_doguu/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_doguu.cpp: +d/actor/d_a_obj_doguu.cpp: .text start:0x00000078 end:0x0000289C .text start:0x0000289C end:0x0000289C .text start:0x0000289C end:0x000028D0 diff --git a/config/GZLJ01/rels/d_a_obj_doguu_demo/splits.txt b/config/GZLJ01/rels/d_a_obj_doguu_demo/splits.txt index e79911a..da3707f 100644 --- a/config/GZLJ01/rels/d_a_obj_doguu_demo/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_doguu_demo/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_doguu_demo.cpp: +d/actor/d_a_obj_doguu_demo.cpp: .text start:0x00000078 end:0x00000540 .rodata start:0x00000000 end:0x00000042 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_dragonhead/splits.txt b/config/GZLJ01/rels/d_a_obj_dragonhead/splits.txt index 044ee83..ba0be19 100644 --- a/config/GZLJ01/rels/d_a_obj_dragonhead/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_dragonhead/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_dragonhead.cpp: +d/actor/d_a_obj_dragonhead.cpp: .text start:0x00000078 end:0x00000B48 .rodata start:0x00000000 end:0x00000046 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLJ01/rels/d_a_obj_drift/splits.txt b/config/GZLJ01/rels/d_a_obj_drift/splits.txt index 5fd7581..5a373aa 100644 --- a/config/GZLJ01/rels/d_a_obj_drift/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_drift/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_drift.cpp: +d/actor/d_a_obj_drift.cpp: .text start:0x000000EC end:0x00001324 .text start:0x00001324 end:0x00001498 .text start:0x00001498 end:0x000014C4 diff --git a/config/GZLJ01/rels/d_a_obj_eayogn/splits.txt b/config/GZLJ01/rels/d_a_obj_eayogn/splits.txt index 6da8846..29eaf65 100644 --- a/config/GZLJ01/rels/d_a_obj_eayogn/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_eayogn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_eayogn.cpp: +d/actor/d_a_obj_eayogn.cpp: .text start:0x00000078 end:0x00000524 .rodata start:0x00000000 end:0x00000046 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_ebomzo/splits.txt b/config/GZLJ01/rels/d_a_obj_ebomzo/splits.txt index 4111113..935b8e9 100644 --- a/config/GZLJ01/rels/d_a_obj_ebomzo/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ebomzo/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ebomzo.cpp: +d/actor/d_a_obj_ebomzo.cpp: .text start:0x00000078 end:0x00000C50 .text start:0x00000C50 end:0x00000D54 .text start:0x00000D54 end:0x00000D80 diff --git a/config/GZLJ01/rels/d_a_obj_eff/splits.txt b/config/GZLJ01/rels/d_a_obj_eff/splits.txt index ea72a6d..fe53fce 100644 --- a/config/GZLJ01/rels/d_a_obj_eff/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_eff/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_eff.cpp: +d/actor/d_a_obj_eff.cpp: .text start:0x000000EC end:0x00001538 .text start:0x00001538 end:0x00001934 .text start:0x00001934 end:0x00001950 diff --git a/config/GZLJ01/rels/d_a_obj_ekskz/splits.txt b/config/GZLJ01/rels/d_a_obj_ekskz/splits.txt index d6dbdc8..fc6f609 100644 --- a/config/GZLJ01/rels/d_a_obj_ekskz/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ekskz/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ekskz.cpp: +d/actor/d_a_obj_ekskz.cpp: .text start:0x00000078 end:0x000011D8 .text start:0x000011D8 end:0x00001390 .text start:0x00001390 end:0x000013BC diff --git a/config/GZLJ01/rels/d_a_obj_eskban/splits.txt b/config/GZLJ01/rels/d_a_obj_eskban/splits.txt index a9c6c4b..51a48d5 100644 --- a/config/GZLJ01/rels/d_a_obj_eskban/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_eskban/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_eskban.cpp: +d/actor/d_a_obj_eskban.cpp: .text start:0x000000EC end:0x00001560 .text start:0x00001560 end:0x0000178C .text start:0x0000178C end:0x000017C8 diff --git a/config/GZLJ01/rels/d_a_obj_ferris/splits.txt b/config/GZLJ01/rels/d_a_obj_ferris/splits.txt index 809e4be..6345d18 100644 --- a/config/GZLJ01/rels/d_a_obj_ferris/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ferris/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ferris.cpp: +d/actor/d_a_obj_ferris.cpp: .text start:0x000000EC end:0x00002098 .text start:0x00002098 end:0x000020D4 .rodata start:0x00000000 end:0x000001F5 diff --git a/config/GZLJ01/rels/d_a_obj_figure/splits.txt b/config/GZLJ01/rels/d_a_obj_figure/splits.txt index d242e5e..0fec6f8 100644 --- a/config/GZLJ01/rels/d_a_obj_figure/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_figure/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_figure.cpp: +d/actor/d_a_obj_figure.cpp: .text start:0x000000EC end:0x00002348 .text start:0x00002348 end:0x000023A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_firewall/splits.txt b/config/GZLJ01/rels/d_a_obj_firewall/splits.txt index 33fb557..c61b212 100644 --- a/config/GZLJ01/rels/d_a_obj_firewall/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_firewall/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_firewall.cpp: +d/actor/d_a_obj_firewall.cpp: .text start:0x00000078 end:0x00001E9C .text start:0x00001E9C end:0x00001EF4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_flame/splits.txt b/config/GZLJ01/rels/d_a_obj_flame/splits.txt index 643454b..8d7f3fa 100644 --- a/config/GZLJ01/rels/d_a_obj_flame/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_flame/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_flame.cpp: +d/actor/d_a_obj_flame.cpp: .text start:0x00000078 end:0x0000298C .text start:0x0000298C end:0x000029B8 .rodata start:0x00000000 end:0x0000028B diff --git a/config/GZLJ01/rels/d_a_obj_ftree/splits.txt b/config/GZLJ01/rels/d_a_obj_ftree/splits.txt index c91024a..eee5214 100644 --- a/config/GZLJ01/rels/d_a_obj_ftree/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ftree/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ftree.cpp: +d/actor/d_a_obj_ftree.cpp: .text start:0x00000078 end:0x00004758 .text start:0x00004758 end:0x00004758 .text start:0x00004758 end:0x00004AA4 diff --git a/config/GZLJ01/rels/d_a_obj_ganonbed/splits.txt b/config/GZLJ01/rels/d_a_obj_ganonbed/splits.txt index 65240d5..7e3aa32 100644 --- a/config/GZLJ01/rels/d_a_obj_ganonbed/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ganonbed/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ganonbed.cpp: +d/actor/d_a_obj_ganonbed.cpp: .text start:0x00000078 end:0x000004D8 .rodata start:0x00000000 end:0x00000024 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_gaship/splits.txt b/config/GZLJ01/rels/d_a_obj_gaship/splits.txt index 4c382a4..04ad4a9 100644 --- a/config/GZLJ01/rels/d_a_obj_gaship/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_gaship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_gaship.cpp: +d/actor/d_a_obj_gaship.cpp: .text start:0x000000EC end:0x00000700 .text start:0x00000700 end:0x00000760 .rodata start:0x00000000 end:0x00000046 diff --git a/config/GZLJ01/rels/d_a_obj_gaship2/splits.txt b/config/GZLJ01/rels/d_a_obj_gaship2/splits.txt index c68c789..d1fa201 100644 --- a/config/GZLJ01/rels/d_a_obj_gaship2/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_gaship2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gaship2.cpp: +d/actor/d_a_obj_gaship2.cpp: .text start:0x00000078 end:0x0000059C .text start:0x0000059C end:0x000005FC .rodata start:0x00000000 end:0x0000003D diff --git a/config/GZLJ01/rels/d_a_obj_gnnbtltaki/splits.txt b/config/GZLJ01/rels/d_a_obj_gnnbtltaki/splits.txt index 7b821c4..464a975 100644 --- a/config/GZLJ01/rels/d_a_obj_gnnbtltaki/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_gnnbtltaki/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gnnbtltaki.cpp: +d/actor/d_a_obj_gnnbtltaki.cpp: .text start:0x00000078 end:0x00000660 .rodata start:0x00000000 end:0x00000068 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLJ01/rels/d_a_obj_gnndemotakie/splits.txt b/config/GZLJ01/rels/d_a_obj_gnndemotakie/splits.txt index 820f1a6..4f06466 100644 --- a/config/GZLJ01/rels/d_a_obj_gnndemotakie/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_gnndemotakie/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gnndemotakie.cpp: +d/actor/d_a_obj_gnndemotakie.cpp: .text start:0x00000078 end:0x00000528 .rodata start:0x00000000 end:0x0000005A .data start:0x00000000 end:0x00000068 diff --git a/config/GZLJ01/rels/d_a_obj_gnndemotakis/splits.txt b/config/GZLJ01/rels/d_a_obj_gnndemotakis/splits.txt index dd10c35..ee01fde 100644 --- a/config/GZLJ01/rels/d_a_obj_gnndemotakis/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_gnndemotakis/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gnndemotakis.cpp: +d/actor/d_a_obj_gnndemotakis.cpp: .text start:0x00000078 end:0x00000620 .rodata start:0x00000000 end:0x0000006A .data start:0x00000000 end:0x00000068 diff --git a/config/GZLJ01/rels/d_a_obj_gong/splits.txt b/config/GZLJ01/rels/d_a_obj_gong/splits.txt index 94350c4..b5ba6b9 100644 --- a/config/GZLJ01/rels/d_a_obj_gong/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_gong/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gong.cpp: +d/actor/d_a_obj_gong.cpp: .text start:0x00000078 end:0x00000614 .rodata start:0x00000000 end:0x000000A6 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_gryw00/splits.txt b/config/GZLJ01/rels/d_a_obj_gryw00/splits.txt index 7f42da2..f59bcb3 100644 --- a/config/GZLJ01/rels/d_a_obj_gryw00/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_gryw00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gryw00.cpp: +d/actor/d_a_obj_gryw00.cpp: .text start:0x00000078 end:0x00000F84 .text start:0x00000F84 end:0x00000F9C .text start:0x00000F9C end:0x00000FB8 diff --git a/config/GZLJ01/rels/d_a_obj_gtaki/splits.txt b/config/GZLJ01/rels/d_a_obj_gtaki/splits.txt index fe2e271..e4728eb 100644 --- a/config/GZLJ01/rels/d_a_obj_gtaki/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_gtaki/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gtaki.cpp: +d/actor/d_a_obj_gtaki.cpp: .text start:0x00000078 end:0x00000D68 .rodata start:0x00000000 end:0x00000073 .data start:0x00000000 end:0x000001A0 diff --git a/config/GZLJ01/rels/d_a_obj_hami2/splits.txt b/config/GZLJ01/rels/d_a_obj_hami2/splits.txt index e7b9d4c..524dbf3 100644 --- a/config/GZLJ01/rels/d_a_obj_hami2/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hami2/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hami2.cpp: +d/actor/d_a_obj_hami2.cpp: .text start:0x00000078 end:0x00000C10 .text start:0x00000C10 end:0x00000C28 .text start:0x00000C28 end:0x00000C44 diff --git a/config/GZLJ01/rels/d_a_obj_hami3/splits.txt b/config/GZLJ01/rels/d_a_obj_hami3/splits.txt index ad44b11..b5ecf6e 100644 --- a/config/GZLJ01/rels/d_a_obj_hami3/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hami3/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hami3.cpp: +d/actor/d_a_obj_hami3.cpp: .text start:0x00000078 end:0x00000B4C .text start:0x00000B4C end:0x00000B64 .text start:0x00000B64 end:0x00000B80 diff --git a/config/GZLJ01/rels/d_a_obj_hami4/splits.txt b/config/GZLJ01/rels/d_a_obj_hami4/splits.txt index 83bc34d..15de4e3 100644 --- a/config/GZLJ01/rels/d_a_obj_hami4/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hami4/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hami4.cpp: +d/actor/d_a_obj_hami4.cpp: .text start:0x00000078 end:0x00000A60 .text start:0x00000A60 end:0x00000A7C .rodata start:0x00000000 end:0x00000062 diff --git a/config/GZLJ01/rels/d_a_obj_hat/splits.txt b/config/GZLJ01/rels/d_a_obj_hat/splits.txt index f9a813d..43d1109 100644 --- a/config/GZLJ01/rels/d_a_obj_hat/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hat/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hat.cpp: +d/actor/d_a_obj_hat.cpp: .text start:0x00000078 end:0x00000B90 .text start:0x00000B90 end:0x00000BAC .text start:0x00000BAC end:0x00000C14 diff --git a/config/GZLJ01/rels/d_a_obj_hbrf1/splits.txt b/config/GZLJ01/rels/d_a_obj_hbrf1/splits.txt index fe74f8d..c7ca024 100644 --- a/config/GZLJ01/rels/d_a_obj_hbrf1/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hbrf1/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hbrf1.cpp: +d/actor/d_a_obj_hbrf1.cpp: .text start:0x00000078 end:0x00000D74 .text start:0x00000D74 end:0x00000D8C .text start:0x00000D8C end:0x00000DA8 diff --git a/config/GZLJ01/rels/d_a_obj_hcbh/splits.txt b/config/GZLJ01/rels/d_a_obj_hcbh/splits.txt index fd42579..39ad6d1 100644 --- a/config/GZLJ01/rels/d_a_obj_hcbh/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hcbh/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hcbh.cpp: +d/actor/d_a_obj_hcbh.cpp: .text start:0x00000078 end:0x00001BB0 .text start:0x00001BB0 end:0x00001BFC .rodata start:0x00000000 end:0x00000130 diff --git a/config/GZLJ01/rels/d_a_obj_hfuck1/splits.txt b/config/GZLJ01/rels/d_a_obj_hfuck1/splits.txt index 3efc5ea..f9feedd 100644 --- a/config/GZLJ01/rels/d_a_obj_hfuck1/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hfuck1/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hfuck1.cpp: +d/actor/d_a_obj_hfuck1.cpp: .text start:0x00000078 end:0x000009B8 .text start:0x000009B8 end:0x000009B8 .rodata start:0x00000000 end:0x0000007A diff --git a/config/GZLJ01/rels/d_a_obj_hha/splits.txt b/config/GZLJ01/rels/d_a_obj_hha/splits.txt index 9b9f3d1..82e54a9 100644 --- a/config/GZLJ01/rels/d_a_obj_hha/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hha/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hha.cpp: +d/actor/d_a_obj_hha.cpp: .text start:0x00000078 end:0x00003064 .text start:0x00003064 end:0x000030D4 .rodata start:0x00000000 end:0x000001B0 diff --git a/config/GZLJ01/rels/d_a_obj_hlift/splits.txt b/config/GZLJ01/rels/d_a_obj_hlift/splits.txt index 5856514..160f2e3 100644 --- a/config/GZLJ01/rels/d_a_obj_hlift/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hlift/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hlift.cpp: +d/actor/d_a_obj_hlift.cpp: .text start:0x00000078 end:0x00001148 .text start:0x00001148 end:0x00001188 .text start:0x00001188 end:0x000011A4 diff --git a/config/GZLJ01/rels/d_a_obj_hole/splits.txt b/config/GZLJ01/rels/d_a_obj_hole/splits.txt index f38d632..33422d5 100644 --- a/config/GZLJ01/rels/d_a_obj_hole/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hole/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_hole.cpp: +d/actor/d_a_obj_hole.cpp: .text start:0x000000EC end:0x00001468 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000077 diff --git a/config/GZLJ01/rels/d_a_obj_homen/splits.txt b/config/GZLJ01/rels/d_a_obj_homen/splits.txt index 4a3f10d..645b184 100644 --- a/config/GZLJ01/rels/d_a_obj_homen/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_homen/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_homen.cpp: +d/actor/d_a_obj_homen.cpp: .text start:0x000000EC end:0x00002C04 .text start:0x00002C04 end:0x00002C04 .text start:0x00002C04 end:0x00002E80 diff --git a/config/GZLJ01/rels/d_a_obj_homensmoke/splits.txt b/config/GZLJ01/rels/d_a_obj_homensmoke/splits.txt index 2ecc2b5..faaff2e 100644 --- a/config/GZLJ01/rels/d_a_obj_homensmoke/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_homensmoke/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_homensmoke.cpp: +d/actor/d_a_obj_homensmoke.cpp: .text start:0x000000EC end:0x00000888 .text start:0x00000888 end:0x0000093C .text start:0x0000093C end:0x00000958 diff --git a/config/GZLJ01/rels/d_a_obj_hsehi1/splits.txt b/config/GZLJ01/rels/d_a_obj_hsehi1/splits.txt index 7998a20..5277bfc 100644 --- a/config/GZLJ01/rels/d_a_obj_hsehi1/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_hsehi1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_hsehi1.cpp: +d/actor/d_a_obj_hsehi1.cpp: .text start:0x000000EC end:0x000024D4 .text start:0x000024D4 end:0x000024D4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_htetu1/splits.txt b/config/GZLJ01/rels/d_a_obj_htetu1/splits.txt index 7819263..ea4efbd 100644 --- a/config/GZLJ01/rels/d_a_obj_htetu1/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_htetu1/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_htetu1.cpp: +d/actor/d_a_obj_htetu1.cpp: .text start:0x00000078 end:0x00001528 .rodata start:0x00000000 end:0x00000082 .data start:0x00000000 end:0x00000140 diff --git a/config/GZLJ01/rels/d_a_obj_ice/splits.txt b/config/GZLJ01/rels/d_a_obj_ice/splits.txt index 494073f..49aa2e0 100644 --- a/config/GZLJ01/rels/d_a_obj_ice/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ice/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ice.cpp: +d/actor/d_a_obj_ice.cpp: .text start:0x00000078 end:0x0000151C .text start:0x0000151C end:0x00001548 .rodata start:0x00000000 end:0x000000C3 diff --git a/config/GZLJ01/rels/d_a_obj_iceisland/splits.txt b/config/GZLJ01/rels/d_a_obj_iceisland/splits.txt index d1f7adc..7f3c0b1 100644 --- a/config/GZLJ01/rels/d_a_obj_iceisland/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_iceisland/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_iceisland.cpp: +d/actor/d_a_obj_iceisland.cpp: .text start:0x00000078 end:0x00000EC8 .rodata start:0x00000000 end:0x00000076 .data start:0x00000000 end:0x00000094 diff --git a/config/GZLJ01/rels/d_a_obj_ikada/splits.txt b/config/GZLJ01/rels/d_a_obj_ikada/splits.txt index 9cec548..581fe3e 100644 --- a/config/GZLJ01/rels/d_a_obj_ikada/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ikada/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ikada.cpp: +d/actor/d_a_obj_ikada.cpp: .text start:0x000000EC end:0x00005840 .text start:0x00005840 end:0x0000585C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_jump/splits.txt b/config/GZLJ01/rels/d_a_obj_jump/splits.txt index 1288aaf..9bebb88 100644 --- a/config/GZLJ01/rels/d_a_obj_jump/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_jump/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_jump.cpp: +d/actor/d_a_obj_jump.cpp: .text start:0x00000078 end:0x0000164C .text start:0x0000164C end:0x000016D4 .text start:0x000016D4 end:0x00001730 diff --git a/config/GZLJ01/rels/d_a_obj_kanat/splits.txt b/config/GZLJ01/rels/d_a_obj_kanat/splits.txt index 2a2eff9..87d03f6 100644 --- a/config/GZLJ01/rels/d_a_obj_kanat/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_kanat/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_kanat.cpp: +d/actor/d_a_obj_kanat.cpp: .text start:0x00000078 end:0x000006FC .text start:0x000006FC end:0x00000714 .text start:0x00000714 end:0x00000730 diff --git a/config/GZLJ01/rels/d_a_obj_kanoke/splits.txt b/config/GZLJ01/rels/d_a_obj_kanoke/splits.txt index edad41b..d1e9b20 100644 --- a/config/GZLJ01/rels/d_a_obj_kanoke/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_kanoke/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_kanoke.cpp: +d/actor/d_a_obj_kanoke.cpp: .text start:0x000000EC end:0x000020A8 .text start:0x000020A8 end:0x0000236C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_ladder/splits.txt b/config/GZLJ01/rels/d_a_obj_ladder/splits.txt index 141baf6..0011b34 100644 --- a/config/GZLJ01/rels/d_a_obj_ladder/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ladder/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ladder.cpp: +d/actor/d_a_obj_ladder.cpp: .text start:0x00000078 end:0x000011F8 .text start:0x000011F8 end:0x00001280 .text start:0x00001280 end:0x000012DC diff --git a/config/GZLJ01/rels/d_a_obj_leaves/splits.txt b/config/GZLJ01/rels/d_a_obj_leaves/splits.txt index fa595a2..1b8382b 100644 --- a/config/GZLJ01/rels/d_a_obj_leaves/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_leaves/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_leaves.cpp: +d/actor/d_a_obj_leaves.cpp: .text start:0x00000078 end:0x000016F4 .text start:0x000016F4 end:0x00001730 .rodata start:0x00000000 end:0x000000DE diff --git a/config/GZLJ01/rels/d_a_obj_light/splits.txt b/config/GZLJ01/rels/d_a_obj_light/splits.txt index 0120c3a..e769b6b 100644 --- a/config/GZLJ01/rels/d_a_obj_light/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_light/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_light.cpp: +d/actor/d_a_obj_light.cpp: .text start:0x000000EC end:0x000016B4 .rodata start:0x00000000 end:0x000000F2 .data start:0x00000000 end:0x00000144 diff --git a/config/GZLJ01/rels/d_a_obj_lpalm/splits.txt b/config/GZLJ01/rels/d_a_obj_lpalm/splits.txt index 5e55d4a..966a63a 100644 --- a/config/GZLJ01/rels/d_a_obj_lpalm/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_lpalm/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_lpalm.cpp: +d/actor/d_a_obj_lpalm.cpp: .text start:0x00000078 end:0x00000958 .rodata start:0x00000000 end:0x00000068 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_magmarock/splits.txt b/config/GZLJ01/rels/d_a_obj_magmarock/splits.txt index 634b416..21fa452 100644 --- a/config/GZLJ01/rels/d_a_obj_magmarock/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_magmarock/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_magmarock.cpp: +d/actor/d_a_obj_magmarock.cpp: .text start:0x00000078 end:0x00002130 .rodata start:0x00000000 end:0x00000106 .data start:0x00000000 end:0x0000013C diff --git a/config/GZLJ01/rels/d_a_obj_majyuu_door/splits.txt b/config/GZLJ01/rels/d_a_obj_majyuu_door/splits.txt index b2e940f..24910c6 100644 --- a/config/GZLJ01/rels/d_a_obj_majyuu_door/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_majyuu_door/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_majyuu_door.cpp: +d/actor/d_a_obj_majyuu_door.cpp: .text start:0x000000EC end:0x0000116C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000078 diff --git a/config/GZLJ01/rels/d_a_obj_mkie/splits.txt b/config/GZLJ01/rels/d_a_obj_mkie/splits.txt index 398689a..11db66f 100644 --- a/config/GZLJ01/rels/d_a_obj_mkie/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_mkie/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mkie.cpp: +d/actor/d_a_obj_mkie.cpp: .text start:0x00000078 end:0x00001668 .text start:0x00001668 end:0x000017E4 .text start:0x000017E4 end:0x00001810 diff --git a/config/GZLJ01/rels/d_a_obj_mkiek/splits.txt b/config/GZLJ01/rels/d_a_obj_mkiek/splits.txt index 5f8b3df..e7d9974 100644 --- a/config/GZLJ01/rels/d_a_obj_mkiek/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_mkiek/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mkiek.cpp: +d/actor/d_a_obj_mkiek.cpp: .text start:0x00000078 end:0x00000ED0 .text start:0x00000ED0 end:0x00000FD4 .text start:0x00000FD4 end:0x00001000 diff --git a/config/GZLJ01/rels/d_a_obj_mknjd/splits.txt b/config/GZLJ01/rels/d_a_obj_mknjd/splits.txt index e8004ad..be694d8 100644 --- a/config/GZLJ01/rels/d_a_obj_mknjd/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_mknjd/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mknjd.cpp: +d/actor/d_a_obj_mknjd.cpp: .text start:0x00000078 end:0x000024A8 .text start:0x000024A8 end:0x000024A8 .text start:0x000024A8 end:0x00002574 diff --git a/config/GZLJ01/rels/d_a_obj_mmrr/splits.txt b/config/GZLJ01/rels/d_a_obj_mmrr/splits.txt index 8e433bd..f1ba900 100644 --- a/config/GZLJ01/rels/d_a_obj_mmrr/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_mmrr/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mmrr.cpp: +d/actor/d_a_obj_mmrr.cpp: .text start:0x00000078 end:0x00001B70 .text start:0x00001B70 end:0x000021C4 .rodata start:0x00000000 end:0x00000208 diff --git a/config/GZLJ01/rels/d_a_obj_monument/splits.txt b/config/GZLJ01/rels/d_a_obj_monument/splits.txt index 3da8c5f..a0e1ebc 100644 --- a/config/GZLJ01/rels/d_a_obj_monument/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_monument/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_monument.cpp: +d/actor/d_a_obj_monument.cpp: .text start:0x00000078 end:0x000005CC .text start:0x000005CC end:0x000005E8 .rodata start:0x00000000 end:0x00000031 diff --git a/config/GZLJ01/rels/d_a_obj_movebox/splits.txt b/config/GZLJ01/rels/d_a_obj_movebox/splits.txt index b584e7d..72e1966 100644 --- a/config/GZLJ01/rels/d_a_obj_movebox/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_movebox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_movebox.cpp: +d/actor/d_a_obj_movebox.cpp: .text start:0x000000EC end:0x000045B8 .text start:0x000045B8 end:0x00004898 .text start:0x00004898 end:0x00004AC0 diff --git a/config/GZLJ01/rels/d_a_obj_msdan/splits.txt b/config/GZLJ01/rels/d_a_obj_msdan/splits.txt index 05d6368..0a61df0 100644 --- a/config/GZLJ01/rels/d_a_obj_msdan/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_msdan/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan.cpp: +d/actor/d_a_obj_msdan.cpp: .text start:0x00000078 end:0x00000660 .text start:0x00000660 end:0x0000067C .rodata start:0x00000000 end:0x0000002A diff --git a/config/GZLJ01/rels/d_a_obj_msdan2/splits.txt b/config/GZLJ01/rels/d_a_obj_msdan2/splits.txt index 6a09ad9..97dd469 100644 --- a/config/GZLJ01/rels/d_a_obj_msdan2/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_msdan2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan2.cpp: +d/actor/d_a_obj_msdan2.cpp: .text start:0x00000078 end:0x000003BC .text start:0x000003BC end:0x000003D8 .rodata start:0x00000000 end:0x0000000F diff --git a/config/GZLJ01/rels/d_a_obj_msdan_sub/splits.txt b/config/GZLJ01/rels/d_a_obj_msdan_sub/splits.txt index 2dd7fb2..6aa5372 100644 --- a/config/GZLJ01/rels/d_a_obj_msdan_sub/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_msdan_sub/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan_sub.cpp: +d/actor/d_a_obj_msdan_sub.cpp: .text start:0x00000078 end:0x00000D0C .text start:0x00000D0C end:0x00000D24 .text start:0x00000D24 end:0x00000D40 diff --git a/config/GZLJ01/rels/d_a_obj_msdan_sub2/splits.txt b/config/GZLJ01/rels/d_a_obj_msdan_sub2/splits.txt index 9e137cf..0bc5fc0 100644 --- a/config/GZLJ01/rels/d_a_obj_msdan_sub2/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_msdan_sub2/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan_sub2.cpp: +d/actor/d_a_obj_msdan_sub2.cpp: .text start:0x00000078 end:0x00000A64 .text start:0x00000A64 end:0x00000A7C .text start:0x00000A7C end:0x00000A98 diff --git a/config/GZLJ01/rels/d_a_obj_mshokki/splits.txt b/config/GZLJ01/rels/d_a_obj_mshokki/splits.txt index 1e808b6..6fb59c0 100644 --- a/config/GZLJ01/rels/d_a_obj_mshokki/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_mshokki/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mshokki.cpp: +d/actor/d_a_obj_mshokki.cpp: .text start:0x00000078 end:0x00001000 .text start:0x00001000 end:0x0000103C .rodata start:0x00000000 end:0x000000F3 diff --git a/config/GZLJ01/rels/d_a_obj_mtest/splits.txt b/config/GZLJ01/rels/d_a_obj_mtest/splits.txt index 3c9876f..64c1fe6 100644 --- a/config/GZLJ01/rels/d_a_obj_mtest/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_mtest/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_mtest.cpp: +d/actor/d_a_obj_mtest.cpp: .text start:0x000000EC end:0x00000D18 .text start:0x00000D18 end:0x00000E8C .text start:0x00000E8C end:0x0000109C diff --git a/config/GZLJ01/rels/d_a_obj_nest/splits.txt b/config/GZLJ01/rels/d_a_obj_nest/splits.txt index e3a39e0..672b0e0 100644 --- a/config/GZLJ01/rels/d_a_obj_nest/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_nest/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_nest.cpp: +d/actor/d_a_obj_nest.cpp: .text start:0x00000078 end:0x000008B4 .text start:0x000008B4 end:0x000008CC .rodata start:0x00000000 end:0x000000C1 diff --git a/config/GZLJ01/rels/d_a_obj_ohatch/splits.txt b/config/GZLJ01/rels/d_a_obj_ohatch/splits.txt index 68c294b..a58b1f4 100644 --- a/config/GZLJ01/rels/d_a_obj_ohatch/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ohatch/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ohatch.cpp: +d/actor/d_a_obj_ohatch.cpp: .text start:0x00000078 end:0x00000BF8 .text start:0x00000BF8 end:0x00000C14 .rodata start:0x00000000 end:0x0000007C diff --git a/config/GZLJ01/rels/d_a_obj_ojtree/splits.txt b/config/GZLJ01/rels/d_a_obj_ojtree/splits.txt index 73d845b..f70c506 100644 --- a/config/GZLJ01/rels/d_a_obj_ojtree/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ojtree/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ojtree.cpp: +d/actor/d_a_obj_ojtree.cpp: .text start:0x00000078 end:0x000005B4 .text start:0x000005B4 end:0x000005CC .rodata start:0x00000000 end:0x0000008B diff --git a/config/GZLJ01/rels/d_a_obj_ospbox/splits.txt b/config/GZLJ01/rels/d_a_obj_ospbox/splits.txt index db3c5f3..840b21f 100644 --- a/config/GZLJ01/rels/d_a_obj_ospbox/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_ospbox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ospbox.cpp: +d/actor/d_a_obj_ospbox.cpp: .text start:0x000000EC end:0x00001254 .text start:0x00001254 end:0x000013A0 .text start:0x000013A0 end:0x0000140C diff --git a/config/GZLJ01/rels/d_a_obj_otble/splits.txt b/config/GZLJ01/rels/d_a_obj_otble/splits.txt index 9d2e2e4..dd70aeb 100644 --- a/config/GZLJ01/rels/d_a_obj_otble/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_otble/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_otble.cpp: +d/actor/d_a_obj_otble.cpp: .text start:0x00000078 end:0x000007F4 .rodata start:0x00000000 end:0x00000079 .data start:0x00000000 end:0x00000074 diff --git a/config/GZLJ01/rels/d_a_obj_paper/splits.txt b/config/GZLJ01/rels/d_a_obj_paper/splits.txt index 3530d85..6babeb6 100644 --- a/config/GZLJ01/rels/d_a_obj_paper/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_paper/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_paper.cpp: +d/actor/d_a_obj_paper.cpp: .text start:0x00000078 end:0x00000D98 .text start:0x00000D98 end:0x00000DC4 .rodata start:0x00000000 end:0x000000DE diff --git a/config/GZLJ01/rels/d_a_obj_pbco/splits.txt b/config/GZLJ01/rels/d_a_obj_pbco/splits.txt index bdda05e..c872668 100644 --- a/config/GZLJ01/rels/d_a_obj_pbco/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_pbco/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_pbco.cpp: +d/actor/d_a_obj_pbco.cpp: .text start:0x000000EC end:0x000005C8 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000002D diff --git a/config/GZLJ01/rels/d_a_obj_pbka/splits.txt b/config/GZLJ01/rels/d_a_obj_pbka/splits.txt index 4fd8aca..8d46771 100644 --- a/config/GZLJ01/rels/d_a_obj_pbka/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_pbka/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_pbka.cpp: +d/actor/d_a_obj_pbka.cpp: .text start:0x00000078 end:0x00000458 .rodata start:0x00000000 end:0x0000003A .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_pfall/splits.txt b/config/GZLJ01/rels/d_a_obj_pfall/splits.txt index 7a099d6..8ae4237 100644 --- a/config/GZLJ01/rels/d_a_obj_pfall/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_pfall/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_pfall.cpp: +d/actor/d_a_obj_pfall.cpp: .text start:0x000000EC end:0x00001620 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000113 diff --git a/config/GZLJ01/rels/d_a_obj_pirateship/splits.txt b/config/GZLJ01/rels/d_a_obj_pirateship/splits.txt index 6f9cedf..d490ab8 100644 --- a/config/GZLJ01/rels/d_a_obj_pirateship/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_pirateship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_pirateship.cpp: +d/actor/d_a_obj_pirateship.cpp: .text start:0x000000EC end:0x00001FDC .text start:0x00001FDC end:0x00002274 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_plant/splits.txt b/config/GZLJ01/rels/d_a_obj_plant/splits.txt index dce1241..a5d0a65 100644 --- a/config/GZLJ01/rels/d_a_obj_plant/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_plant/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_plant.cpp: +d/actor/d_a_obj_plant.cpp: .text start:0x00000078 end:0x00000B58 .rodata start:0x00000000 end:0x0000006B .data start:0x00000000 end:0x00000188 diff --git a/config/GZLJ01/rels/d_a_obj_quake/splits.txt b/config/GZLJ01/rels/d_a_obj_quake/splits.txt index fdf3459..ed372f9 100644 --- a/config/GZLJ01/rels/d_a_obj_quake/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_quake/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_quake.cpp: +d/actor/d_a_obj_quake.cpp: .text start:0x000000EC end:0x000007C8 .text start:0x000007C8 end:0x00000820 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_rcloud/splits.txt b/config/GZLJ01/rels/d_a_obj_rcloud/splits.txt index 65cf715..d7f435c 100644 --- a/config/GZLJ01/rels/d_a_obj_rcloud/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_rcloud/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_rcloud.cpp: +d/actor/d_a_obj_rcloud.cpp: .text start:0x00000078 end:0x000008DC .text start:0x000008DC end:0x000008F8 .rodata start:0x00000000 end:0x0000004A diff --git a/config/GZLJ01/rels/d_a_obj_rflw/splits.txt b/config/GZLJ01/rels/d_a_obj_rflw/splits.txt index e3c8ff7..30d246f 100644 --- a/config/GZLJ01/rels/d_a_obj_rflw/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_rflw/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_rflw.cpp: +d/actor/d_a_obj_rflw.cpp: .text start:0x00000078 end:0x00000AEC .rodata start:0x00000000 end:0x00000059 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLJ01/rels/d_a_obj_rforce/splits.txt b/config/GZLJ01/rels/d_a_obj_rforce/splits.txt index ecb6854..125a2af 100644 --- a/config/GZLJ01/rels/d_a_obj_rforce/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_rforce/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_rforce.cpp: +d/actor/d_a_obj_rforce.cpp: .text start:0x00000078 end:0x0000059C .text start:0x0000059C end:0x000005FC .rodata start:0x00000000 end:0x0000003C diff --git a/config/GZLJ01/rels/d_a_obj_roten/splits.txt b/config/GZLJ01/rels/d_a_obj_roten/splits.txt index a6b2d01..d3ee9d2 100644 --- a/config/GZLJ01/rels/d_a_obj_roten/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_roten/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_roten.cpp: +d/actor/d_a_obj_roten.cpp: .text start:0x000000EC end:0x000006BC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000003E diff --git a/config/GZLJ01/rels/d_a_obj_shelf/splits.txt b/config/GZLJ01/rels/d_a_obj_shelf/splits.txt index e05e801..b419a06 100644 --- a/config/GZLJ01/rels/d_a_obj_shelf/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_shelf/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_shelf.cpp: +d/actor/d_a_obj_shelf.cpp: .text start:0x00000078 end:0x00000B08 .text start:0x00000B08 end:0x00000B48 .text start:0x00000B48 end:0x00000B64 diff --git a/config/GZLJ01/rels/d_a_obj_shmrgrd/splits.txt b/config/GZLJ01/rels/d_a_obj_shmrgrd/splits.txt index 07a9b4e..6b4b7bf 100644 --- a/config/GZLJ01/rels/d_a_obj_shmrgrd/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_shmrgrd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_shmrgrd.cpp: +d/actor/d_a_obj_shmrgrd.cpp: .text start:0x000000EC end:0x00001CEC .text start:0x00001CEC end:0x00002120 .text start:0x00002120 end:0x0000214C diff --git a/config/GZLJ01/rels/d_a_obj_smplbg/splits.txt b/config/GZLJ01/rels/d_a_obj_smplbg/splits.txt index 9c50490..3734e8e 100644 --- a/config/GZLJ01/rels/d_a_obj_smplbg/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_smplbg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_smplbg.cpp: +d/actor/d_a_obj_smplbg.cpp: .text start:0x00000078 end:0x0000081C .text start:0x0000081C end:0x00000834 .text start:0x00000834 end:0x00000850 diff --git a/config/GZLJ01/rels/d_a_obj_stair/splits.txt b/config/GZLJ01/rels/d_a_obj_stair/splits.txt index cc7fccb..ce5d19c 100644 --- a/config/GZLJ01/rels/d_a_obj_stair/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_stair/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_stair.cpp: +d/actor/d_a_obj_stair.cpp: .text start:0x000000EC end:0x00001434 .text start:0x00001434 end:0x00001528 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_swflat/splits.txt b/config/GZLJ01/rels/d_a_obj_swflat/splits.txt index a14677c..aa1c52a 100644 --- a/config/GZLJ01/rels/d_a_obj_swflat/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_swflat/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swflat.cpp: +d/actor/d_a_obj_swflat.cpp: .text start:0x000000EC end:0x000013D8 .text start:0x000013D8 end:0x00001530 .text start:0x00001530 end:0x00001598 diff --git a/config/GZLJ01/rels/d_a_obj_swhammer/splits.txt b/config/GZLJ01/rels/d_a_obj_swhammer/splits.txt index 00021a1..04fa233 100644 --- a/config/GZLJ01/rels/d_a_obj_swhammer/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_swhammer/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swhammer.cpp: +d/actor/d_a_obj_swhammer.cpp: .text start:0x000000EC end:0x0000161C .text start:0x0000161C end:0x00001844 .text start:0x00001844 end:0x00001ACC diff --git a/config/GZLJ01/rels/d_a_obj_swheavy/splits.txt b/config/GZLJ01/rels/d_a_obj_swheavy/splits.txt index 99a5cd5..5c24f13 100644 --- a/config/GZLJ01/rels/d_a_obj_swheavy/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_swheavy/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_swheavy.cpp: +d/actor/d_a_obj_swheavy.cpp: .text start:0x00000078 end:0x00001254 .text start:0x00001254 end:0x00001270 .rodata start:0x00000000 end:0x000000FD diff --git a/config/GZLJ01/rels/d_a_obj_swlight/splits.txt b/config/GZLJ01/rels/d_a_obj_swlight/splits.txt index 85d2721..df0050b 100644 --- a/config/GZLJ01/rels/d_a_obj_swlight/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_swlight/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swlight.cpp: +d/actor/d_a_obj_swlight.cpp: .text start:0x000000EC end:0x00001C8C .text start:0x00001C8C end:0x00001CB8 .rodata start:0x00000000 end:0x000000F8 diff --git a/config/GZLJ01/rels/d_a_obj_swpush/splits.txt b/config/GZLJ01/rels/d_a_obj_swpush/splits.txt index e590f0e..473d27e 100644 --- a/config/GZLJ01/rels/d_a_obj_swpush/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_swpush/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swpush.cpp: +d/actor/d_a_obj_swpush.cpp: .text start:0x000000EC end:0x00002080 .text start:0x00002080 end:0x0000209C .rodata start:0x00000000 end:0x000001CF diff --git a/config/GZLJ01/rels/d_a_obj_table/splits.txt b/config/GZLJ01/rels/d_a_obj_table/splits.txt index 40c4ef3..6c05082 100644 --- a/config/GZLJ01/rels/d_a_obj_table/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_table/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_table.cpp: +d/actor/d_a_obj_table.cpp: .text start:0x00000078 end:0x000006C0 .text start:0x000006C0 end:0x000006D8 .text start:0x000006D8 end:0x000006F4 diff --git a/config/GZLJ01/rels/d_a_obj_tapestry/splits.txt b/config/GZLJ01/rels/d_a_obj_tapestry/splits.txt index d210817..9bacf05 100644 --- a/config/GZLJ01/rels/d_a_obj_tapestry/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_tapestry/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000020 -d/a/d_a_obj_tapestry.cpp: +d/actor/d_a_obj_tapestry.cpp: .text start:0x000000EC end:0x00005F40 .text start:0x00005F40 end:0x00006260 .text start:0x00006260 end:0x00006380 diff --git a/config/GZLJ01/rels/d_a_obj_tenmado/splits.txt b/config/GZLJ01/rels/d_a_obj_tenmado/splits.txt index fea86e9..9572958 100644 --- a/config/GZLJ01/rels/d_a_obj_tenmado/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_tenmado/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tenmado.cpp: +d/actor/d_a_obj_tenmado.cpp: .text start:0x00000078 end:0x00000808 .text start:0x00000808 end:0x00000820 .text start:0x00000820 end:0x0000083C diff --git a/config/GZLJ01/rels/d_a_obj_tide/splits.txt b/config/GZLJ01/rels/d_a_obj_tide/splits.txt index 8b324be..56d163a 100644 --- a/config/GZLJ01/rels/d_a_obj_tide/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_tide/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tide.cpp: +d/actor/d_a_obj_tide.cpp: .text start:0x00000078 end:0x00001E1C .text start:0x00001E1C end:0x00001F70 .text start:0x00001F70 end:0x00001F8C diff --git a/config/GZLJ01/rels/d_a_obj_timer/splits.txt b/config/GZLJ01/rels/d_a_obj_timer/splits.txt index 956e466..162441e 100644 --- a/config/GZLJ01/rels/d_a_obj_timer/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_timer/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_timer.cpp: +d/actor/d_a_obj_timer.cpp: .text start:0x00000078 end:0x0000040C .text start:0x0000040C end:0x00000428 .rodata start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_tntrap/splits.txt b/config/GZLJ01/rels/d_a_obj_tntrap/splits.txt index 96e6362..31738ad 100644 --- a/config/GZLJ01/rels/d_a_obj_tntrap/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_tntrap/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tntrap.cpp: +d/actor/d_a_obj_tntrap.cpp: .text start:0x00000078 end:0x00001DC0 .text start:0x00001DC0 end:0x00001DEC .rodata start:0x00000000 end:0x00000173 diff --git a/config/GZLJ01/rels/d_a_obj_toripost/splits.txt b/config/GZLJ01/rels/d_a_obj_toripost/splits.txt index a924e51..c002c9f 100644 --- a/config/GZLJ01/rels/d_a_obj_toripost/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_toripost/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_toripost.cpp: +d/actor/d_a_obj_toripost.cpp: .text start:0x000000EC end:0x00002434 .text start:0x00002434 end:0x00002448 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_tousekiki/splits.txt b/config/GZLJ01/rels/d_a_obj_tousekiki/splits.txt index 3eedcb7..daa1763 100644 --- a/config/GZLJ01/rels/d_a_obj_tousekiki/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_tousekiki/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_tousekiki.cpp: +d/actor/d_a_obj_tousekiki.cpp: .text start:0x000000EC end:0x00000A38 .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000144 diff --git a/config/GZLJ01/rels/d_a_obj_tower/splits.txt b/config/GZLJ01/rels/d_a_obj_tower/splits.txt index c7fba0a..c181478 100644 --- a/config/GZLJ01/rels/d_a_obj_tower/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_tower/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tower.cpp: +d/actor/d_a_obj_tower.cpp: .text start:0x00000078 end:0x00000570 .rodata start:0x00000000 end:0x0000003E .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_trap/splits.txt b/config/GZLJ01/rels/d_a_obj_trap/splits.txt index 2402a10..295a9c2 100644 --- a/config/GZLJ01/rels/d_a_obj_trap/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_trap/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_trap.cpp: +d/actor/d_a_obj_trap.cpp: .text start:0x000000EC end:0x00002F5C .rodata start:0x00000000 end:0x000000C2 .data start:0x00000000 end:0x000002F4 diff --git a/config/GZLJ01/rels/d_a_obj_tribox/splits.txt b/config/GZLJ01/rels/d_a_obj_tribox/splits.txt index 3f64015..4ce6c2f 100644 --- a/config/GZLJ01/rels/d_a_obj_tribox/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_tribox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_tribox.cpp: +d/actor/d_a_obj_tribox.cpp: .text start:0x000000EC end:0x000036C0 .text start:0x000036C0 end:0x00003D70 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_try/splits.txt b/config/GZLJ01/rels/d_a_obj_try/splits.txt index 9401ca2..095ea39 100644 --- a/config/GZLJ01/rels/d_a_obj_try/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_try/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_try.cpp: +d/actor/d_a_obj_try.cpp: .text start:0x00000078 end:0x000034E8 .text start:0x000034E8 end:0x0000355C .rodata start:0x00000000 end:0x00000710 diff --git a/config/GZLJ01/rels/d_a_obj_usovmc/splits.txt b/config/GZLJ01/rels/d_a_obj_usovmc/splits.txt index 9060ce0..c03bd0d 100644 --- a/config/GZLJ01/rels/d_a_obj_usovmc/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_usovmc/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_usovmc.cpp: +d/actor/d_a_obj_usovmc.cpp: .text start:0x00000078 end:0x00000534 .text start:0x00000534 end:0x0000054C .rodata start:0x00000000 end:0x00000083 diff --git a/config/GZLJ01/rels/d_a_obj_vfan/splits.txt b/config/GZLJ01/rels/d_a_obj_vfan/splits.txt index 58707d0..aa4ef57 100644 --- a/config/GZLJ01/rels/d_a_obj_vfan/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_vfan/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vfan.cpp: +d/actor/d_a_obj_vfan.cpp: .text start:0x00000078 end:0x00000DD4 .text start:0x00000DD4 end:0x00000ED8 .text start:0x00000ED8 end:0x00000F04 diff --git a/config/GZLJ01/rels/d_a_obj_vgnfd/splits.txt b/config/GZLJ01/rels/d_a_obj_vgnfd/splits.txt index 1401541..70e0bde 100644 --- a/config/GZLJ01/rels/d_a_obj_vgnfd/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_vgnfd/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vgnfd.cpp: +d/actor/d_a_obj_vgnfd.cpp: .text start:0x00000078 end:0x00001538 .rodata start:0x00000000 end:0x00000130 .data start:0x00000000 end:0x0000011C diff --git a/config/GZLJ01/rels/d_a_obj_vmc/splits.txt b/config/GZLJ01/rels/d_a_obj_vmc/splits.txt index 85acee3..53526ac 100644 --- a/config/GZLJ01/rels/d_a_obj_vmc/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_vmc/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vmc.cpp: +d/actor/d_a_obj_vmc.cpp: .text start:0x00000078 end:0x0000140C .text start:0x0000140C end:0x00001438 .rodata start:0x00000000 end:0x0000009E diff --git a/config/GZLJ01/rels/d_a_obj_vmsdz/splits.txt b/config/GZLJ01/rels/d_a_obj_vmsdz/splits.txt index dc59069..addf58a 100644 --- a/config/GZLJ01/rels/d_a_obj_vmsdz/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_vmsdz/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vmsdz.cpp: +d/actor/d_a_obj_vmsdz.cpp: .text start:0x00000078 end:0x00000394 .rodata start:0x00000000 end:0x0000002D .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_vmsms/splits.txt b/config/GZLJ01/rels/d_a_obj_vmsms/splits.txt index 60a3039..efd64f5 100644 --- a/config/GZLJ01/rels/d_a_obj_vmsms/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_vmsms/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vmsms.cpp: +d/actor/d_a_obj_vmsms.cpp: .text start:0x00000078 end:0x00000400 .rodata start:0x00000000 end:0x0000003A .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_obj_volcano/splits.txt b/config/GZLJ01/rels/d_a_obj_volcano/splits.txt index 8df281b..4a654a9 100644 --- a/config/GZLJ01/rels/d_a_obj_volcano/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_volcano/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_volcano.cpp: +d/actor/d_a_obj_volcano.cpp: .text start:0x00000078 end:0x00001C40 .text start:0x00001C40 end:0x00001D44 .text start:0x00001D44 end:0x00001D70 diff --git a/config/GZLJ01/rels/d_a_obj_vtil/splits.txt b/config/GZLJ01/rels/d_a_obj_vtil/splits.txt index 16acb6d..e915268 100644 --- a/config/GZLJ01/rels/d_a_obj_vtil/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_vtil/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vtil.cpp: +d/actor/d_a_obj_vtil.cpp: .text start:0x00000078 end:0x00001B10 .text start:0x00001B10 end:0x00001B4C .rodata start:0x00000000 end:0x00000130 diff --git a/config/GZLJ01/rels/d_a_obj_vyasi/splits.txt b/config/GZLJ01/rels/d_a_obj_vyasi/splits.txt index f2abee2..9329fb1 100644 --- a/config/GZLJ01/rels/d_a_obj_vyasi/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_vyasi/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_vyasi.cpp: +d/actor/d_a_obj_vyasi.cpp: .text start:0x000000EC end:0x00002D8C .text start:0x00002D8C end:0x00002F60 .text start:0x00002F60 end:0x00002FAC diff --git a/config/GZLJ01/rels/d_a_obj_warpt/splits.txt b/config/GZLJ01/rels/d_a_obj_warpt/splits.txt index ab4fa8f..d32c4e5 100644 --- a/config/GZLJ01/rels/d_a_obj_warpt/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_warpt/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_warpt.cpp: +d/actor/d_a_obj_warpt.cpp: .text start:0x000000EC end:0x00002CB0 .text start:0x00002CB0 end:0x00002CB0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_obj_wood/splits.txt b/config/GZLJ01/rels/d_a_obj_wood/splits.txt index e7f634c..64face4 100644 --- a/config/GZLJ01/rels/d_a_obj_wood/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_wood/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_wood.cpp: +d/actor/d_a_obj_wood.cpp: .text start:0x00000078 end:0x0000048C .data start:0x00000000 end:0x00000144 diff --git a/config/GZLJ01/rels/d_a_obj_xfuta/splits.txt b/config/GZLJ01/rels/d_a_obj_xfuta/splits.txt index 6ff70af..b0404b9 100644 --- a/config/GZLJ01/rels/d_a_obj_xfuta/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_xfuta/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_xfuta.cpp: +d/actor/d_a_obj_xfuta.cpp: .text start:0x00000078 end:0x000004A0 .text start:0x000004A0 end:0x00000500 .rodata start:0x00000000 end:0x00000031 diff --git a/config/GZLJ01/rels/d_a_obj_zouK/splits.txt b/config/GZLJ01/rels/d_a_obj_zouK/splits.txt index 8161d38..0934d91 100644 --- a/config/GZLJ01/rels/d_a_obj_zouK/splits.txt +++ b/config/GZLJ01/rels/d_a_obj_zouK/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_zouK.cpp: +d/actor/d_a_obj_zouK.cpp: .text start:0x00000078 end:0x00001A14 .text start:0x00001A14 end:0x00001E18 .text start:0x00001E18 end:0x00001E84 diff --git a/config/GZLJ01/rels/d_a_oq/splits.txt b/config/GZLJ01/rels/d_a_oq/splits.txt index 06c0fae..2888726 100644 --- a/config/GZLJ01/rels/d_a_oq/splits.txt +++ b/config/GZLJ01/rels/d_a_oq/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_oq.cpp: +d/actor/d_a_oq.cpp: .text start:0x000000EC end:0x00005A40 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000132 diff --git a/config/GZLJ01/rels/d_a_oship/splits.txt b/config/GZLJ01/rels/d_a_oship/splits.txt index 9eedc6b..6c0b2c8 100644 --- a/config/GZLJ01/rels/d_a_oship/splits.txt +++ b/config/GZLJ01/rels/d_a_oship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_oship.cpp: +d/actor/d_a_oship.cpp: .text start:0x000000EC end:0x000042B0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000001F3 diff --git a/config/GZLJ01/rels/d_a_pedestal/splits.txt b/config/GZLJ01/rels/d_a_pedestal/splits.txt index 895563a..60865b8 100644 --- a/config/GZLJ01/rels/d_a_pedestal/splits.txt +++ b/config/GZLJ01/rels/d_a_pedestal/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_pedestal.cpp: +d/actor/d_a_pedestal.cpp: .text start:0x00000078 end:0x000010D4 .text start:0x000010D4 end:0x00001374 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_ph/splits.txt b/config/GZLJ01/rels/d_a_ph/splits.txt index 90f6a5b..8589733 100644 --- a/config/GZLJ01/rels/d_a_ph/splits.txt +++ b/config/GZLJ01/rels/d_a_ph/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ph.cpp: +d/actor/d_a_ph.cpp: .text start:0x00000078 end:0x00007840 .rodata start:0x00000000 end:0x0000014C .data start:0x00000000 end:0x000004C8 diff --git a/config/GZLJ01/rels/d_a_pirate_flag/splits.txt b/config/GZLJ01/rels/d_a_pirate_flag/splits.txt index bb8d1d0..c4f44bd 100644 --- a/config/GZLJ01/rels/d_a_pirate_flag/splits.txt +++ b/config/GZLJ01/rels/d_a_pirate_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_pirate_flag.cpp: +d/actor/d_a_pirate_flag.cpp: .text start:0x000000EC end:0x00001D28 .text start:0x00001D28 end:0x00001DF8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_pt/splits.txt b/config/GZLJ01/rels/d_a_pt/splits.txt index 8b7ac61..47d917a 100644 --- a/config/GZLJ01/rels/d_a_pt/splits.txt +++ b/config/GZLJ01/rels/d_a_pt/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_pt.cpp: +d/actor/d_a_pt.cpp: .text start:0x000000EC end:0x00005998 .text start:0x00005998 end:0x00005998 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_pw/splits.txt b/config/GZLJ01/rels/d_a_pw/splits.txt index a2b383e..b4648d1 100644 --- a/config/GZLJ01/rels/d_a_pw/splits.txt +++ b/config/GZLJ01/rels/d_a_pw/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_pw.cpp: +d/actor/d_a_pw.cpp: .text start:0x00000078 end:0x000076D0 .rodata start:0x00000000 end:0x00000113 .data start:0x00000000 end:0x000006AC diff --git a/config/GZLJ01/rels/d_a_pz/splits.txt b/config/GZLJ01/rels/d_a_pz/splits.txt index 17f1371..6fa9a2f 100644 --- a/config/GZLJ01/rels/d_a_pz/splits.txt +++ b/config/GZLJ01/rels/d_a_pz/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_pz.cpp: +d/actor/d_a_pz.cpp: .text start:0x000000EC end:0x000082A8 .text start:0x000082A8 end:0x0000834C .text start:0x0000834C end:0x000083A8 diff --git a/config/GZLJ01/rels/d_a_race_item/splits.txt b/config/GZLJ01/rels/d_a_race_item/splits.txt index 1d4272d..3f31f21 100644 --- a/config/GZLJ01/rels/d_a_race_item/splits.txt +++ b/config/GZLJ01/rels/d_a_race_item/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_race_item.cpp: +d/actor/d_a_race_item.cpp: .text start:0x00000078 end:0x00000C74 .text start:0x00000C74 end:0x00000C90 .text start:0x00000C90 end:0x00000DA0 diff --git a/config/GZLJ01/rels/d_a_rd/splits.txt b/config/GZLJ01/rels/d_a_rd/splits.txt index 4cf4534..fd21d34 100644 --- a/config/GZLJ01/rels/d_a_rd/splits.txt +++ b/config/GZLJ01/rels/d_a_rd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_rd.cpp: +d/actor/d_a_rd.cpp: .text start:0x000000EC end:0x00005448 .text start:0x00005448 end:0x00005490 .text start:0x00005490 end:0x00005520 diff --git a/config/GZLJ01/rels/d_a_rectangle/splits.txt b/config/GZLJ01/rels/d_a_rectangle/splits.txt index cd04c36..9861d3b 100644 --- a/config/GZLJ01/rels/d_a_rectangle/splits.txt +++ b/config/GZLJ01/rels/d_a_rectangle/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_rectangle.cpp: +d/actor/d_a_rectangle.cpp: .text start:0x00000078 end:0x000000A0 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_sail/splits.txt b/config/GZLJ01/rels/d_a_sail/splits.txt index 6a734d3..ccdcf87 100644 --- a/config/GZLJ01/rels/d_a_sail/splits.txt +++ b/config/GZLJ01/rels/d_a_sail/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sail.cpp: +d/actor/d_a_sail.cpp: .text start:0x000000EC end:0x0000255C .text start:0x0000255C end:0x0000262C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_saku/splits.txt b/config/GZLJ01/rels/d_a_saku/splits.txt index 4d24437..ee52d54 100644 --- a/config/GZLJ01/rels/d_a_saku/splits.txt +++ b/config/GZLJ01/rels/d_a_saku/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_saku.cpp: +d/actor/d_a_saku.cpp: .text start:0x000000EC end:0x00002838 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000014C diff --git a/config/GZLJ01/rels/d_a_salvage/splits.txt b/config/GZLJ01/rels/d_a_salvage/splits.txt index fcbe4e6..381921d 100644 --- a/config/GZLJ01/rels/d_a_salvage/splits.txt +++ b/config/GZLJ01/rels/d_a_salvage/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_salvage.cpp: +d/actor/d_a_salvage.cpp: .text start:0x00000078 end:0x0000255C .text start:0x0000255C end:0x00002668 .rodata start:0x00000000 end:0x000000EB diff --git a/config/GZLJ01/rels/d_a_salvage_tbox/splits.txt b/config/GZLJ01/rels/d_a_salvage_tbox/splits.txt index b623b42..a92bff1 100644 --- a/config/GZLJ01/rels/d_a_salvage_tbox/splits.txt +++ b/config/GZLJ01/rels/d_a_salvage_tbox/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_salvage_tbox.cpp: +d/actor/d_a_salvage_tbox.cpp: .text start:0x00000078 end:0x000014A8 .text start:0x000014A8 end:0x000016D4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_sbox/splits.txt b/config/GZLJ01/rels/d_a_sbox/splits.txt index bfb551e..f4d7afb 100644 --- a/config/GZLJ01/rels/d_a_sbox/splits.txt +++ b/config/GZLJ01/rels/d_a_sbox/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_sbox.cpp: +d/actor/d_a_sbox.cpp: .text start:0x00000078 end:0x00001660 .rodata start:0x00000000 end:0x000000BA .data start:0x00000000 end:0x0000008C diff --git a/config/GZLJ01/rels/d_a_scene_change/splits.txt b/config/GZLJ01/rels/d_a_scene_change/splits.txt index 03cf2d5..83746d6 100644 --- a/config/GZLJ01/rels/d_a_scene_change/splits.txt +++ b/config/GZLJ01/rels/d_a_scene_change/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_scene_change.cpp: +d/actor/d_a_scene_change.cpp: .text start:0x000000EC end:0x00000254 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000004 diff --git a/config/GZLJ01/rels/d_a_seatag/splits.txt b/config/GZLJ01/rels/d_a_seatag/splits.txt index 8325b88..9e6142b 100644 --- a/config/GZLJ01/rels/d_a_seatag/splits.txt +++ b/config/GZLJ01/rels/d_a_seatag/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_seatag.cpp: +d/actor/d_a_seatag.cpp: .text start:0x00000078 end:0x00000110 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_shand/splits.txt b/config/GZLJ01/rels/d_a_shand/splits.txt index 2f8a6d0..eeb2740 100644 --- a/config/GZLJ01/rels/d_a_shand/splits.txt +++ b/config/GZLJ01/rels/d_a_shand/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_shand.cpp: +d/actor/d_a_shand.cpp: .text start:0x000000EC end:0x00002C78 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000093 diff --git a/config/GZLJ01/rels/d_a_ship/splits.txt b/config/GZLJ01/rels/d_a_ship/splits.txt index d82bd65..f62c097 100644 --- a/config/GZLJ01/rels/d_a_ship/splits.txt +++ b/config/GZLJ01/rels/d_a_ship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ship.cpp: +d/actor/d_a_ship.cpp: .text start:0x000000EC end:0x0000D2A0 .text start:0x0000D2A0 end:0x0000D33C .text start:0x0000D33C end:0x0000D3A4 diff --git a/config/GZLJ01/rels/d_a_shop_item/splits.txt b/config/GZLJ01/rels/d_a_shop_item/splits.txt index 8068f1c..1a803c7 100644 --- a/config/GZLJ01/rels/d_a_shop_item/splits.txt +++ b/config/GZLJ01/rels/d_a_shop_item/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_shop_item.cpp: +d/actor/d_a_shop_item.cpp: .text start:0x00000078 end:0x00000E68 .text start:0x00000E68 end:0x00000E84 .text start:0x00000E84 end:0x00000EA8 diff --git a/config/GZLJ01/rels/d_a_shutter/splits.txt b/config/GZLJ01/rels/d_a_shutter/splits.txt index c0a9829..67eb0a5 100644 --- a/config/GZLJ01/rels/d_a_shutter/splits.txt +++ b/config/GZLJ01/rels/d_a_shutter/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_shutter.cpp: +d/actor/d_a_shutter.cpp: .text start:0x00000078 end:0x00000E7C .rodata start:0x00000000 end:0x000000EA .data start:0x00000000 end:0x00000080 diff --git a/config/GZLJ01/rels/d_a_shutter2/splits.txt b/config/GZLJ01/rels/d_a_shutter2/splits.txt index 4761bbb..ed55be2 100644 --- a/config/GZLJ01/rels/d_a_shutter2/splits.txt +++ b/config/GZLJ01/rels/d_a_shutter2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_shutter2.cpp: +d/actor/d_a_shutter2.cpp: .text start:0x00000078 end:0x000009E4 .text start:0x000009E4 end:0x000009FC .rodata start:0x00000000 end:0x000000AB diff --git a/config/GZLJ01/rels/d_a_sie_flag/splits.txt b/config/GZLJ01/rels/d_a_sie_flag/splits.txt index 77d679a..d456603 100644 --- a/config/GZLJ01/rels/d_a_sie_flag/splits.txt +++ b/config/GZLJ01/rels/d_a_sie_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sie_flag.cpp: +d/actor/d_a_sie_flag.cpp: .text start:0x000000EC end:0x00000E0C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000087 diff --git a/config/GZLJ01/rels/d_a_sitem/splits.txt b/config/GZLJ01/rels/d_a_sitem/splits.txt index dc2ac55..05acd47 100644 --- a/config/GZLJ01/rels/d_a_sitem/splits.txt +++ b/config/GZLJ01/rels/d_a_sitem/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sitem.cpp: +d/actor/d_a_sitem.cpp: .text start:0x000000EC end:0x000031D8 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000086 diff --git a/config/GZLJ01/rels/d_a_sk/splits.txt b/config/GZLJ01/rels/d_a_sk/splits.txt index f309f75..95fc60a 100644 --- a/config/GZLJ01/rels/d_a_sk/splits.txt +++ b/config/GZLJ01/rels/d_a_sk/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_sk.cpp: +d/actor/d_a_sk.cpp: .text start:0x00000078 end:0x000011A4 .rodata start:0x00000000 end:0x0000003F .data start:0x00000000 end:0x000001B4 diff --git a/config/GZLJ01/rels/d_a_sk2/splits.txt b/config/GZLJ01/rels/d_a_sk2/splits.txt index d2d84e5..b96314e 100644 --- a/config/GZLJ01/rels/d_a_sk2/splits.txt +++ b/config/GZLJ01/rels/d_a_sk2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_sk2.cpp: +d/actor/d_a_sk2.cpp: .text start:0x00000078 end:0x00000C78 .text start:0x00000C78 end:0x00000C7C .text start:0x00000C7C end:0x00000D38 diff --git a/config/GZLJ01/rels/d_a_spotbox/splits.txt b/config/GZLJ01/rels/d_a_spotbox/splits.txt index 093b55b..98bd808 100644 --- a/config/GZLJ01/rels/d_a_spotbox/splits.txt +++ b/config/GZLJ01/rels/d_a_spotbox/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_spotbox.cpp: +d/actor/d_a_spotbox.cpp: .text start:0x00000078 end:0x00000250 .rodata start:0x00000000 end:0x00000014 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_ss/splits.txt b/config/GZLJ01/rels/d_a_ss/splits.txt index 886cfd1..fd55e20 100644 --- a/config/GZLJ01/rels/d_a_ss/splits.txt +++ b/config/GZLJ01/rels/d_a_ss/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ss.cpp: +d/actor/d_a_ss.cpp: .text start:0x000000EC end:0x0000386C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000BE diff --git a/config/GZLJ01/rels/d_a_ssk/splits.txt b/config/GZLJ01/rels/d_a_ssk/splits.txt index 71a00e1..cfcd3f7 100644 --- a/config/GZLJ01/rels/d_a_ssk/splits.txt +++ b/config/GZLJ01/rels/d_a_ssk/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ssk.cpp: +d/actor/d_a_ssk.cpp: .text start:0x00000078 end:0x000015B8 .rodata start:0x00000000 end:0x0000005C .data start:0x00000000 end:0x000001DC diff --git a/config/GZLJ01/rels/d_a_sss/splits.txt b/config/GZLJ01/rels/d_a_sss/splits.txt index 8913332..7e861ed 100644 --- a/config/GZLJ01/rels/d_a_sss/splits.txt +++ b/config/GZLJ01/rels/d_a_sss/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sss.cpp: +d/actor/d_a_sss.cpp: .text start:0x000000EC end:0x00002FD0 .text start:0x00002FD0 end:0x00003350 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_st/splits.txt b/config/GZLJ01/rels/d_a_st/splits.txt index a56c22a..faa4b05 100644 --- a/config/GZLJ01/rels/d_a_st/splits.txt +++ b/config/GZLJ01/rels/d_a_st/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_st.cpp: +d/actor/d_a_st.cpp: .text start:0x000000EC end:0x00009DBC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000159 diff --git a/config/GZLJ01/rels/d_a_steam_tag/splits.txt b/config/GZLJ01/rels/d_a_steam_tag/splits.txt index 9a9fa6e..b0dbb10 100644 --- a/config/GZLJ01/rels/d_a_steam_tag/splits.txt +++ b/config/GZLJ01/rels/d_a_steam_tag/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_steam_tag.cpp: +d/actor/d_a_steam_tag.cpp: .text start:0x00000078 end:0x00001064 .rodata start:0x00000000 end:0x0000002C .data start:0x00000000 end:0x00000258 diff --git a/config/GZLJ01/rels/d_a_stone/splits.txt b/config/GZLJ01/rels/d_a_stone/splits.txt index b30249f..86c9bb4 100644 --- a/config/GZLJ01/rels/d_a_stone/splits.txt +++ b/config/GZLJ01/rels/d_a_stone/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_stone.cpp: +d/actor/d_a_stone.cpp: .text start:0x000000EC end:0x000036F8 .text start:0x000036F8 end:0x000036F8 .text start:0x000036F8 end:0x000037E0 diff --git a/config/GZLJ01/rels/d_a_stone2/splits.txt b/config/GZLJ01/rels/d_a_stone2/splits.txt index 27a6d57..2861290 100644 --- a/config/GZLJ01/rels/d_a_stone2/splits.txt +++ b/config/GZLJ01/rels/d_a_stone2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_stone2.cpp: +d/actor/d_a_stone2.cpp: .text start:0x000000EC end:0x000027EC .text start:0x000027EC end:0x00002B00 .text start:0x00002B00 end:0x00002D78 diff --git a/config/GZLJ01/rels/d_a_swattack/splits.txt b/config/GZLJ01/rels/d_a_swattack/splits.txt index f9b45a4..c2aa142 100644 --- a/config/GZLJ01/rels/d_a_swattack/splits.txt +++ b/config/GZLJ01/rels/d_a_swattack/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swattack.cpp: +d/actor/d_a_swattack.cpp: .text start:0x00000078 end:0x000006F0 .rodata start:0x00000000 end:0x00000008 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLJ01/rels/d_a_swc00/splits.txt b/config/GZLJ01/rels/d_a_swc00/splits.txt index 8664d0e..7ec2062 100644 --- a/config/GZLJ01/rels/d_a_swc00/splits.txt +++ b/config/GZLJ01/rels/d_a_swc00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swc00.cpp: +d/actor/d_a_swc00.cpp: .text start:0x00000078 end:0x00000274 .rodata start:0x00000000 end:0x0000000C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_swhit0/splits.txt b/config/GZLJ01/rels/d_a_swhit0/splits.txt index 207f5ea..326115b 100644 --- a/config/GZLJ01/rels/d_a_swhit0/splits.txt +++ b/config/GZLJ01/rels/d_a_swhit0/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swhit0.cpp: +d/actor/d_a_swhit0.cpp: .text start:0x00000078 end:0x00001694 .text start:0x00001694 end:0x000018A4 .rodata start:0x00000000 end:0x0000006F diff --git a/config/GZLJ01/rels/d_a_switem/splits.txt b/config/GZLJ01/rels/d_a_switem/splits.txt index e3d8eb1..e066450 100644 --- a/config/GZLJ01/rels/d_a_switem/splits.txt +++ b/config/GZLJ01/rels/d_a_switem/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_switem.cpp: +d/actor/d_a_switem.cpp: .text start:0x00000078 end:0x00000900 .rodata start:0x00000000 end:0x00000010 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLJ01/rels/d_a_swpropeller/splits.txt b/config/GZLJ01/rels/d_a_swpropeller/splits.txt index 34401d8..9ff4e5d 100644 --- a/config/GZLJ01/rels/d_a_swpropeller/splits.txt +++ b/config/GZLJ01/rels/d_a_swpropeller/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swpropeller.cpp: +d/actor/d_a_swpropeller.cpp: .text start:0x00000078 end:0x00000D9C .rodata start:0x00000000 end:0x00000087 .data start:0x00000000 end:0x000001B4 diff --git a/config/GZLJ01/rels/d_a_swtact/splits.txt b/config/GZLJ01/rels/d_a_swtact/splits.txt index 0b7d244..f2d1e7e 100644 --- a/config/GZLJ01/rels/d_a_swtact/splits.txt +++ b/config/GZLJ01/rels/d_a_swtact/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swtact.cpp: +d/actor/d_a_swtact.cpp: .text start:0x00000078 end:0x000007B4 .text start:0x000007B4 end:0x000007B4 .rodata start:0x00000000 end:0x00000069 diff --git a/config/GZLJ01/rels/d_a_swtdoor/splits.txt b/config/GZLJ01/rels/d_a_swtdoor/splits.txt index 6d8402b..a0af862 100644 --- a/config/GZLJ01/rels/d_a_swtdoor/splits.txt +++ b/config/GZLJ01/rels/d_a_swtdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swtdoor.cpp: +d/actor/d_a_swtdoor.cpp: .text start:0x00000078 end:0x00000374 .rodata start:0x00000000 end:0x00000024 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_syan/splits.txt b/config/GZLJ01/rels/d_a_syan/splits.txt index 00e6ec3..9bf3a13 100644 --- a/config/GZLJ01/rels/d_a_syan/splits.txt +++ b/config/GZLJ01/rels/d_a_syan/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_syan.cpp: +d/actor/d_a_syan.cpp: .text start:0x000000EC end:0x0000116C .rodata start:0x00000000 end:0x000000A5 .data start:0x00000000 end:0x00000110 diff --git a/config/GZLJ01/rels/d_a_tag_attention/splits.txt b/config/GZLJ01/rels/d_a_tag_attention/splits.txt index 4dfdcd4..dbedfae 100644 --- a/config/GZLJ01/rels/d_a_tag_attention/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_attention/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_attention.cpp: +d/actor/d_a_tag_attention.cpp: .text start:0x00000078 end:0x000005C4 .text start:0x000005C4 end:0x000007E0 .text start:0x000007E0 end:0x0000080C diff --git a/config/GZLJ01/rels/d_a_tag_ba1/splits.txt b/config/GZLJ01/rels/d_a_tag_ba1/splits.txt index 379cdc1..3e7e3ce 100644 --- a/config/GZLJ01/rels/d_a_tag_ba1/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_ba1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_ba1.cpp: +d/actor/d_a_tag_ba1.cpp: .text start:0x000000EC end:0x00000560 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000022 diff --git a/config/GZLJ01/rels/d_a_tag_etc/splits.txt b/config/GZLJ01/rels/d_a_tag_etc/splits.txt index 0a35785..0a07536 100644 --- a/config/GZLJ01/rels/d_a_tag_etc/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_etc/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_etc.cpp: +d/actor/d_a_tag_etc.cpp: .text start:0x00000078 end:0x00000788 .rodata start:0x00000000 end:0x0000002E .data start:0x00000000 end:0x00000064 diff --git a/config/GZLJ01/rels/d_a_tag_event/splits.txt b/config/GZLJ01/rels/d_a_tag_event/splits.txt index a24eaa0..411f375 100644 --- a/config/GZLJ01/rels/d_a_tag_event/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_event/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_event.cpp: +d/actor/d_a_tag_event.cpp: .text start:0x00000078 end:0x00001524 .rodata start:0x00000000 end:0x00000057 .data start:0x00000000 end:0x000000E4 diff --git a/config/GZLJ01/rels/d_a_tag_evsw/splits.txt b/config/GZLJ01/rels/d_a_tag_evsw/splits.txt index ba2a120..595935f 100644 --- a/config/GZLJ01/rels/d_a_tag_evsw/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_evsw/splits.txt @@ -7,7 +7,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_evsw.cpp: +d/actor/d_a_tag_evsw.cpp: .text start:0x00000078 end:0x00000604 .text start:0x00000604 end:0x00000630 .data start:0x00000000 end:0x00000144 diff --git a/config/GZLJ01/rels/d_a_tag_ghostship/splits.txt b/config/GZLJ01/rels/d_a_tag_ghostship/splits.txt index a855c58..bab6807 100644 --- a/config/GZLJ01/rels/d_a_tag_ghostship/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_ghostship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_ghostship.cpp: +d/actor/d_a_tag_ghostship.cpp: .text start:0x000000EC end:0x0000070C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000008E diff --git a/config/GZLJ01/rels/d_a_tag_hint/splits.txt b/config/GZLJ01/rels/d_a_tag_hint/splits.txt index e31c7c9..0747b40 100644 --- a/config/GZLJ01/rels/d_a_tag_hint/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_hint/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_hint.cpp: +d/actor/d_a_tag_hint.cpp: .text start:0x000000EC end:0x00002264 .text start:0x00002264 end:0x00002280 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_tag_island/splits.txt b/config/GZLJ01/rels/d_a_tag_island/splits.txt index ce90485..89d2487 100644 --- a/config/GZLJ01/rels/d_a_tag_island/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_island/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_island.cpp: +d/actor/d_a_tag_island.cpp: .text start:0x00000078 end:0x000013D8 .text start:0x000013D8 end:0x000013D8 .rodata start:0x00000000 end:0x0000011E diff --git a/config/GZLJ01/rels/d_a_tag_kb_item/splits.txt b/config/GZLJ01/rels/d_a_tag_kb_item/splits.txt index 222e65c..4817602 100644 --- a/config/GZLJ01/rels/d_a_tag_kb_item/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_kb_item/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_kb_item.cpp: +d/actor/d_a_tag_kb_item.cpp: .text start:0x00000078 end:0x00000294 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_tag_kf1/splits.txt b/config/GZLJ01/rels/d_a_tag_kf1/splits.txt index 2a616fa..5008033 100644 --- a/config/GZLJ01/rels/d_a_tag_kf1/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_kf1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_kf1.cpp: +d/actor/d_a_tag_kf1.cpp: .text start:0x000000EC end:0x0000127C .text start:0x0000127C end:0x00001290 .text start:0x00001290 end:0x00001308 diff --git a/config/GZLJ01/rels/d_a_tag_kk1/splits.txt b/config/GZLJ01/rels/d_a_tag_kk1/splits.txt index 856b4a1..367f15e 100644 --- a/config/GZLJ01/rels/d_a_tag_kk1/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_kk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_kk1.cpp: +d/actor/d_a_tag_kk1.cpp: .text start:0x000000EC end:0x000007C0 .text start:0x000007C0 end:0x000008C0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_tag_light/splits.txt b/config/GZLJ01/rels/d_a_tag_light/splits.txt index c59a507..bc67939 100644 --- a/config/GZLJ01/rels/d_a_tag_light/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_light/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_light.cpp: +d/actor/d_a_tag_light.cpp: .text start:0x00000078 end:0x00002038 .text start:0x00002038 end:0x000020A4 .rodata start:0x00000000 end:0x00000128 diff --git a/config/GZLJ01/rels/d_a_tag_md_cb/splits.txt b/config/GZLJ01/rels/d_a_tag_md_cb/splits.txt index 289f265..150f73d 100644 --- a/config/GZLJ01/rels/d_a_tag_md_cb/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_md_cb/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_md_cb.cpp: +d/actor/d_a_tag_md_cb.cpp: .text start:0x000000EC end:0x00001B88 .text start:0x00001B88 end:0x00001B88 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_tag_mk/splits.txt b/config/GZLJ01/rels/d_a_tag_mk/splits.txt index 0326d8d..eeafc56 100644 --- a/config/GZLJ01/rels/d_a_tag_mk/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_mk/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_mk.cpp: +d/actor/d_a_tag_mk.cpp: .text start:0x00000078 end:0x000011E4 .rodata start:0x00000000 end:0x00000093 .data start:0x00000000 end:0x000000BC diff --git a/config/GZLJ01/rels/d_a_tag_msg/splits.txt b/config/GZLJ01/rels/d_a_tag_msg/splits.txt index 9fd4638..4858dde 100644 --- a/config/GZLJ01/rels/d_a_tag_msg/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_msg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_msg.cpp: +d/actor/d_a_tag_msg.cpp: .text start:0x00000078 end:0x00000964 .rodata start:0x00000000 end:0x00000046 .data start:0x00000000 end:0x00000060 diff --git a/config/GZLJ01/rels/d_a_tag_photo/splits.txt b/config/GZLJ01/rels/d_a_tag_photo/splits.txt index 22e7671..5ce0228 100644 --- a/config/GZLJ01/rels/d_a_tag_photo/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_photo/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_photo.cpp: +d/actor/d_a_tag_photo.cpp: .text start:0x00000078 end:0x000009B0 .text start:0x000009B0 end:0x00000A0C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_tag_ret/splits.txt b/config/GZLJ01/rels/d_a_tag_ret/splits.txt index 2029c27..1bec23c 100644 --- a/config/GZLJ01/rels/d_a_tag_ret/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_ret/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_ret.cpp: +d/actor/d_a_tag_ret.cpp: .text start:0x00000078 end:0x000005E4 .text start:0x000005E4 end:0x00000610 .rodata start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_tag_so/splits.txt b/config/GZLJ01/rels/d_a_tag_so/splits.txt index 2c07a38..5d83bb4 100644 --- a/config/GZLJ01/rels/d_a_tag_so/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_so/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_so.cpp: +d/actor/d_a_tag_so.cpp: .text start:0x000000EC end:0x0000039C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000018 diff --git a/config/GZLJ01/rels/d_a_tag_volcano/splits.txt b/config/GZLJ01/rels/d_a_tag_volcano/splits.txt index 7238871..ea418ba 100644 --- a/config/GZLJ01/rels/d_a_tag_volcano/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_volcano/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_volcano.cpp: +d/actor/d_a_tag_volcano.cpp: .text start:0x00000078 end:0x000009A4 .text start:0x000009A4 end:0x000009C0 .rodata start:0x00000000 end:0x00000058 diff --git a/config/GZLJ01/rels/d_a_tag_waterlevel/splits.txt b/config/GZLJ01/rels/d_a_tag_waterlevel/splits.txt index 4e97882..7687a03 100644 --- a/config/GZLJ01/rels/d_a_tag_waterlevel/splits.txt +++ b/config/GZLJ01/rels/d_a_tag_waterlevel/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_waterlevel.cpp: +d/actor/d_a_tag_waterlevel.cpp: .text start:0x00000078 end:0x00000400 .text start:0x00000400 end:0x0000041C .rodata start:0x00000000 end:0x00000024 diff --git a/config/GZLJ01/rels/d_a_tama/splits.txt b/config/GZLJ01/rels/d_a_tama/splits.txt index c0df796..b8d8e35 100644 --- a/config/GZLJ01/rels/d_a_tama/splits.txt +++ b/config/GZLJ01/rels/d_a_tama/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tama.cpp: +d/actor/d_a_tama.cpp: .text start:0x00000078 end:0x000007C8 .rodata start:0x00000000 end:0x00000010 .data start:0x00000000 end:0x000001A8 diff --git a/config/GZLJ01/rels/d_a_tbox/splits.txt b/config/GZLJ01/rels/d_a_tbox/splits.txt index c88ba79..f965722 100644 --- a/config/GZLJ01/rels/d_a_tbox/splits.txt +++ b/config/GZLJ01/rels/d_a_tbox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tbox.cpp: +d/actor/d_a_tbox.cpp: .text start:0x000000EC end:0x00003A88 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000015C diff --git a/config/GZLJ01/rels/d_a_title/splits.txt b/config/GZLJ01/rels/d_a_title/splits.txt index e3b9401..63a452c 100644 --- a/config/GZLJ01/rels/d_a_title/splits.txt +++ b/config/GZLJ01/rels/d_a_title/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_title.cpp: +d/actor/d_a_title.cpp: .text start:0x00000078 end:0x00001E38 .text start:0x00001E38 end:0x00001E5C .rodata start:0x00000000 end:0x000001DD diff --git a/config/GZLJ01/rels/d_a_tn/splits.txt b/config/GZLJ01/rels/d_a_tn/splits.txt index 5234cd0..48950fe 100644 --- a/config/GZLJ01/rels/d_a_tn/splits.txt +++ b/config/GZLJ01/rels/d_a_tn/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tn.cpp: +d/actor/d_a_tn.cpp: .text start:0x000000EC end:0x0000DBC4 .text start:0x0000DBC4 end:0x0000DBC4 .text start:0x0000DBC4 end:0x0000DC84 diff --git a/config/GZLJ01/rels/d_a_toge/splits.txt b/config/GZLJ01/rels/d_a_toge/splits.txt index f11c82c..10d5a18 100644 --- a/config/GZLJ01/rels/d_a_toge/splits.txt +++ b/config/GZLJ01/rels/d_a_toge/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_toge.cpp: +d/actor/d_a_toge.cpp: .text start:0x00000078 end:0x00000EE4 .rodata start:0x00000000 end:0x0000006A .data start:0x00000000 end:0x00000188 diff --git a/config/GZLJ01/rels/d_a_tori_flag/splits.txt b/config/GZLJ01/rels/d_a_tori_flag/splits.txt index 9c13338..fb0b79a 100644 --- a/config/GZLJ01/rels/d_a_tori_flag/splits.txt +++ b/config/GZLJ01/rels/d_a_tori_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tori_flag.cpp: +d/actor/d_a_tori_flag.cpp: .text start:0x000000EC end:0x00000D74 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000007C diff --git a/config/GZLJ01/rels/d_a_tornado/splits.txt b/config/GZLJ01/rels/d_a_tornado/splits.txt index 4c8c115..6878d93 100644 --- a/config/GZLJ01/rels/d_a_tornado/splits.txt +++ b/config/GZLJ01/rels/d_a_tornado/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tornado.cpp: +d/actor/d_a_tornado.cpp: .text start:0x000000EC end:0x0000164C .rodata start:0x00000000 end:0x000000DC .data start:0x00000000 end:0x00000088 diff --git a/config/GZLJ01/rels/d_a_tpota/splits.txt b/config/GZLJ01/rels/d_a_tpota/splits.txt index 674a456..fb7b612 100644 --- a/config/GZLJ01/rels/d_a_tpota/splits.txt +++ b/config/GZLJ01/rels/d_a_tpota/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tpota.cpp: +d/actor/d_a_tpota.cpp: .text start:0x00000078 end:0x00000564 .rodata start:0x00000000 end:0x0000000C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLJ01/rels/d_a_tsubo/splits.txt b/config/GZLJ01/rels/d_a_tsubo/splits.txt index 63bf759..67054df 100644 --- a/config/GZLJ01/rels/d_a_tsubo/splits.txt +++ b/config/GZLJ01/rels/d_a_tsubo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tsubo.cpp: +d/actor/d_a_tsubo.cpp: .text start:0x000000EC end:0x00008100 .text start:0x00008100 end:0x00008100 .text start:0x00008100 end:0x00008194 diff --git a/config/GZLJ01/rels/d_a_wall/splits.txt b/config/GZLJ01/rels/d_a_wall/splits.txt index 0c83ca6..28e425e 100644 --- a/config/GZLJ01/rels/d_a_wall/splits.txt +++ b/config/GZLJ01/rels/d_a_wall/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wall.cpp: +d/actor/d_a_wall.cpp: .text start:0x00000078 end:0x000012D4 .rodata start:0x00000000 end:0x00000144 .data start:0x00000000 end:0x00000268 diff --git a/config/GZLJ01/rels/d_a_warpdm20/splits.txt b/config/GZLJ01/rels/d_a_warpdm20/splits.txt index 48a882e..66a0202 100644 --- a/config/GZLJ01/rels/d_a_warpdm20/splits.txt +++ b/config/GZLJ01/rels/d_a_warpdm20/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpdm20.cpp: +d/actor/d_a_warpdm20.cpp: .text start:0x00000078 end:0x00001A40 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000F5 diff --git a/config/GZLJ01/rels/d_a_warpf/splits.txt b/config/GZLJ01/rels/d_a_warpf/splits.txt index 089bc0c..3cc81e1 100644 --- a/config/GZLJ01/rels/d_a_warpf/splits.txt +++ b/config/GZLJ01/rels/d_a_warpf/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpf.cpp: +d/actor/d_a_warpf.cpp: .text start:0x00000078 end:0x00002638 .text start:0x00002638 end:0x00002638 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_warpfout/splits.txt b/config/GZLJ01/rels/d_a_warpfout/splits.txt index 4ba4781..de43b6d 100644 --- a/config/GZLJ01/rels/d_a_warpfout/splits.txt +++ b/config/GZLJ01/rels/d_a_warpfout/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpfout.cpp: +d/actor/d_a_warpfout.cpp: .text start:0x00000078 end:0x00000808 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000037 diff --git a/config/GZLJ01/rels/d_a_warpgn/splits.txt b/config/GZLJ01/rels/d_a_warpgn/splits.txt index 973aa9b..84893c4 100644 --- a/config/GZLJ01/rels/d_a_warpgn/splits.txt +++ b/config/GZLJ01/rels/d_a_warpgn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpgn.cpp: +d/actor/d_a_warpgn.cpp: .text start:0x00000078 end:0x00001BCC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000DF diff --git a/config/GZLJ01/rels/d_a_warphr/splits.txt b/config/GZLJ01/rels/d_a_warphr/splits.txt index 484fc48..87b8641 100644 --- a/config/GZLJ01/rels/d_a_warphr/splits.txt +++ b/config/GZLJ01/rels/d_a_warphr/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_warphr.cpp: +d/actor/d_a_warphr.cpp: .text start:0x000000EC end:0x00001720 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000EE diff --git a/config/GZLJ01/rels/d_a_warpls/splits.txt b/config/GZLJ01/rels/d_a_warpls/splits.txt index 328a64d..33d5bd7 100644 --- a/config/GZLJ01/rels/d_a_warpls/splits.txt +++ b/config/GZLJ01/rels/d_a_warpls/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpls.cpp: +d/actor/d_a_warpls.cpp: .text start:0x00000078 end:0x000012B4 .rodata start:0x00000000 end:0x000000D8 .data start:0x00000000 end:0x0000007C diff --git a/config/GZLJ01/rels/d_a_warpmj/splits.txt b/config/GZLJ01/rels/d_a_warpmj/splits.txt index 877edd4..5b18f08 100644 --- a/config/GZLJ01/rels/d_a_warpmj/splits.txt +++ b/config/GZLJ01/rels/d_a_warpmj/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpmj.cpp: +d/actor/d_a_warpmj.cpp: .text start:0x00000078 end:0x00001398 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000B8 diff --git a/config/GZLJ01/rels/d_a_waterfall/splits.txt b/config/GZLJ01/rels/d_a_waterfall/splits.txt index 07d394d..7291a9d 100644 --- a/config/GZLJ01/rels/d_a_waterfall/splits.txt +++ b/config/GZLJ01/rels/d_a_waterfall/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_waterfall.cpp: +d/actor/d_a_waterfall.cpp: .text start:0x00000078 end:0x00001994 .rodata start:0x00000000 end:0x000000AC .data start:0x00000000 end:0x000001C4 diff --git a/config/GZLJ01/rels/d_a_wbird/splits.txt b/config/GZLJ01/rels/d_a_wbird/splits.txt index dc25d25..68f4b40 100644 --- a/config/GZLJ01/rels/d_a_wbird/splits.txt +++ b/config/GZLJ01/rels/d_a_wbird/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wbird.cpp: +d/actor/d_a_wbird.cpp: .text start:0x00000078 end:0x00000928 .text start:0x00000928 end:0x00000928 .rodata start:0x00000000 end:0x00000063 diff --git a/config/GZLJ01/rels/d_a_wind_tag/splits.txt b/config/GZLJ01/rels/d_a_wind_tag/splits.txt index 46152d5..8d35ac8 100644 --- a/config/GZLJ01/rels/d_a_wind_tag/splits.txt +++ b/config/GZLJ01/rels/d_a_wind_tag/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wind_tag.cpp: +d/actor/d_a_wind_tag.cpp: .text start:0x00000078 end:0x00001CC8 .rodata start:0x00000000 end:0x0000008D .data start:0x00000000 end:0x00000208 diff --git a/config/GZLJ01/rels/d_a_windmill/splits.txt b/config/GZLJ01/rels/d_a_windmill/splits.txt index b1266d6..cafe8ee 100644 --- a/config/GZLJ01/rels/d_a_windmill/splits.txt +++ b/config/GZLJ01/rels/d_a_windmill/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_windmill.cpp: +d/actor/d_a_windmill.cpp: .text start:0x00000078 end:0x00001AFC .rodata start:0x00000000 end:0x000000B7 .data start:0x00000000 end:0x00000398 diff --git a/config/GZLJ01/rels/d_a_wz/splits.txt b/config/GZLJ01/rels/d_a_wz/splits.txt index f49a10d..475a561 100644 --- a/config/GZLJ01/rels/d_a_wz/splits.txt +++ b/config/GZLJ01/rels/d_a_wz/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wz.cpp: +d/actor/d_a_wz.cpp: .text start:0x00000078 end:0x00007BD0 .text start:0x00007BD0 end:0x00007BD0 .rodata start:0x00000000 end:0x00000186 diff --git a/config/GZLJ01/rels/d_a_ygcwp/splits.txt b/config/GZLJ01/rels/d_a_ygcwp/splits.txt index 8e7f94f..98f7ccf 100644 --- a/config/GZLJ01/rels/d_a_ygcwp/splits.txt +++ b/config/GZLJ01/rels/d_a_ygcwp/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ygcwp.cpp: +d/actor/d_a_ygcwp.cpp: .text start:0x00000078 end:0x00000970 .rodata start:0x00000000 end:0x000000A2 .data start:0x00000000 end:0x00000074 diff --git a/config/GZLJ01/rels/d_a_ykgr/splits.txt b/config/GZLJ01/rels/d_a_ykgr/splits.txt index 8b6abcf..e6296ce 100644 --- a/config/GZLJ01/rels/d_a_ykgr/splits.txt +++ b/config/GZLJ01/rels/d_a_ykgr/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ykgr.cpp: +d/actor/d_a_ykgr.cpp: .text start:0x000000EC end:0x000009A0 .text start:0x000009A0 end:0x00000B54 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/rels/d_a_yougan/splits.txt b/config/GZLJ01/rels/d_a_yougan/splits.txt index 3af3df9..34570cc 100644 --- a/config/GZLJ01/rels/d_a_yougan/splits.txt +++ b/config/GZLJ01/rels/d_a_yougan/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_yougan.cpp: +d/actor/d_a_yougan.cpp: .text start:0x000000EC end:0x00000A4C .text start:0x00000A4C end:0x00000C1C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLJ01/splits.txt b/config/GZLJ01/splits.txt index 0d2351b..9a909c2 100644 --- a/config/GZLJ01/splits.txt +++ b/config/GZLJ01/splits.txt @@ -403,7 +403,7 @@ d/d_stage.cpp: .sbss start:0x803E9F40 end:0x803E9F58 .sdata2 start:0x803EB640 end:0x803EB670 -d/map/d_map.cpp: +d/d_map.cpp: .text start:0x80043408 end:0x8004F608 .text start:0x8004F608 end:0x8004FF90 .ctors start:0x803360B4 end:0x803360B8 @@ -414,7 +414,7 @@ d/map/d_map.cpp: .sdata2 start:0x803EB670 end:0x803EB7C0 .sbss2 start:0x803F0408 end:0x803F0410 -d/com/d_com_inf_game.cpp: +d/d_com_inf_game.cpp: .text start:0x8004FF90 end:0x800543FC .ctors start:0x803360B8 end:0x803360BC .rodata start:0x80342F90 end:0x80343130 @@ -423,10 +423,10 @@ d/com/d_com_inf_game.cpp: .sdata start:0x803E9688 end:0x803E9698 .sdata2 start:0x803EB7C0 end:0x803EB7D8 -d/com/d_com_lib_game.cpp: +d/d_com_lib_game.cpp: .text start:0x800543FC end:0x8005445C -d/com/d_com_static.cpp: +d/d_com_static.cpp: .text start:0x8005445C end:0x80054DF8 .ctors start:0x803360BC end:0x803360C0 .rodata start:0x80343130 end:0x803431B0 @@ -442,7 +442,7 @@ d/d_lib.cpp: .data start:0x803691A8 end:0x803691D8 .sdata2 start:0x803EB820 end:0x803EB850 -d/save/d_save.cpp: +d/d_save.cpp: .text start:0x800567A0 end:0x8005CDCC .rodata start:0x80343238 end:0x803435E8 .data start:0x803691D8 end:0x80369298 @@ -451,7 +451,7 @@ d/save/d_save.cpp: .sbss start:0x803EA058 end:0x803EA060 .sdata2 start:0x803EB850 end:0x803EB860 -d/save/d_save_init.cpp: +d/d_save_init.cpp: .text start:0x8005CDCC end:0x8005CE20 d/d_shop.cpp: @@ -481,7 +481,7 @@ d/d_cloth_packet.cpp: .sbss start:0x803EA060 end:0x803EA070 .sdata2 start:0x803EB8F8 end:0x803EB980 -d/a/d_a_obj.cpp: +d/actor/d_a_obj.cpp: .text start:0x80064520 end:0x80065B50 .rodata start:0x80343618 end:0x803436B8 .data start:0x8036A458 end:0x8036A4B8 @@ -489,52 +489,52 @@ d/a/d_a_obj.cpp: .sbss start:0x803EA070 end:0x803EA078 .sdata2 start:0x803EB980 end:0x803EB9E8 -d/a/d_a_obj_tribox_static.cpp: +d/actor/d_a_obj_tribox_static.cpp: .text start:0x80065B50 end:0x80065BC8 .ctors start:0x803360C4 end:0x803360C8 .bss start:0x803D5420 end:0x803D5438 .sbss start:0x803EA078 end:0x803EA090 -d/a/d_a_ship_static.cpp: +d/actor/d_a_ship_static.cpp: .text start:0x80065BC8 end:0x80065CAC .sdata2 start:0x803EB9E8 end:0x803EB9F0 -d/a/d_a_boko_static.cpp: +d/actor/d_a_boko_static.cpp: .text start:0x80065CAC end:0x80065DD4 .data start:0x8036A4B8 end:0x8036A608 .sdata start:0x803E96C8 end:0x803E96D0 -d/a/d_a_bomb_static.cpp: +d/actor/d_a_bomb_static.cpp: .text start:0x80065DD4 end:0x80066328 .text start:0x80066328 end:0x80066344 .rodata start:0x803436B8 end:0x803436F0 -d/a/d_a_branch_static.cpp: +d/actor/d_a_branch_static.cpp: .text start:0x80066344 end:0x8006642C .rodata start:0x803436F0 end:0x80343720 -d/a/d_a_mgameboard_static.cpp: +d/actor/d_a_mgameboard_static.cpp: .text start:0x8006642C end:0x80066484 -d/a/d_a_itembase_static.cpp: +d/actor/d_a_itembase_static.cpp: .text start:0x80066484 end:0x80066654 .rodata start:0x80343720 end:0x80343770 -d/a/d_a_item_static.cpp: +d/actor/d_a_item_static.cpp: .text start:0x80066654 end:0x80066824 .sdata2 start:0x803EB9F0 end:0x803EB9F8 -d/a/d_a_shop_item_static.cpp: +d/actor/d_a_shop_item_static.cpp: .text start:0x80066824 end:0x8006688C .rodata start:0x80343770 end:0x80345850 .sdata2 start:0x803EB9F8 end:0x803EBA08 -d/a/d_a_race_item_static.cpp: +d/actor/d_a_race_item_static.cpp: .text start:0x8006688C end:0x80066F18 .data start:0x8036A608 end:0x8036A6C8 .sdata2 start:0x803EBA08 end:0x803EBA10 -d/a/d_a_leaflift_static.cpp: +d/actor/d_a_leaflift_static.cpp: .text start:0x80066F18 end:0x800670F8 .sdata2 start:0x803EBA10 end:0x803EBA38 @@ -573,7 +573,7 @@ d/d_event.cpp: .data start:0x8036AA90 end:0x8036AAC8 .sdata2 start:0x803EBAF8 end:0x803EBB08 -d/event/d_event_data.cpp: +d/d_event_data.cpp: .text start:0x8006F5AC end:0x80071610 .rodata start:0x80346028 end:0x80346288 .data start:0x8036AAC8 end:0x8036AC50 @@ -581,7 +581,7 @@ d/event/d_event_data.cpp: .sbss start:0x803EA0B0 end:0x803EA0C0 .sdata2 start:0x803EBB08 end:0x803EBB30 -d/event/d_event_manager.cpp: +d/d_event_manager.cpp: .text start:0x80071610 end:0x800733D8 .rodata start:0x80346288 end:0x80346410 .data start:0x8036AC50 end:0x8036ACA0 @@ -621,7 +621,7 @@ d/d_tree.cpp: .sbss start:0x803EA0D8 end:0x803EA0E0 .sdata2 start:0x803EBCA8 end:0x803EBD38 -d/particle/d_particle.cpp: +d/d_particle.cpp: .text start:0x800782B0 end:0x8007DDE8 .ctors start:0x803360D4 end:0x803360D8 .rodata start:0x803464E0 end:0x80346618 @@ -631,7 +631,7 @@ d/particle/d_particle.cpp: .sdata2 start:0x803EBD38 end:0x803EBDA8 .sbss2 start:0x803F0410 end:0x803F0418 -d/particle/d_particle_name.cpp: +d/d_particle_name.cpp: .text start:0x8007DDE8 end:0x8007DDE8 .data start:0x8036EAD0 end:0x8036EB40 @@ -651,11 +651,11 @@ d/d_drawlist.cpp: .sbss start:0x803EA118 end:0x803EA130 .sdata2 start:0x803EBDB0 end:0x803EBE88 -d/kankyo/d_kankyo_data.cpp: +d/d_kankyo_data.cpp: .text start:0x80084C88 end:0x80084D1C .data start:0x803701C8 end:0x80370788 -d/kankyo/d_kankyo_wether.cpp: +d/d_kankyo_wether.cpp: .text start:0x80084D1C end:0x800887D8 .rodata start:0x803466F0 end:0x803467E8 .data start:0x80370788 end:0x80370878 @@ -663,7 +663,7 @@ d/kankyo/d_kankyo_wether.cpp: .sbss start:0x803EA130 end:0x803EA138 .sdata2 start:0x803EBE88 end:0x803EBF50 -d/kankyo/d_kankyo_rain.cpp: +d/d_kankyo_rain.cpp: .text start:0x800887D8 end:0x80099AF0 .text start:0x80099AF0 end:0x80099B38 .rodata start:0x803467E8 end:0x80346A30 @@ -673,7 +673,7 @@ d/kankyo/d_kankyo_rain.cpp: .sbss start:0x803EA138 end:0x803EA178 .sdata2 start:0x803EBF50 end:0x803EC308 -d/kankyo/d_kankyo_demo.cpp: +d/d_kankyo_demo.cpp: .text start:0x80099B38 end:0x80099CA8 .sdata2 start:0x803EC308 end:0x803EC320 @@ -706,7 +706,7 @@ d/d_att_dist.cpp: .text start:0x8009DF44 end:0x8009DF44 .data start:0x80370988 end:0x80371DE0 -d/bg/d_bg_s.cpp: +d/d_bg_s.cpp: .text start:0x8009DF44 end:0x800A0224 .text start:0x800A0224 end:0x800A0224 .text start:0x800A0224 end:0x800A0224 @@ -726,7 +726,7 @@ d/bg/d_bg_s.cpp: .data start:0x80371DE0 end:0x80371E78 .sdata2 start:0x803EC3B0 end:0x803EC3D0 -d/bg/d_bg_s_acch.cpp: +d/d_bg_s_acch.cpp: .text start:0x800A0250 end:0x800A201C .text start:0x800A201C end:0x800A2078 .text start:0x800A2078 end:0x800A20C0 @@ -752,7 +752,7 @@ d/bg/d_bg_s_acch.cpp: .data start:0x80371E78 end:0x80371EF0 .sdata2 start:0x803EC3D0 end:0x803EC408 -d/bg/d_bg_s_func.cpp: +d/d_bg_s_func.cpp: .text start:0x800A2238 end:0x800A31CC .text start:0x800A31CC end:0x800A3334 .text start:0x800A3334 end:0x800A3334 @@ -768,16 +768,16 @@ d/bg/d_bg_s_func.cpp: .data start:0x80371EF0 end:0x80371F20 .sdata2 start:0x803EC408 end:0x803EC410 -d/bg/d_bg_s_lin_chk.cpp: +d/d_bg_s_lin_chk.cpp: .text start:0x800A334C end:0x800A338C -d/bg/d_bg_s_movebg_actor.cpp: +d/d_bg_s_movebg_actor.cpp: .text start:0x800A338C end:0x800A3710 .text start:0x800A3710 end:0x800A3750 .data start:0x80371F20 end:0x80371F48 .sbss start:0x803EA180 end:0x803EA190 -d/bg/d_bg_s_spl_grp_chk.cpp: +d/d_bg_s_spl_grp_chk.cpp: .text start:0x800A3750 end:0x800A38B0 .text start:0x800A38B0 end:0x800A38B0 .text start:0x800A38B0 end:0x800A38B0 @@ -789,7 +789,7 @@ d/bg/d_bg_s_spl_grp_chk.cpp: .text start:0x800A38B0 end:0x800A38B0 .sdata2 start:0x803EC410 end:0x803EC418 -d/bg/d_bg_s_wtr_chk.cpp: +d/d_bg_s_wtr_chk.cpp: .text start:0x800A38B0 end:0x800A3910 .text start:0x800A3910 end:0x800A3910 .text start:0x800A3910 end:0x800A3910 @@ -800,7 +800,7 @@ d/bg/d_bg_s_wtr_chk.cpp: .text start:0x800A3910 end:0x800A3910 .text start:0x800A3910 end:0x800A3910 -d/bg/d_bg_w.cpp: +d/d_bg_w.cpp: .text start:0x800A3910 end:0x800A7540 .text start:0x800A7540 end:0x800A759C .text start:0x800A759C end:0x800A759C @@ -810,11 +810,11 @@ d/bg/d_bg_w.cpp: .data start:0x80371F48 end:0x80371F88 .sdata2 start:0x803EC418 end:0x803EC448 -d/bg/d_bg_w_deform.cpp: +d/d_bg_w_deform.cpp: .text start:0x800A75FC end:0x800A771C .rodata start:0x80347540 end:0x80347598 -d/bg/d_bg_w_hf.cpp: +d/d_bg_w_hf.cpp: .text start:0x800A771C end:0x800A8390 .text start:0x800A8390 end:0x800A8410 .text start:0x800A8410 end:0x800A8414 @@ -822,14 +822,14 @@ d/bg/d_bg_w_hf.cpp: .data start:0x80371F88 end:0x80371FB8 .sdata2 start:0x803EC448 end:0x803EC458 -d/bg/d_bg_w_sv.cpp: +d/d_bg_w_sv.cpp: .text start:0x800A8414 end:0x800A8A54 .text start:0x800A8A54 end:0x800A8A54 .text start:0x800A8A54 end:0x800A8AC4 .data start:0x80371FB8 end:0x80371FE8 .sdata2 start:0x803EC458 end:0x803EC460 -d/cc/d_cc_d.cpp: +d/d_cc_d.cpp: .text start:0x800A8AC4 end:0x800A97F8 .text start:0x800A97F8 end:0x800A9CA4 .text start:0x800A9CA4 end:0x800A9F20 @@ -837,7 +837,7 @@ d/cc/d_cc_d.cpp: .rodata start:0x803475D8 end:0x803475F8 .data start:0x80371FE8 end:0x80372108 -d/cc/d_cc_mass_s.cpp: +d/d_cc_mass_s.cpp: .text start:0x800A9F20 end:0x800AAB08 .text start:0x800AAB08 end:0x800AACA4 .text start:0x800AACA4 end:0x800AACA4 @@ -849,7 +849,7 @@ d/cc/d_cc_mass_s.cpp: .rodata start:0x803475F8 end:0x80347628 .sdata2 start:0x803EC460 end:0x803EC478 -d/cc/d_cc_s.cpp: +d/d_cc_s.cpp: .text start:0x800AACC0 end:0x800ABFAC .text start:0x800ABFAC end:0x800ABFAC .text start:0x800ABFAC end:0x800ABFAC @@ -864,7 +864,7 @@ d/cc/d_cc_s.cpp: .data start:0x80372108 end:0x803721B8 .sdata2 start:0x803EC478 end:0x803EC4A0 -d/cc/d_cc_uty.cpp: +d/d_cc_uty.cpp: .text start:0x800AC048 end:0x800ACA78 .text start:0x800ACA78 end:0x800ACA94 .sdata2 start:0x803EC4A0 end:0x803EC4C8 @@ -935,7 +935,7 @@ d/d_spline_path.cpp: .text start:0x800BFDC0 end:0x800BFDC0 .sdata2 start:0x803EC928 end:0x803EC938 -d/s/d_s_actor_data_mng.cpp: +d/d_s_actor_data_mng.cpp: .text start:0x800BFDC0 end:0x800C04E8 .rodata start:0x8034DFA0 end:0x8034E0B8 .data start:0x8037BD58 end:0x8037BD68 @@ -952,11 +952,11 @@ d/d_2dnumber.cpp: .data start:0x8037C568 end:0x8037C5D8 .sdata2 start:0x803EC950 end:0x803EC9D0 -d/a/d_a_npc_cb1_static.cpp: +d/actor/d_a_npc_cb1_static.cpp: .text start:0x800C855C end:0x800C8564 .sbss start:0x803EA330 end:0x803EA338 -d/a/d_a_npc_mk_static.cpp: +d/actor/d_a_npc_mk_static.cpp: .text start:0x800C8564 end:0x800C96CC .sdata2 start:0x803EC9D0 end:0x803ECA28 @@ -983,7 +983,7 @@ d/d_point_wind.cpp: .rodata start:0x8034ED28 end:0x8034ED30 .sdata2 start:0x803ECA98 end:0x803ECAC8 -d/a/d_a_agb.cpp: +d/actor/d_a_agb.cpp: .text start:0x800CC578 end:0x800D1638 .text start:0x800D1638 end:0x800D1640 .ctors start:0x803360EC end:0x803360F0 @@ -993,7 +993,7 @@ d/a/d_a_agb.cpp: .sbss start:0x803EA338 end:0x803EA348 .sdata2 start:0x803ECAC8 end:0x803ECB88 -d/a/d_a_arrow.cpp: +d/actor/d_a_arrow.cpp: .text start:0x800D1640 end:0x800D5510 .rodata start:0x8034EDE8 end:0x8034EEF0 .data start:0x8037CF28 end:0x8037D328 @@ -1001,14 +1001,14 @@ d/a/d_a_arrow.cpp: .sbss start:0x803EA348 end:0x803EA350 .sdata2 start:0x803ECB88 end:0x803ECC50 -d/a/d_a_bg.cpp: +d/actor/d_a_bg.cpp: .text start:0x800D5510 end:0x800D63B4 .rodata start:0x8034EEF0 end:0x8034EF28 .data start:0x8037D328 end:0x8037D450 .bss start:0x803D6B58 end:0x803D6B78 .sdata2 start:0x803ECC50 end:0x803ECC68 -d/a/d_a_bomb.cpp: +d/actor/d_a_bomb.cpp: .text start:0x800D63B4 end:0x800D63B4 .text start:0x800D63B4 end:0x800DA228 .text start:0x800DA228 end:0x800DA228 @@ -1020,7 +1020,7 @@ d/a/d_a_bomb.cpp: .sdata2 start:0x803ECC68 end:0x803ECD58 .sbss2 start:0x803F0418 end:0x803F0420 -d/a/d_a_bomb2.cpp: +d/actor/d_a_bomb2.cpp: .text start:0x800DA400 end:0x800DDB8C .text start:0x800DDB8C end:0x800DDC64 .text start:0x800DDC64 end:0x800DDC64 @@ -1032,7 +1032,7 @@ d/a/d_a_bomb2.cpp: .sdata2 start:0x803ECD58 end:0x803ECE08 .sbss2 start:0x803F0420 end:0x803F0428 -d/a/d_a_boomerang.cpp: +d/actor/d_a_boomerang.cpp: .text start:0x800DDC80 end:0x800E04FC .text start:0x800E04FC end:0x800E0504 .text start:0x800E0504 end:0x800E0568 @@ -1045,7 +1045,7 @@ d/a/d_a_boomerang.cpp: .sbss start:0x803EA360 end:0x803EA368 .sdata2 start:0x803ECE08 end:0x803ECEA8 -d/a/d_a_dai_item.cpp: +d/actor/d_a_dai_item.cpp: .text start:0x800E0690 end:0x800E299C .ctors start:0x803360F4 end:0x803360F8 .rodata start:0x8034F108 end:0x8034F258 @@ -1055,18 +1055,18 @@ d/a/d_a_dai_item.cpp: .sbss start:0x803EA368 end:0x803EA370 .sdata2 start:0x803ECEA8 end:0x803ECF18 -d/a/d_a_demo00.cpp: +d/actor/d_a_demo00.cpp: .text start:0x800E299C end:0x800E49B0 .rodata start:0x8034F258 end:0x8034F370 .data start:0x8037E6B8 end:0x8037E760 .sdata2 start:0x803ECF18 end:0x803ECF60 -d/a/d_a_disappear.cpp: +d/actor/d_a_disappear.cpp: .text start:0x800E49B0 end:0x800E4E50 .data start:0x8037E760 end:0x8037E7F8 .sdata2 start:0x803ECF60 end:0x803ECF78 -d/a/d_a_esa.cpp: +d/actor/d_a_esa.cpp: .text start:0x800E4E50 end:0x800E5C94 .text start:0x800E5C94 end:0x800E5CB0 .rodata start:0x8034F370 end:0x8034F3A0 @@ -1075,7 +1075,7 @@ d/a/d_a_esa.cpp: .sbss start:0x803EA370 end:0x803EA378 .sdata2 start:0x803ECF78 end:0x803ECFF0 -d/a/d_a_grid.cpp: +d/actor/d_a_grid.cpp: .text start:0x800E5CB0 end:0x800E84D0 .text start:0x800E84D0 end:0x800E8588 .text start:0x800E8588 end:0x800E85BC @@ -1086,7 +1086,7 @@ d/a/d_a_grid.cpp: .sbss start:0x803EA378 end:0x803EA380 .sdata2 start:0x803ECFF0 end:0x803ED0F0 -d/a/d_a_himo2.cpp: +d/actor/d_a_himo2.cpp: .text start:0x800E85BC end:0x800EDB90 .text start:0x800EDB90 end:0x800EDC04 .text start:0x800EDC04 end:0x800EDC7C @@ -1099,7 +1099,7 @@ d/a/d_a_himo2.cpp: .sbss start:0x803EA380 end:0x803EA390 .sdata2 start:0x803ED0F0 end:0x803ED298 -d/a/d_a_hookshot.cpp: +d/actor/d_a_hookshot.cpp: .text start:0x800EE008 end:0x800F0134 .text start:0x800F0134 end:0x800F0168 .text start:0x800F0168 end:0x800F01C4 @@ -1108,14 +1108,14 @@ d/a/d_a_hookshot.cpp: .data start:0x8037F3C0 end:0x8037FBA0 .sdata2 start:0x803ED298 end:0x803ED2F0 -d/a/d_a_ib.cpp: +d/actor/d_a_ib.cpp: .text start:0x800F01C4 end:0x800F1B60 .rodata start:0x8034F400 end:0x8034F490 .data start:0x8037FBA0 end:0x8037FF40 .sbss start:0x803EA390 end:0x803EA398 .sdata2 start:0x803ED2F0 end:0x803ED348 -d/a/d_a_item.cpp: +d/actor/d_a_item.cpp: .text start:0x800F1B60 end:0x800F598C .text start:0x800F598C end:0x800F59A8 .rodata start:0x8034F490 end:0x8034F4A0 @@ -1124,13 +1124,13 @@ d/a/d_a_item.cpp: .sbss start:0x803EA398 end:0x803EA3A0 .sdata2 start:0x803ED348 end:0x803ED3C0 -d/a/d_a_itembase.cpp: +d/actor/d_a_itembase.cpp: .text start:0x800F59A8 end:0x800F654C .rodata start:0x8034F4A0 end:0x8034F508 .data start:0x803807C0 end:0x803807E8 .sdata2 start:0x803ED3C0 end:0x803ED3E0 -d/a/d_a_nh.cpp: +d/actor/d_a_nh.cpp: .text start:0x800F654C end:0x800F7F54 .ctors start:0x80336104 end:0x80336108 .rodata start:0x8034F508 end:0x8034F580 @@ -1139,7 +1139,7 @@ d/a/d_a_nh.cpp: .sbss start:0x803EA3A0 end:0x803EA3A8 .sdata2 start:0x803ED3E0 end:0x803ED420 -d/a/d_a_npc_fa1.cpp: +d/actor/d_a_npc_fa1.cpp: .text start:0x800F7F54 end:0x800FAA74 .text start:0x800FAA74 end:0x800FAA88 .ctors start:0x80336108 end:0x8033610C @@ -1149,7 +1149,7 @@ d/a/d_a_npc_fa1.cpp: .sbss start:0x803EA3A8 end:0x803EA3B8 .sdata2 start:0x803ED420 end:0x803ED488 -d/a/d_a_obj_search.cpp: +d/actor/d_a_obj_search.cpp: .text start:0x800FAA88 end:0x800FF878 .text start:0x800FF878 end:0x800FF878 .rodata start:0x8034F618 end:0x8034F798 @@ -1160,7 +1160,7 @@ d/a/d_a_obj_search.cpp: .sdata2 start:0x803ED488 end:0x803ED580 .sbss2 start:0x803F0428 end:0x803F0430 -d/a/d_a_player.cpp: +d/actor/d_a_player.cpp: .text start:0x800FF878 end:0x800FFD90 .text start:0x800FFD90 end:0x800FFD90 .text start:0x800FFD90 end:0x800FFE04 @@ -1168,7 +1168,7 @@ d/a/d_a_player.cpp: .data start:0x803812F0 end:0x80381320 .sdata2 start:0x803ED580 end:0x803ED5A8 -d/a/d_a_player_main.cpp: +d/actor/d_a_player_main.cpp: .text start:0x800FFE04 end:0x80125EAC .text start:0x80125EAC end:0x80129BB8 .text start:0x80129BB8 end:0x8012FD84 @@ -1207,14 +1207,14 @@ d/a/d_a_player_main.cpp: .sdata2 start:0x803ED5A8 end:0x803EDA70 .sbss2 start:0x803F0430 end:0x803F0438 -d/a/d_a_player_npc.cpp: +d/actor/d_a_player_npc.cpp: .text start:0x801570DC end:0x80157E04 .rodata start:0x80351A28 end:0x80351AC8 .bss start:0x803D7C10 end:0x803D7C28 .sbss start:0x803EA410 end:0x803EA418 .sdata2 start:0x803EDA70 end:0x803EDAA0 -d/a/d_a_sea.cpp: +d/actor/d_a_sea.cpp: .text start:0x80157E04 end:0x8015A6E8 .text start:0x8015A6E8 end:0x8015A7F8 .text start:0x8015A7F8 end:0x8015A840 @@ -1225,18 +1225,18 @@ d/a/d_a_sea.cpp: .sdata start:0x803E97A8 end:0x803E97B0 .sdata2 start:0x803EDAA0 end:0x803EDB30 -d/a/d_a_spc_item01.cpp: +d/actor/d_a_spc_item01.cpp: .text start:0x8015A840 end:0x8015B13C .data start:0x80383E20 end:0x80383ED8 .sdata2 start:0x803EDB30 end:0x803EDB60 -d/a/d_a_vrbox.cpp: +d/actor/d_a_vrbox.cpp: .text start:0x8015B13C end:0x8015B760 .rodata start:0x80351B00 end:0x80351B50 .data start:0x80383ED8 end:0x80383F28 .sdata2 start:0x803EDB60 end:0x803EDB68 -d/a/d_a_vrbox2.cpp: +d/actor/d_a_vrbox2.cpp: .text start:0x8015B760 end:0x8015C29C .rodata start:0x80351B50 end:0x80351BE0 .data start:0x80383F28 end:0x80383F78 @@ -1282,7 +1282,7 @@ d/d_envse.cpp: .sdata2 start:0x803EDE58 end:0x803EDE60 .sbss2 start:0x803F0438 end:0x803F0440 -d/file/d_file_error.cpp: +d/d_file_error.cpp: .text start:0x8017A578 end:0x8017C070 .text start:0x8017C070 end:0x8017C2A4 .ctors start:0x8033611C end:0x80336120 @@ -1292,7 +1292,7 @@ d/file/d_file_error.cpp: .sdata start:0x803E97B8 end:0x803E97C8 .sdata2 start:0x803EDE60 end:0x803EDEA8 -d/file/d_file_select.cpp: +d/d_file_select.cpp: .text start:0x8017C2A4 end:0x8018A708 .text start:0x8018A708 end:0x8018ABA4 .ctors start:0x80336120 end:0x80336124 @@ -1310,7 +1310,7 @@ d/d_gameover.cpp: .data start:0x80384FF0 end:0x80385058 .sdata2 start:0x803EDF10 end:0x803EDF60 -d/kankyo/d_kankyo.cpp: +d/d_kankyo.cpp: .text start:0x8018C194 end:0x801943B4 .text start:0x801943B4 end:0x801948CC .ctors start:0x80336124 end:0x80336128 @@ -1348,7 +1348,7 @@ d/d_level_se.cpp: .data start:0x80385430 end:0x80385480 .sdata2 start:0x803EE118 end:0x803EE120 -d/menu/d_menu_cloth.cpp: +d/d_menu_cloth.cpp: .text start:0x80195CF4 end:0x80198750 .ctors start:0x80336128 end:0x8033612C .rodata start:0x803525D0 end:0x80352610 @@ -1358,7 +1358,7 @@ d/menu/d_menu_cloth.cpp: .sdata2 start:0x803EE120 end:0x803EE1F0 .sbss2 start:0x803F0440 end:0x803F0448 -d/menu/d_menu_collect.cpp: +d/d_menu_collect.cpp: .text start:0x80198750 end:0x801A4C34 .text start:0x801A4C34 end:0x801A4C34 .text start:0x801A4C34 end:0x801A4C7C @@ -1369,7 +1369,7 @@ d/menu/d_menu_collect.cpp: .bss start:0x803D94B8 end:0x803D9528 .sdata2 start:0x803EE1F0 end:0x803EE298 -d/menu/d_menu_dmap.cpp: +d/d_menu_dmap.cpp: .text start:0x801A4E24 end:0x801AB778 .text start:0x801AB778 end:0x801AB778 .text start:0x801AB778 end:0x801AB8B0 @@ -1379,7 +1379,7 @@ d/menu/d_menu_dmap.cpp: .bss start:0x803D9528 end:0x803D9580 .sdata2 start:0x803EE298 end:0x803EE310 -d/menu/d_menu_fmap.cpp: +d/d_menu_fmap.cpp: .text start:0x801AB8B0 end:0x801B712C .text start:0x801B712C end:0x801B7488 .ctors start:0x80336134 end:0x80336138 @@ -1389,7 +1389,7 @@ d/menu/d_menu_fmap.cpp: .sdata start:0x803E97F8 end:0x803E9800 .sdata2 start:0x803EE310 end:0x803EE3D8 -d/menu/d_menu_fmap2.cpp: +d/d_menu_fmap2.cpp: .text start:0x801B7488 end:0x801C3420 .text start:0x801C3420 end:0x801C3420 .text start:0x801C3420 end:0x801C3660 @@ -1400,7 +1400,7 @@ d/menu/d_menu_fmap2.cpp: .sdata start:0x803E9800 end:0x803E9808 .sdata2 start:0x803EE3D8 end:0x803EE468 -d/menu/d_menu_item.cpp: +d/d_menu_item.cpp: .text start:0x801C3660 end:0x801CE448 .text start:0x801CE448 end:0x801CE448 .text start:0x801CE448 end:0x801CE564 @@ -1410,7 +1410,7 @@ d/menu/d_menu_item.cpp: .bss start:0x803D9748 end:0x803D97B8 .sdata2 start:0x803EE468 end:0x803EE4C8 -d/menu/d_menu_option.cpp: +d/d_menu_option.cpp: .text start:0x801CE564 end:0x801D13C8 .text start:0x801D13C8 end:0x801D1448 .ctors start:0x80336140 end:0x80336144 @@ -1420,7 +1420,7 @@ d/menu/d_menu_option.cpp: .sbss start:0x803EA488 end:0x803EA490 .sdata2 start:0x803EE4C8 end:0x803EE528 -d/menu/d_menu_save.cpp: +d/d_menu_save.cpp: .text start:0x801D1448 end:0x801D6530 .text start:0x801D6530 end:0x801D65A4 .text start:0x801D65A4 end:0x801D69E4 @@ -1430,7 +1430,7 @@ d/menu/d_menu_save.cpp: .bss start:0x803D97C8 end:0x803D9808 .sdata2 start:0x803EE528 end:0x803EE580 -d/menu/d_menu_window.cpp: +d/d_menu_window.cpp: .text start:0x801D69E4 end:0x801DACB0 .text start:0x801DACB0 end:0x801DB154 .text start:0x801DB154 end:0x801DB154 @@ -1458,7 +1458,7 @@ d/d_mesg.cpp: .sbss start:0x803EA4C0 end:0x803EA4F0 .sdata2 start:0x803EE598 end:0x803EE628 -d/message/d_message.cpp: +d/d_message.cpp: .text start:0x801E2708 end:0x801E6618 .ctors start:0x8033614C end:0x80336150 .rodata start:0x80354188 end:0x80354308 @@ -1468,7 +1468,7 @@ d/message/d_message.cpp: .sdata2 start:0x803EE628 end:0x803EE6B0 .sbss2 start:0x803F0448 end:0x803F0450 -d/message/d_message_paper.cpp: +d/d_message_paper.cpp: .text start:0x801E6618 end:0x801EA6B4 .ctors start:0x80336150 end:0x80336154 .rodata start:0x80354308 end:0x803544F0 @@ -1491,7 +1491,7 @@ d/d_meter.cpp: .sdata2 start:0x803EE718 end:0x803EE8A8 .sbss2 start:0x803F0450 end:0x803F0458 -d/minigame/d_minigame_starter.cpp: +d/d_minigame_starter.cpp: .text start:0x802016C0 end:0x80202654 .text start:0x80202654 end:0x802026B0 .rodata start:0x80354F48 end:0x80354F88 @@ -1499,7 +1499,7 @@ d/minigame/d_minigame_starter.cpp: .sdata start:0x803E9838 end:0x803E9850 .sdata2 start:0x803EE8A8 end:0x803EE908 -d/minigame/d_minigame_terminater.cpp: +d/d_minigame_terminater.cpp: .text start:0x802026B0 end:0x80206634 .text start:0x80206634 end:0x80206690 .rodata start:0x80354F88 end:0x803551C8 @@ -1553,24 +1553,24 @@ d/d_metronome.cpp: .bss start:0x803DA4D0 end:0x803DA500 .sdata2 start:0x803EEB88 end:0x803EEBD8 -d/ovlp/d_ovlp_fade.cpp: +d/d_ovlp_fade.cpp: .text start:0x80220978 end:0x80220BA0 .data start:0x80387368 end:0x80387448 .sbss start:0x803EA6B0 end:0x803EA6B8 -d/ovlp/d_ovlp_fade2.cpp: +d/d_ovlp_fade2.cpp: .text start:0x80220BA0 end:0x80221630 .text start:0x80221630 end:0x802216E8 .data start:0x80387448 end:0x803874C8 .sdata2 start:0x803EEBD8 end:0x803EEC20 -d/ovlp/d_ovlp_fade3.cpp: +d/d_ovlp_fade3.cpp: .text start:0x802216E8 end:0x80221A40 .rodata start:0x80355968 end:0x80355998 .data start:0x803874C8 end:0x80387530 .sdata2 start:0x803EEC20 end:0x803EEC48 -d/ovlp/d_ovlp_fade4.cpp: +d/d_ovlp_fade4.cpp: .text start:0x80221A40 end:0x80222D4C .text start:0x80222D4C end:0x80222F54 .rodata start:0x80355998 end:0x803559C0 @@ -1587,7 +1587,7 @@ d/d_picture_box.cpp: .sbss start:0x803EA6B8 end:0x803EA6C0 .sdata2 start:0x803EECA0 end:0x803EED30 -d/s/d_s_logo.cpp: +d/d_s_logo.cpp: .text start:0x80229860 end:0x8022C16C .rodata start:0x80355CE0 end:0x803560C0 .data start:0x803876A0 end:0x80387718 @@ -1595,7 +1595,7 @@ d/s/d_s_logo.cpp: .sdata2 start:0x803EED30 end:0x803EED78 .sbss2 start:0x803F0460 end:0x803F0470 -d/s/d_s_menu.cpp: +d/d_s_menu.cpp: .text start:0x8022C16C end:0x8022CF40 .rodata start:0x803560C0 end:0x803562E0 .data start:0x80387718 end:0x803877A0 @@ -1603,7 +1603,7 @@ d/s/d_s_menu.cpp: .sbss start:0x803EA738 end:0x803EA750 .sdata2 start:0x803EED78 end:0x803EEDC0 -d/s/d_s_name.cpp: +d/d_s_name.cpp: .text start:0x8022CF40 end:0x8022FBCC .text start:0x8022FBCC end:0x8022FBCC .text start:0x8022FBCC end:0x8022FBCC @@ -1617,19 +1617,19 @@ d/s/d_s_name.cpp: .sdata2 start:0x803EEDC0 end:0x803EEE10 .sbss2 start:0x803F0470 end:0x803F0478 -d/s/d_s_open.cpp: +d/d_s_open.cpp: .text start:0x8023011C end:0x802305A0 .rodata start:0x803563F0 end:0x80356438 .data start:0x80387CE0 end:0x80387D48 -d/s/d_s_open_sub.cpp: +d/d_s_open_sub.cpp: .text start:0x802305A0 end:0x80231B40 .text start:0x80231B40 end:0x80231B60 .rodata start:0x80356438 end:0x803564B8 .data start:0x80387D48 end:0x80387E30 .sdata2 start:0x803EEE10 end:0x803EEE50 -d/s/d_s_play.cpp: +d/d_s_play.cpp: .text start:0x80231B60 end:0x80233F1C .ctors start:0x8033616C end:0x80336170 .rodata start:0x803564B8 end:0x80356C10 @@ -1639,13 +1639,13 @@ d/s/d_s_play.cpp: .sbss start:0x803EA750 end:0x803EA778 .sdata2 start:0x803EEE50 end:0x803EEE90 -d/s/d_s_room.cpp: +d/d_s_room.cpp: .text start:0x80233F1C end:0x802348D8 .rodata start:0x80356C10 end:0x80356CB0 .data start:0x80388328 end:0x80388378 .bss start:0x803DB4C8 end:0x803DB4E8 -d/s/d_s_title.cpp: +d/d_s_title.cpp: .text start:0x802348D8 end:0x80234B4C .rodata start:0x80356CB0 end:0x80356CC8 .data start:0x80388378 end:0x803883E0 diff --git a/config/GZLP01/rels/d_a_acorn_leaf/splits.txt b/config/GZLP01/rels/d_a_acorn_leaf/splits.txt index ffad599..ca5d024 100644 --- a/config/GZLP01/rels/d_a_acorn_leaf/splits.txt +++ b/config/GZLP01/rels/d_a_acorn_leaf/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_acorn_leaf.cpp: +d/actor/d_a_acorn_leaf.cpp: .text start:0x000000EC end:0x00000E60 .text start:0x00000E60 end:0x00000E60 .text start:0x00000E60 end:0x00000EDC diff --git a/config/GZLP01/rels/d_a_agbsw0/splits.txt b/config/GZLP01/rels/d_a_agbsw0/splits.txt index 83353a5..354cf57 100644 --- a/config/GZLP01/rels/d_a_agbsw0/splits.txt +++ b/config/GZLP01/rels/d_a_agbsw0/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_agbsw0.cpp: +d/actor/d_a_agbsw0.cpp: .text start:0x00000078 end:0x00005810 .text start:0x00005810 end:0x00005810 .rodata start:0x00000000 end:0x0000009D diff --git a/config/GZLP01/rels/d_a_alldie/splits.txt b/config/GZLP01/rels/d_a_alldie/splits.txt index c8988cc..3cfa7a3 100644 --- a/config/GZLP01/rels/d_a_alldie/splits.txt +++ b/config/GZLP01/rels/d_a_alldie/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_alldie.cpp: +d/actor/d_a_alldie.cpp: .text start:0x00000078 end:0x000002CC .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_am/splits.txt b/config/GZLP01/rels/d_a_am/splits.txt index a303c64..d8dadb8 100644 --- a/config/GZLP01/rels/d_a_am/splits.txt +++ b/config/GZLP01/rels/d_a_am/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_am.cpp: +d/actor/d_a_am.cpp: .text start:0x00000078 end:0x00004B00 .rodata start:0x00000000 end:0x000000B8 .data start:0x00000000 end:0x000004C4 diff --git a/config/GZLP01/rels/d_a_am2/splits.txt b/config/GZLP01/rels/d_a_am2/splits.txt index 98277b4..fa230f6 100644 --- a/config/GZLP01/rels/d_a_am2/splits.txt +++ b/config/GZLP01/rels/d_a_am2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_am2.cpp: +d/actor/d_a_am2.cpp: .text start:0x00000078 end:0x00004DA8 .rodata start:0x00000000 end:0x000000C2 .data start:0x00000000 end:0x000004D4 diff --git a/config/GZLP01/rels/d_a_amiprop/splits.txt b/config/GZLP01/rels/d_a_amiprop/splits.txt index 4a5ba7f..76ad829 100644 --- a/config/GZLP01/rels/d_a_amiprop/splits.txt +++ b/config/GZLP01/rels/d_a_amiprop/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_amiprop.cpp: +d/actor/d_a_amiprop.cpp: .text start:0x00000078 end:0x00000AB4 .rodata start:0x00000000 end:0x00000048 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLP01/rels/d_a_andsw0/splits.txt b/config/GZLP01/rels/d_a_andsw0/splits.txt index 40d87a2..0dd7c47 100644 --- a/config/GZLP01/rels/d_a_andsw0/splits.txt +++ b/config/GZLP01/rels/d_a_andsw0/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_andsw0.cpp: +d/actor/d_a_andsw0.cpp: .text start:0x00000078 end:0x00000A64 .data start:0x00000000 end:0x000000CC .bss start:0x00000000 end:0x00000020 diff --git a/config/GZLP01/rels/d_a_andsw2/splits.txt b/config/GZLP01/rels/d_a_andsw2/splits.txt index b2a9a8d..9593e49 100644 --- a/config/GZLP01/rels/d_a_andsw2/splits.txt +++ b/config/GZLP01/rels/d_a_andsw2/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_andsw2.cpp: +d/actor/d_a_andsw2.cpp: .text start:0x00000078 end:0x00000724 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLP01/rels/d_a_arrow_iceeff/splits.txt b/config/GZLP01/rels/d_a_arrow_iceeff/splits.txt index 5ef62aa..5354e8a 100644 --- a/config/GZLP01/rels/d_a_arrow_iceeff/splits.txt +++ b/config/GZLP01/rels/d_a_arrow_iceeff/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_arrow_iceeff.cpp: +d/actor/d_a_arrow_iceeff.cpp: .text start:0x000000EC end:0x00001058 .rodata start:0x00000000 end:0x00000083 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLP01/rels/d_a_arrow_lighteff/splits.txt b/config/GZLP01/rels/d_a_arrow_lighteff/splits.txt index 725bff5..fb141a3 100644 --- a/config/GZLP01/rels/d_a_arrow_lighteff/splits.txt +++ b/config/GZLP01/rels/d_a_arrow_lighteff/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_arrow_lighteff.cpp: +d/actor/d_a_arrow_lighteff.cpp: .text start:0x00000078 end:0x000011AC .rodata start:0x00000000 end:0x000000AE .data start:0x00000000 end:0x00000074 diff --git a/config/GZLP01/rels/d_a_atdoor/splits.txt b/config/GZLP01/rels/d_a_atdoor/splits.txt index ee6272e..d88c39d 100644 --- a/config/GZLP01/rels/d_a_atdoor/splits.txt +++ b/config/GZLP01/rels/d_a_atdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_atdoor.cpp: +d/actor/d_a_atdoor.cpp: .text start:0x00000078 end:0x0000072C .rodata start:0x00000000 end:0x00000039 .data start:0x00000000 end:0x00000064 diff --git a/config/GZLP01/rels/d_a_att/splits.txt b/config/GZLP01/rels/d_a_att/splits.txt index a2ccc7e..32ddd80 100644 --- a/config/GZLP01/rels/d_a_att/splits.txt +++ b/config/GZLP01/rels/d_a_att/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_att.cpp: +d/actor/d_a_att.cpp: .text start:0x000000EC end:0x00000B90 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000018 diff --git a/config/GZLP01/rels/d_a_auction/splits.txt b/config/GZLP01/rels/d_a_auction/splits.txt index 8418460..16da51a 100644 --- a/config/GZLP01/rels/d_a_auction/splits.txt +++ b/config/GZLP01/rels/d_a_auction/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_auction.cpp: +d/actor/d_a_auction.cpp: .text start:0x000000EC end:0x00003C90 .text start:0x00003C90 end:0x0000416C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_bb/splits.txt b/config/GZLP01/rels/d_a_bb/splits.txt index 0d96fc2..a7ba300 100644 --- a/config/GZLP01/rels/d_a_bb/splits.txt +++ b/config/GZLP01/rels/d_a_bb/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bb.cpp: +d/actor/d_a_bb.cpp: .text start:0x000000EC end:0x00008DF8 .text start:0x00008DF8 end:0x00008DF8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_bdk/splits.txt b/config/GZLP01/rels/d_a_bdk/splits.txt index dc8eeed..c7df2c9 100644 --- a/config/GZLP01/rels/d_a_bdk/splits.txt +++ b/config/GZLP01/rels/d_a_bdk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bdk.cpp: +d/actor/d_a_bdk.cpp: .text start:0x000000EC end:0x0000DDB4 .text start:0x0000DDB4 end:0x0000DDB4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_bdkobj/splits.txt b/config/GZLP01/rels/d_a_bdkobj/splits.txt index 1e47aed..f72343d 100644 --- a/config/GZLP01/rels/d_a_bdkobj/splits.txt +++ b/config/GZLP01/rels/d_a_bdkobj/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bdkobj.cpp: +d/actor/d_a_bdkobj.cpp: .text start:0x000000EC end:0x00002FA0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000E3 diff --git a/config/GZLP01/rels/d_a_beam/splits.txt b/config/GZLP01/rels/d_a_beam/splits.txt index 86a5ce7..e63fe7c 100644 --- a/config/GZLP01/rels/d_a_beam/splits.txt +++ b/config/GZLP01/rels/d_a_beam/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_beam.cpp: +d/actor/d_a_beam.cpp: .text start:0x000000EC end:0x00002CA0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000B2 diff --git a/config/GZLP01/rels/d_a_bflower/splits.txt b/config/GZLP01/rels/d_a_bflower/splits.txt index 664ebae..c412938 100644 --- a/config/GZLP01/rels/d_a_bflower/splits.txt +++ b/config/GZLP01/rels/d_a_bflower/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bflower.cpp: +d/actor/d_a_bflower.cpp: .text start:0x000000EC end:0x00001DFC .text start:0x00001DFC end:0x00001DFC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_bgn/splits.txt b/config/GZLP01/rels/d_a_bgn/splits.txt index ad89f12..aaa0e77 100644 --- a/config/GZLP01/rels/d_a_bgn/splits.txt +++ b/config/GZLP01/rels/d_a_bgn/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bgn.cpp: +d/actor/d_a_bgn.cpp: .text start:0x000000EC end:0x0000EE68 .text start:0x0000EE68 end:0x0000EE68 .text start:0x0000EE68 end:0x0000EEC4 diff --git a/config/GZLP01/rels/d_a_bgn2/splits.txt b/config/GZLP01/rels/d_a_bgn2/splits.txt index 6ff0cc6..806e721 100644 --- a/config/GZLP01/rels/d_a_bgn2/splits.txt +++ b/config/GZLP01/rels/d_a_bgn2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bgn2.cpp: +d/actor/d_a_bgn2.cpp: .text start:0x000000EC end:0x000049C4 .text start:0x000049C4 end:0x000049C4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_bgn3/splits.txt b/config/GZLP01/rels/d_a_bgn3/splits.txt index e810fd5..7433e5a 100644 --- a/config/GZLP01/rels/d_a_bgn3/splits.txt +++ b/config/GZLP01/rels/d_a_bgn3/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bgn3.cpp: +d/actor/d_a_bgn3.cpp: .text start:0x000000EC end:0x000055D0 .text start:0x000055D0 end:0x000055D0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_bigelf/splits.txt b/config/GZLP01/rels/d_a_bigelf/splits.txt index b703342..fc894fc 100644 --- a/config/GZLP01/rels/d_a_bigelf/splits.txt +++ b/config/GZLP01/rels/d_a_bigelf/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bigelf.cpp: +d/actor/d_a_bigelf.cpp: .text start:0x00000078 end:0x00003890 .text start:0x00003890 end:0x000038C8 .rodata start:0x00000000 end:0x000001FD diff --git a/config/GZLP01/rels/d_a_bita/splits.txt b/config/GZLP01/rels/d_a_bita/splits.txt index 41af952..6569835 100644 --- a/config/GZLP01/rels/d_a_bita/splits.txt +++ b/config/GZLP01/rels/d_a_bita/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bita.cpp: +d/actor/d_a_bita.cpp: .text start:0x00000078 end:0x000010D8 .rodata start:0x00000000 end:0x0000007A .data start:0x00000000 end:0x00000208 diff --git a/config/GZLP01/rels/d_a_bk/splits.txt b/config/GZLP01/rels/d_a_bk/splits.txt index 3cf9d5d..804adf5 100644 --- a/config/GZLP01/rels/d_a_bk/splits.txt +++ b/config/GZLP01/rels/d_a_bk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bk.cpp: +d/actor/d_a_bk.cpp: .text start:0x000000EC end:0x0000F92C .text start:0x0000F92C end:0x0000F92C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_bl/splits.txt b/config/GZLP01/rels/d_a_bl/splits.txt index 5fe5d46..043633f 100644 --- a/config/GZLP01/rels/d_a_bl/splits.txt +++ b/config/GZLP01/rels/d_a_bl/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bl.cpp: +d/actor/d_a_bl.cpp: .text start:0x00000078 end:0x00006840 .text start:0x00006840 end:0x00006898 .rodata start:0x00000000 end:0x000000F9 diff --git a/config/GZLP01/rels/d_a_bmd/splits.txt b/config/GZLP01/rels/d_a_bmd/splits.txt index 0edaaa6..60a29bf 100644 --- a/config/GZLP01/rels/d_a_bmd/splits.txt +++ b/config/GZLP01/rels/d_a_bmd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bmd.cpp: +d/actor/d_a_bmd.cpp: .text start:0x000000EC end:0x000074CC .text start:0x000074CC end:0x000074CC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_bmdfoot/splits.txt b/config/GZLP01/rels/d_a_bmdfoot/splits.txt index 98b9c34..67f911e 100644 --- a/config/GZLP01/rels/d_a_bmdfoot/splits.txt +++ b/config/GZLP01/rels/d_a_bmdfoot/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bmdfoot.cpp: +d/actor/d_a_bmdfoot.cpp: .text start:0x000000EC end:0x0000348C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000CA diff --git a/config/GZLP01/rels/d_a_bmdhand/splits.txt b/config/GZLP01/rels/d_a_bmdhand/splits.txt index aa5fa7c..30534b8 100644 --- a/config/GZLP01/rels/d_a_bmdhand/splits.txt +++ b/config/GZLP01/rels/d_a_bmdhand/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bmdhand.cpp: +d/actor/d_a_bmdhand.cpp: .text start:0x000000EC end:0x0000389C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000C7 diff --git a/config/GZLP01/rels/d_a_bo/splits.txt b/config/GZLP01/rels/d_a_bo/splits.txt index 8999a8d..feafd3c 100644 --- a/config/GZLP01/rels/d_a_bo/splits.txt +++ b/config/GZLP01/rels/d_a_bo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bo.cpp: +d/actor/d_a_bo.cpp: .text start:0x000000EC end:0x00005D38 .text start:0x00005D38 end:0x00005D90 .text start:0x00005D90 end:0x00006404 diff --git a/config/GZLP01/rels/d_a_boko/splits.txt b/config/GZLP01/rels/d_a_boko/splits.txt index cae4200..6e22243 100644 --- a/config/GZLP01/rels/d_a_boko/splits.txt +++ b/config/GZLP01/rels/d_a_boko/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_boko.cpp: +d/actor/d_a_boko.cpp: .text start:0x000000EC end:0x00004378 .text start:0x00004378 end:0x00004378 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_boss_item/splits.txt b/config/GZLP01/rels/d_a_boss_item/splits.txt index 4c19f29..18e049a 100644 --- a/config/GZLP01/rels/d_a_boss_item/splits.txt +++ b/config/GZLP01/rels/d_a_boss_item/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_boss_item.cpp: +d/actor/d_a_boss_item.cpp: .text start:0x00000078 end:0x00000128 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_bpw/splits.txt b/config/GZLP01/rels/d_a_bpw/splits.txt index a9b90fc..52f64b3 100644 --- a/config/GZLP01/rels/d_a_bpw/splits.txt +++ b/config/GZLP01/rels/d_a_bpw/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bpw.cpp: +d/actor/d_a_bpw.cpp: .text start:0x00000078 end:0x0000E308 .text start:0x0000E308 end:0x0000E494 .text start:0x0000E494 end:0x0000E600 diff --git a/config/GZLP01/rels/d_a_branch/splits.txt b/config/GZLP01/rels/d_a_branch/splits.txt index 519bbfd..3686cfc 100644 --- a/config/GZLP01/rels/d_a_branch/splits.txt +++ b/config/GZLP01/rels/d_a_branch/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_branch.cpp: +d/actor/d_a_branch.cpp: .text start:0x00000078 end:0x0000080C .rodata start:0x00000000 end:0x00000060 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLP01/rels/d_a_bridge/splits.txt b/config/GZLP01/rels/d_a_bridge/splits.txt index c17c404..48e3c01 100644 --- a/config/GZLP01/rels/d_a_bridge/splits.txt +++ b/config/GZLP01/rels/d_a_bridge/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bridge.cpp: +d/actor/d_a_bridge.cpp: .text start:0x00000078 end:0x00004CB4 .text start:0x00004CB4 end:0x00004CB4 .rodata start:0x00000000 end:0x00000169 diff --git a/config/GZLP01/rels/d_a_bst/splits.txt b/config/GZLP01/rels/d_a_bst/splits.txt index 0d3588a..a8628d3 100644 --- a/config/GZLP01/rels/d_a_bst/splits.txt +++ b/config/GZLP01/rels/d_a_bst/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bst.cpp: +d/actor/d_a_bst.cpp: .text start:0x000000EC end:0x0000C524 .text start:0x0000C524 end:0x0000C524 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_btd/splits.txt b/config/GZLP01/rels/d_a_btd/splits.txt index 9aa3676..289061c 100644 --- a/config/GZLP01/rels/d_a_btd/splits.txt +++ b/config/GZLP01/rels/d_a_btd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_btd.cpp: +d/actor/d_a_btd.cpp: .text start:0x000000EC end:0x00009DD4 .text start:0x00009DD4 end:0x00009DD4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_bwd/splits.txt b/config/GZLP01/rels/d_a_bwd/splits.txt index 46916cc..b9a42c1 100644 --- a/config/GZLP01/rels/d_a_bwd/splits.txt +++ b/config/GZLP01/rels/d_a_bwd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bwd.cpp: +d/actor/d_a_bwd.cpp: .text start:0x000000EC end:0x0000A87C .text start:0x0000A87C end:0x0000A87C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_bwdg/splits.txt b/config/GZLP01/rels/d_a_bwdg/splits.txt index 42fc08d..051a85b 100644 --- a/config/GZLP01/rels/d_a_bwdg/splits.txt +++ b/config/GZLP01/rels/d_a_bwdg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_bwdg.cpp: +d/actor/d_a_bwdg.cpp: .text start:0x00000078 end:0x00000B88 .text start:0x00000B88 end:0x00000B88 .text start:0x00000B88 end:0x00000C2C diff --git a/config/GZLP01/rels/d_a_bwds/splits.txt b/config/GZLP01/rels/d_a_bwds/splits.txt index c8a8737..714ab28 100644 --- a/config/GZLP01/rels/d_a_bwds/splits.txt +++ b/config/GZLP01/rels/d_a_bwds/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_bwds.cpp: +d/actor/d_a_bwds.cpp: .text start:0x000000EC end:0x00004088 .text start:0x00004088 end:0x00004088 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_canon/splits.txt b/config/GZLP01/rels/d_a_canon/splits.txt index 0f22ea0..2493fda 100644 --- a/config/GZLP01/rels/d_a_canon/splits.txt +++ b/config/GZLP01/rels/d_a_canon/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_canon.cpp: +d/actor/d_a_canon.cpp: .text start:0x000000EC end:0x00002A10 .text start:0x00002A10 end:0x00002A10 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_cc/splits.txt b/config/GZLP01/rels/d_a_cc/splits.txt index de01957..f4f5865 100644 --- a/config/GZLP01/rels/d_a_cc/splits.txt +++ b/config/GZLP01/rels/d_a_cc/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_cc.cpp: +d/actor/d_a_cc.cpp: .text start:0x00000078 end:0x00007CD8 .text start:0x00007CD8 end:0x00007CF4 .text start:0x00007CF4 end:0x00007CF4 diff --git a/config/GZLP01/rels/d_a_coming2/splits.txt b/config/GZLP01/rels/d_a_coming2/splits.txt index 17d22c8..0073391 100644 --- a/config/GZLP01/rels/d_a_coming2/splits.txt +++ b/config/GZLP01/rels/d_a_coming2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_coming2.cpp: +d/actor/d_a_coming2.cpp: .text start:0x000000EC end:0x0000244C .text start:0x0000244C end:0x00002684 .rodata start:0x00000000 end:0x0000005C diff --git a/config/GZLP01/rels/d_a_coming3/splits.txt b/config/GZLP01/rels/d_a_coming3/splits.txt index 57444c5..4c9895f 100644 --- a/config/GZLP01/rels/d_a_coming3/splits.txt +++ b/config/GZLP01/rels/d_a_coming3/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_coming3.cpp: +d/actor/d_a_coming3.cpp: .text start:0x000000EC end:0x00001EDC .text start:0x00001EDC end:0x000021E4 .rodata start:0x00000000 end:0x000000EA diff --git a/config/GZLP01/rels/d_a_dai/splits.txt b/config/GZLP01/rels/d_a_dai/splits.txt index 4489407..c1fc7f4 100644 --- a/config/GZLP01/rels/d_a_dai/splits.txt +++ b/config/GZLP01/rels/d_a_dai/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_dai.cpp: +d/actor/d_a_dai.cpp: .text start:0x00000078 end:0x00001130 .text start:0x00001130 end:0x00001130 .text start:0x00001130 end:0x00001250 diff --git a/config/GZLP01/rels/d_a_daiocta/splits.txt b/config/GZLP01/rels/d_a_daiocta/splits.txt index 0954e4a..9c22ecf 100644 --- a/config/GZLP01/rels/d_a_daiocta/splits.txt +++ b/config/GZLP01/rels/d_a_daiocta/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_daiocta.cpp: +d/actor/d_a_daiocta.cpp: .text start:0x000000EC end:0x00005630 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000038F diff --git a/config/GZLP01/rels/d_a_daiocta_eye/splits.txt b/config/GZLP01/rels/d_a_daiocta_eye/splits.txt index 7f4dbe6..06a8b57 100644 --- a/config/GZLP01/rels/d_a_daiocta_eye/splits.txt +++ b/config/GZLP01/rels/d_a_daiocta_eye/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_daiocta_eye.cpp: +d/actor/d_a_daiocta_eye.cpp: .text start:0x000000EC end:0x00001AF0 .text start:0x00001AF0 end:0x00001B80 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_deku_item/splits.txt b/config/GZLP01/rels/d_a_deku_item/splits.txt index 8abc176..21cef64 100644 --- a/config/GZLP01/rels/d_a_deku_item/splits.txt +++ b/config/GZLP01/rels/d_a_deku_item/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_deku_item.cpp: +d/actor/d_a_deku_item.cpp: .text start:0x00000078 end:0x000011A0 .rodata start:0x00000000 end:0x0000006C .data start:0x00000000 end:0x0000029C diff --git a/config/GZLP01/rels/d_a_demo_dk/splits.txt b/config/GZLP01/rels/d_a_demo_dk/splits.txt index ebf13c9..7878a9d 100644 --- a/config/GZLP01/rels/d_a_demo_dk/splits.txt +++ b/config/GZLP01/rels/d_a_demo_dk/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_demo_dk.cpp: +d/actor/d_a_demo_dk.cpp: .text start:0x00000078 end:0x00000714 .rodata start:0x00000000 end:0x0000002C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_demo_item/splits.txt b/config/GZLP01/rels/d_a_demo_item/splits.txt index c76341e..4c0e585 100644 --- a/config/GZLP01/rels/d_a_demo_item/splits.txt +++ b/config/GZLP01/rels/d_a_demo_item/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_demo_item.cpp: +d/actor/d_a_demo_item.cpp: .text start:0x000000EC end:0x00000F98 .rodata start:0x00000000 end:0x00000024 .data start:0x00000000 end:0x0000028C diff --git a/config/GZLP01/rels/d_a_demo_kmm/splits.txt b/config/GZLP01/rels/d_a_demo_kmm/splits.txt index cb79332..e0cbd8a 100644 --- a/config/GZLP01/rels/d_a_demo_kmm/splits.txt +++ b/config/GZLP01/rels/d_a_demo_kmm/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_demo_kmm.cpp: +d/actor/d_a_demo_kmm.cpp: .text start:0x00000078 end:0x00000520 .rodata start:0x00000000 end:0x00000018 .data start:0x00000000 end:0x00000054 diff --git a/config/GZLP01/rels/d_a_dk/splits.txt b/config/GZLP01/rels/d_a_dk/splits.txt index ee4e379..f27471a 100644 --- a/config/GZLP01/rels/d_a_dk/splits.txt +++ b/config/GZLP01/rels/d_a_dk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_dk.cpp: +d/actor/d_a_dk.cpp: .text start:0x000000EC end:0x0000148C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000B3 diff --git a/config/GZLP01/rels/d_a_door10/splits.txt b/config/GZLP01/rels/d_a_door10/splits.txt index febd4bb..6c9796b 100644 --- a/config/GZLP01/rels/d_a_door10/splits.txt +++ b/config/GZLP01/rels/d_a_door10/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_door10.cpp: +d/actor/d_a_door10.cpp: .text start:0x00000078 end:0x00001F5C .text start:0x00001F5C end:0x00002000 .rodata start:0x00000000 end:0x000000BC diff --git a/config/GZLP01/rels/d_a_door12/splits.txt b/config/GZLP01/rels/d_a_door12/splits.txt index de40197..eb09f71 100644 --- a/config/GZLP01/rels/d_a_door12/splits.txt +++ b/config/GZLP01/rels/d_a_door12/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_door12.cpp: +d/actor/d_a_door12.cpp: .text start:0x00000078 end:0x00001D3C .text start:0x00001D3C end:0x00001D3C .text start:0x00001D3C end:0x00001DE0 diff --git a/config/GZLP01/rels/d_a_dr/splits.txt b/config/GZLP01/rels/d_a_dr/splits.txt index 46db39c..9432b92 100644 --- a/config/GZLP01/rels/d_a_dr/splits.txt +++ b/config/GZLP01/rels/d_a_dr/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_dr.cpp: +d/actor/d_a_dr.cpp: .text start:0x000000EC end:0x00000D68 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000002C diff --git a/config/GZLP01/rels/d_a_dr2/splits.txt b/config/GZLP01/rels/d_a_dr2/splits.txt index 5a1660d..d566de7 100644 --- a/config/GZLP01/rels/d_a_dr2/splits.txt +++ b/config/GZLP01/rels/d_a_dr2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_dr2.cpp: +d/actor/d_a_dr2.cpp: .text start:0x000000EC end:0x000027E4 .text start:0x000027E4 end:0x00002800 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_dummy/splits.txt b/config/GZLP01/rels/d_a_dummy/splits.txt index 230798c..6dfe25c 100644 --- a/config/GZLP01/rels/d_a_dummy/splits.txt +++ b/config/GZLP01/rels/d_a_dummy/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_dummy.cpp: +d/actor/d_a_dummy.cpp: .text start:0x00000078 end:0x00000270 .text start:0x00000270 end:0x000002D0 .rodata start:0x00000000 end:0x0000000C diff --git a/config/GZLP01/rels/d_a_ep/splits.txt b/config/GZLP01/rels/d_a_ep/splits.txt index 34a9b6b..9c776c5 100644 --- a/config/GZLP01/rels/d_a_ep/splits.txt +++ b/config/GZLP01/rels/d_a_ep/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ep.cpp: +d/actor/d_a_ep.cpp: .text start:0x00000078 end:0x00003004 .text start:0x00003004 end:0x00003004 .rodata start:0x00000000 end:0x00000111 diff --git a/config/GZLP01/rels/d_a_fallrock/splits.txt b/config/GZLP01/rels/d_a_fallrock/splits.txt index bbf3a65..004ddcd 100644 --- a/config/GZLP01/rels/d_a_fallrock/splits.txt +++ b/config/GZLP01/rels/d_a_fallrock/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fallrock.cpp: +d/actor/d_a_fallrock.cpp: .text start:0x00000078 end:0x00001A2C .rodata start:0x00000000 end:0x00000099 .data start:0x00000000 end:0x000002B0 diff --git a/config/GZLP01/rels/d_a_fallrock_tag/splits.txt b/config/GZLP01/rels/d_a_fallrock_tag/splits.txt index 127337c..1112d31 100644 --- a/config/GZLP01/rels/d_a_fallrock_tag/splits.txt +++ b/config/GZLP01/rels/d_a_fallrock_tag/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fallrock_tag.cpp: +d/actor/d_a_fallrock_tag.cpp: .text start:0x00000078 end:0x000003E4 .rodata start:0x00000000 end:0x00000018 .data start:0x00000000 end:0x00000070 diff --git a/config/GZLP01/rels/d_a_fan/splits.txt b/config/GZLP01/rels/d_a_fan/splits.txt index 6648dd6..07b1b47 100644 --- a/config/GZLP01/rels/d_a_fan/splits.txt +++ b/config/GZLP01/rels/d_a_fan/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fan.cpp: +d/actor/d_a_fan.cpp: .text start:0x00000078 end:0x00001220 .text start:0x00001220 end:0x00001324 .rodata start:0x00000000 end:0x00000115 diff --git a/config/GZLP01/rels/d_a_ff/splits.txt b/config/GZLP01/rels/d_a_ff/splits.txt index b9181d1..81eb9f5 100644 --- a/config/GZLP01/rels/d_a_ff/splits.txt +++ b/config/GZLP01/rels/d_a_ff/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ff.cpp: +d/actor/d_a_ff.cpp: .text start:0x00000078 end:0x000019CC .rodata start:0x00000000 end:0x000000C2 .data start:0x00000000 end:0x00000248 diff --git a/config/GZLP01/rels/d_a_fganon/splits.txt b/config/GZLP01/rels/d_a_fganon/splits.txt index 3a3b33c..5e77bbe 100644 --- a/config/GZLP01/rels/d_a_fganon/splits.txt +++ b/config/GZLP01/rels/d_a_fganon/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_fganon.cpp: +d/actor/d_a_fganon.cpp: .text start:0x000000EC end:0x0000A748 .text start:0x0000A748 end:0x0000A748 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_fgmahou/splits.txt b/config/GZLP01/rels/d_a_fgmahou/splits.txt index 1c81bf1..c6e18da 100644 --- a/config/GZLP01/rels/d_a_fgmahou/splits.txt +++ b/config/GZLP01/rels/d_a_fgmahou/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fgmahou.cpp: +d/actor/d_a_fgmahou.cpp: .text start:0x00000078 end:0x00001708 .rodata start:0x00000000 end:0x00000053 .data start:0x00000000 end:0x00000268 diff --git a/config/GZLP01/rels/d_a_fire/splits.txt b/config/GZLP01/rels/d_a_fire/splits.txt index d7fce6f..776da77 100644 --- a/config/GZLP01/rels/d_a_fire/splits.txt +++ b/config/GZLP01/rels/d_a_fire/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_fire.cpp: +d/actor/d_a_fire.cpp: .text start:0x00000078 end:0x000017A0 .rodata start:0x00000000 end:0x00000095 .data start:0x00000000 end:0x0000026C diff --git a/config/GZLP01/rels/d_a_floor/splits.txt b/config/GZLP01/rels/d_a_floor/splits.txt index da77f2f..c20497c 100644 --- a/config/GZLP01/rels/d_a_floor/splits.txt +++ b/config/GZLP01/rels/d_a_floor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_floor.cpp: +d/actor/d_a_floor.cpp: .text start:0x00000078 end:0x00000774 .text start:0x00000774 end:0x0000078C .rodata start:0x00000000 end:0x00000066 diff --git a/config/GZLP01/rels/d_a_fm/splits.txt b/config/GZLP01/rels/d_a_fm/splits.txt index ac84ced..c27f2e9 100644 --- a/config/GZLP01/rels/d_a_fm/splits.txt +++ b/config/GZLP01/rels/d_a_fm/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_fm.cpp: +d/actor/d_a_fm.cpp: .text start:0x000000EC end:0x0000A548 .text start:0x0000A548 end:0x0000A614 .text start:0x0000A614 end:0x0000A630 diff --git a/config/GZLP01/rels/d_a_ghostship/splits.txt b/config/GZLP01/rels/d_a_ghostship/splits.txt index 1e3bd70..e0dcf87 100644 --- a/config/GZLP01/rels/d_a_ghostship/splits.txt +++ b/config/GZLP01/rels/d_a_ghostship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ghostship.cpp: +d/actor/d_a_ghostship.cpp: .text start:0x000000EC end:0x00001B40 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000138 diff --git a/config/GZLP01/rels/d_a_gm/splits.txt b/config/GZLP01/rels/d_a_gm/splits.txt index 32eea95..769cda3 100644 --- a/config/GZLP01/rels/d_a_gm/splits.txt +++ b/config/GZLP01/rels/d_a_gm/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gm.cpp: +d/actor/d_a_gm.cpp: .text start:0x000000EC end:0x00009068 .text start:0x00009068 end:0x00009338 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_gnd/splits.txt b/config/GZLP01/rels/d_a_gnd/splits.txt index 5204169..f02d05f 100644 --- a/config/GZLP01/rels/d_a_gnd/splits.txt +++ b/config/GZLP01/rels/d_a_gnd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gnd.cpp: +d/actor/d_a_gnd.cpp: .text start:0x000000EC end:0x00008D7C .text start:0x00008D7C end:0x00008D7C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_goal_flag/splits.txt b/config/GZLP01/rels/d_a_goal_flag/splits.txt index 149aa6a..689fba2 100644 --- a/config/GZLP01/rels/d_a_goal_flag/splits.txt +++ b/config/GZLP01/rels/d_a_goal_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_goal_flag.cpp: +d/actor/d_a_goal_flag.cpp: .text start:0x000000EC end:0x00002DC8 .text start:0x00002DC8 end:0x00002EB0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_grass/splits.txt b/config/GZLP01/rels/d_a_grass/splits.txt index a4fd27d..fc21afb 100644 --- a/config/GZLP01/rels/d_a_grass/splits.txt +++ b/config/GZLP01/rels/d_a_grass/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_grass.cpp: +d/actor/d_a_grass.cpp: .text start:0x000000EC end:0x0000151C .rodata start:0x00000000 end:0x00000008 .data start:0x00000000 end:0x00000090 diff --git a/config/GZLP01/rels/d_a_gy/splits.txt b/config/GZLP01/rels/d_a_gy/splits.txt index 8a07cd1..04c543d 100644 --- a/config/GZLP01/rels/d_a_gy/splits.txt +++ b/config/GZLP01/rels/d_a_gy/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gy.cpp: +d/actor/d_a_gy.cpp: .text start:0x000000EC end:0x00005FE4 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000282 diff --git a/config/GZLP01/rels/d_a_gy_ctrl/splits.txt b/config/GZLP01/rels/d_a_gy_ctrl/splits.txt index d8f492e..c624203 100644 --- a/config/GZLP01/rels/d_a_gy_ctrl/splits.txt +++ b/config/GZLP01/rels/d_a_gy_ctrl/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_gy_ctrl.cpp: +d/actor/d_a_gy_ctrl.cpp: .text start:0x000000EC end:0x00001DCC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000080 diff --git a/config/GZLP01/rels/d_a_himo3/splits.txt b/config/GZLP01/rels/d_a_himo3/splits.txt index 56d4dfd..b1032bb 100644 --- a/config/GZLP01/rels/d_a_himo3/splits.txt +++ b/config/GZLP01/rels/d_a_himo3/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_himo3.cpp: +d/actor/d_a_himo3.cpp: .text start:0x000000EC end:0x00002D30 .text start:0x00002D30 end:0x00002DA4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_hitobj/splits.txt b/config/GZLP01/rels/d_a_hitobj/splits.txt index 6f0e8a1..2af5575 100644 --- a/config/GZLP01/rels/d_a_hitobj/splits.txt +++ b/config/GZLP01/rels/d_a_hitobj/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hitobj.cpp: +d/actor/d_a_hitobj.cpp: .text start:0x00000078 end:0x00000510 .rodata start:0x00000000 end:0x00000007 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLP01/rels/d_a_hmlif/splits.txt b/config/GZLP01/rels/d_a_hmlif/splits.txt index 1cf8d32..5bc99e4 100644 --- a/config/GZLP01/rels/d_a_hmlif/splits.txt +++ b/config/GZLP01/rels/d_a_hmlif/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hmlif.cpp: +d/actor/d_a_hmlif.cpp: .text start:0x00000078 end:0x000016A4 .text start:0x000016A4 end:0x00001870 .rodata start:0x00000000 end:0x00000150 diff --git a/config/GZLP01/rels/d_a_hot_floor/splits.txt b/config/GZLP01/rels/d_a_hot_floor/splits.txt index bb8f442..83ddba5 100644 --- a/config/GZLP01/rels/d_a_hot_floor/splits.txt +++ b/config/GZLP01/rels/d_a_hot_floor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hot_floor.cpp: +d/actor/d_a_hot_floor.cpp: .text start:0x00000078 end:0x00000614 .rodata start:0x00000000 end:0x00000020 .data start:0x00000000 end:0x00000074 diff --git a/config/GZLP01/rels/d_a_hys/splits.txt b/config/GZLP01/rels/d_a_hys/splits.txt index f9ac2b5..6dc33c0 100644 --- a/config/GZLP01/rels/d_a_hys/splits.txt +++ b/config/GZLP01/rels/d_a_hys/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_hys.cpp: +d/actor/d_a_hys.cpp: .text start:0x00000078 end:0x00000C30 .text start:0x00000C30 end:0x00000DB4 .rodata start:0x00000000 end:0x00000066 diff --git a/config/GZLP01/rels/d_a_icelift/splits.txt b/config/GZLP01/rels/d_a_icelift/splits.txt index 3cebd56..0debd5f 100644 --- a/config/GZLP01/rels/d_a_icelift/splits.txt +++ b/config/GZLP01/rels/d_a_icelift/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_icelift.cpp: +d/actor/d_a_icelift.cpp: .text start:0x00000078 end:0x0000109C .rodata start:0x00000000 end:0x000000A0 .data start:0x00000000 end:0x0000007C diff --git a/config/GZLP01/rels/d_a_ikari/splits.txt b/config/GZLP01/rels/d_a_ikari/splits.txt index e1a0d83..5e26ffc 100644 --- a/config/GZLP01/rels/d_a_ikari/splits.txt +++ b/config/GZLP01/rels/d_a_ikari/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ikari.cpp: +d/actor/d_a_ikari.cpp: .text start:0x000000EC end:0x0000077C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000005A diff --git a/config/GZLP01/rels/d_a_jbo/splits.txt b/config/GZLP01/rels/d_a_jbo/splits.txt index 043da2c..2241803 100644 --- a/config/GZLP01/rels/d_a_jbo/splits.txt +++ b/config/GZLP01/rels/d_a_jbo/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_jbo.cpp: +d/actor/d_a_jbo.cpp: .text start:0x00000078 end:0x00000D44 .rodata start:0x00000000 end:0x00000028 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLP01/rels/d_a_kaji/splits.txt b/config/GZLP01/rels/d_a_kaji/splits.txt index a56787b..f095669 100644 --- a/config/GZLP01/rels/d_a_kaji/splits.txt +++ b/config/GZLP01/rels/d_a_kaji/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kaji.cpp: +d/actor/d_a_kaji.cpp: .text start:0x00000078 end:0x00000570 .rodata start:0x00000000 end:0x0000004A .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_kamome/splits.txt b/config/GZLP01/rels/d_a_kamome/splits.txt index 7e1c490..21ff718 100644 --- a/config/GZLP01/rels/d_a_kamome/splits.txt +++ b/config/GZLP01/rels/d_a_kamome/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_kamome.cpp: +d/actor/d_a_kamome.cpp: .text start:0x000000EC end:0x00005398 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000DA diff --git a/config/GZLP01/rels/d_a_kanban/splits.txt b/config/GZLP01/rels/d_a_kanban/splits.txt index 884fc69..607bf56 100644 --- a/config/GZLP01/rels/d_a_kanban/splits.txt +++ b/config/GZLP01/rels/d_a_kanban/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_kanban.cpp: +d/actor/d_a_kanban.cpp: .text start:0x000000EC end:0x00002EDC .text start:0x00002EDC end:0x00002EF8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_kantera/splits.txt b/config/GZLP01/rels/d_a_kantera/splits.txt index efd70d8..b3d029d 100644 --- a/config/GZLP01/rels/d_a_kantera/splits.txt +++ b/config/GZLP01/rels/d_a_kantera/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_kantera.cpp: +d/actor/d_a_kantera.cpp: .text start:0x000000EC end:0x00002784 .rodata start:0x00000000 end:0x00000129 .data start:0x00000000 end:0x0000025C diff --git a/config/GZLP01/rels/d_a_kb/splits.txt b/config/GZLP01/rels/d_a_kb/splits.txt index 2269d5a..b2cf5c4 100644 --- a/config/GZLP01/rels/d_a_kb/splits.txt +++ b/config/GZLP01/rels/d_a_kb/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kb.cpp: +d/actor/d_a_kb.cpp: .text start:0x00000078 end:0x00007F88 .text start:0x00007F88 end:0x00007F88 .rodata start:0x00000000 end:0x0000010F diff --git a/config/GZLP01/rels/d_a_kddoor/splits.txt b/config/GZLP01/rels/d_a_kddoor/splits.txt index b3e8c3e..4950175 100644 --- a/config/GZLP01/rels/d_a_kddoor/splits.txt +++ b/config/GZLP01/rels/d_a_kddoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kddoor.cpp: +d/actor/d_a_kddoor.cpp: .text start:0x00000078 end:0x00002E5C .text start:0x00002E5C end:0x00002FD8 .text start:0x00002FD8 end:0x0000307C diff --git a/config/GZLP01/rels/d_a_ki/splits.txt b/config/GZLP01/rels/d_a_ki/splits.txt index 8a180fc..3b237b6 100644 --- a/config/GZLP01/rels/d_a_ki/splits.txt +++ b/config/GZLP01/rels/d_a_ki/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ki.cpp: +d/actor/d_a_ki.cpp: .text start:0x000000EC end:0x00005364 .text start:0x00005364 end:0x00005364 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_kita/splits.txt b/config/GZLP01/rels/d_a_kita/splits.txt index b4a60a3..daa9082 100644 --- a/config/GZLP01/rels/d_a_kita/splits.txt +++ b/config/GZLP01/rels/d_a_kita/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kita.cpp: +d/actor/d_a_kita.cpp: .text start:0x00000078 end:0x000027CC .rodata start:0x00000000 end:0x000000D5 .data start:0x00000000 end:0x0000039C diff --git a/config/GZLP01/rels/d_a_klft/splits.txt b/config/GZLP01/rels/d_a_klft/splits.txt index 79e6200..ae839a5 100644 --- a/config/GZLP01/rels/d_a_klft/splits.txt +++ b/config/GZLP01/rels/d_a_klft/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_klft.cpp: +d/actor/d_a_klft.cpp: .text start:0x00000078 end:0x00002214 .rodata start:0x00000000 end:0x000000DA .data start:0x00000000 end:0x00000270 diff --git a/config/GZLP01/rels/d_a_kmon/splits.txt b/config/GZLP01/rels/d_a_kmon/splits.txt index 4b2c0db..bcdbd00 100644 --- a/config/GZLP01/rels/d_a_kmon/splits.txt +++ b/config/GZLP01/rels/d_a_kmon/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kmon.cpp: +d/actor/d_a_kmon.cpp: .text start:0x00000078 end:0x00000AB4 .rodata start:0x00000000 end:0x0000007E .data start:0x00000000 end:0x000000B0 diff --git a/config/GZLP01/rels/d_a_kn/splits.txt b/config/GZLP01/rels/d_a_kn/splits.txt index ddb8843..b939377 100644 --- a/config/GZLP01/rels/d_a_kn/splits.txt +++ b/config/GZLP01/rels/d_a_kn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kn.cpp: +d/actor/d_a_kn.cpp: .text start:0x00000078 end:0x00001330 .rodata start:0x00000000 end:0x0000009B .data start:0x00000000 end:0x0000009C diff --git a/config/GZLP01/rels/d_a_knob00/splits.txt b/config/GZLP01/rels/d_a_knob00/splits.txt index d71c4b0..a596423 100644 --- a/config/GZLP01/rels/d_a_knob00/splits.txt +++ b/config/GZLP01/rels/d_a_knob00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_knob00.cpp: +d/actor/d_a_knob00.cpp: .text start:0x00000078 end:0x00001F70 .text start:0x00001F70 end:0x00002014 .text start:0x00002014 end:0x00002014 diff --git a/config/GZLP01/rels/d_a_kokiie/splits.txt b/config/GZLP01/rels/d_a_kokiie/splits.txt index 8e15098..484db5f 100644 --- a/config/GZLP01/rels/d_a_kokiie/splits.txt +++ b/config/GZLP01/rels/d_a_kokiie/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kokiie.cpp: +d/actor/d_a_kokiie.cpp: .text start:0x00000078 end:0x000014E4 .rodata start:0x00000000 end:0x000000FE .data start:0x00000000 end:0x00000148 diff --git a/config/GZLP01/rels/d_a_komore/splits.txt b/config/GZLP01/rels/d_a_komore/splits.txt index 84fd2d5..cccec59 100644 --- a/config/GZLP01/rels/d_a_komore/splits.txt +++ b/config/GZLP01/rels/d_a_komore/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_komore.cpp: +d/actor/d_a_komore.cpp: .text start:0x00000078 end:0x000005AC .text start:0x000005AC end:0x00000638 .rodata start:0x00000000 end:0x00000048 diff --git a/config/GZLP01/rels/d_a_ks/splits.txt b/config/GZLP01/rels/d_a_ks/splits.txt index 0381e8d..b45e7ba 100644 --- a/config/GZLP01/rels/d_a_ks/splits.txt +++ b/config/GZLP01/rels/d_a_ks/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ks.cpp: +d/actor/d_a_ks.cpp: .text start:0x00000078 end:0x00004580 .text start:0x00004580 end:0x000045B8 .text start:0x000045B8 end:0x000045B8 diff --git a/config/GZLP01/rels/d_a_kt/splits.txt b/config/GZLP01/rels/d_a_kt/splits.txt index b219acd..425cf3a 100644 --- a/config/GZLP01/rels/d_a_kt/splits.txt +++ b/config/GZLP01/rels/d_a_kt/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kt.cpp: +d/actor/d_a_kt.cpp: .text start:0x00000078 end:0x000015E8 .text start:0x000015E8 end:0x00001984 .rodata start:0x00000000 end:0x0000008B diff --git a/config/GZLP01/rels/d_a_kui/splits.txt b/config/GZLP01/rels/d_a_kui/splits.txt index ff7e7cf..97f088d 100644 --- a/config/GZLP01/rels/d_a_kui/splits.txt +++ b/config/GZLP01/rels/d_a_kui/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kui.cpp: +d/actor/d_a_kui.cpp: .text start:0x00000078 end:0x000018C8 .text start:0x000018C8 end:0x000018E4 .rodata start:0x00000000 end:0x00000099 diff --git a/config/GZLP01/rels/d_a_kytag00/splits.txt b/config/GZLP01/rels/d_a_kytag00/splits.txt index 92be9ee..596dbfe 100644 --- a/config/GZLP01/rels/d_a_kytag00/splits.txt +++ b/config/GZLP01/rels/d_a_kytag00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag00.cpp: +d/actor/d_a_kytag00.cpp: .text start:0x00000078 end:0x00000F8C .rodata start:0x00000000 end:0x0000004C .data start:0x00000000 end:0x00000080 diff --git a/config/GZLP01/rels/d_a_kytag01/splits.txt b/config/GZLP01/rels/d_a_kytag01/splits.txt index fbd6b40..72626a0 100644 --- a/config/GZLP01/rels/d_a_kytag01/splits.txt +++ b/config/GZLP01/rels/d_a_kytag01/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag01.cpp: +d/actor/d_a_kytag01.cpp: .text start:0x00000078 end:0x00000318 .rodata start:0x00000000 end:0x00000053 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_kytag02/splits.txt b/config/GZLP01/rels/d_a_kytag02/splits.txt index ee426fe..b04c749 100644 --- a/config/GZLP01/rels/d_a_kytag02/splits.txt +++ b/config/GZLP01/rels/d_a_kytag02/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag02.cpp: +d/actor/d_a_kytag02.cpp: .text start:0x00000078 end:0x0000047C .rodata start:0x00000000 end:0x00000028 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_kytag03/splits.txt b/config/GZLP01/rels/d_a_kytag03/splits.txt index 925d057..7319c98 100644 --- a/config/GZLP01/rels/d_a_kytag03/splits.txt +++ b/config/GZLP01/rels/d_a_kytag03/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag03.cpp: +d/actor/d_a_kytag03.cpp: .text start:0x00000078 end:0x00000604 .rodata start:0x00000000 end:0x0000000F .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_kytag04/splits.txt b/config/GZLP01/rels/d_a_kytag04/splits.txt index b44f370..3b6600a 100644 --- a/config/GZLP01/rels/d_a_kytag04/splits.txt +++ b/config/GZLP01/rels/d_a_kytag04/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag04.cpp: +d/actor/d_a_kytag04.cpp: .text start:0x00000078 end:0x00000208 .rodata start:0x00000000 end:0x00000004 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_kytag05/splits.txt b/config/GZLP01/rels/d_a_kytag05/splits.txt index a33a497..40d0c05 100644 --- a/config/GZLP01/rels/d_a_kytag05/splits.txt +++ b/config/GZLP01/rels/d_a_kytag05/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag05.cpp: +d/actor/d_a_kytag05.cpp: .text start:0x00000078 end:0x000004C0 .rodata start:0x00000000 end:0x00000057 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_kytag06/splits.txt b/config/GZLP01/rels/d_a_kytag06/splits.txt index 65a23f1..68d4fa5 100644 --- a/config/GZLP01/rels/d_a_kytag06/splits.txt +++ b/config/GZLP01/rels/d_a_kytag06/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag06.cpp: +d/actor/d_a_kytag06.cpp: .text start:0x00000078 end:0x00000224 .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_kytag07/splits.txt b/config/GZLP01/rels/d_a_kytag07/splits.txt index 474f793..22316d1 100644 --- a/config/GZLP01/rels/d_a_kytag07/splits.txt +++ b/config/GZLP01/rels/d_a_kytag07/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_kytag07.cpp: +d/actor/d_a_kytag07.cpp: .text start:0x00000078 end:0x00000350 .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_lamp/splits.txt b/config/GZLP01/rels/d_a_lamp/splits.txt index 8bf2590..4f909d4 100644 --- a/config/GZLP01/rels/d_a_lamp/splits.txt +++ b/config/GZLP01/rels/d_a_lamp/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_lamp.cpp: +d/actor/d_a_lamp.cpp: .text start:0x000000EC end:0x00000BC8 .rodata start:0x00000000 end:0x00000082 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLP01/rels/d_a_lbridge/splits.txt b/config/GZLP01/rels/d_a_lbridge/splits.txt index b5147c5..4d3ddc3 100644 --- a/config/GZLP01/rels/d_a_lbridge/splits.txt +++ b/config/GZLP01/rels/d_a_lbridge/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lbridge.cpp: +d/actor/d_a_lbridge.cpp: .text start:0x00000078 end:0x00001140 .rodata start:0x00000000 end:0x00000099 .data start:0x00000000 end:0x00000080 diff --git a/config/GZLP01/rels/d_a_leaflift/splits.txt b/config/GZLP01/rels/d_a_leaflift/splits.txt index 8c2f221..f58886f 100644 --- a/config/GZLP01/rels/d_a_leaflift/splits.txt +++ b/config/GZLP01/rels/d_a_leaflift/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_leaflift.cpp: +d/actor/d_a_leaflift.cpp: .text start:0x000000EC end:0x00001360 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000081 diff --git a/config/GZLP01/rels/d_a_lod_bg/splits.txt b/config/GZLP01/rels/d_a_lod_bg/splits.txt index 39864d5..ecde729 100644 --- a/config/GZLP01/rels/d_a_lod_bg/splits.txt +++ b/config/GZLP01/rels/d_a_lod_bg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lod_bg.cpp: +d/actor/d_a_lod_bg.cpp: .text start:0x00000078 end:0x000013E0 .rodata start:0x00000000 end:0x000001F5 .data start:0x00000000 end:0x000000C8 diff --git a/config/GZLP01/rels/d_a_lstair/splits.txt b/config/GZLP01/rels/d_a_lstair/splits.txt index bb0e40f..eb74440 100644 --- a/config/GZLP01/rels/d_a_lstair/splits.txt +++ b/config/GZLP01/rels/d_a_lstair/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lstair.cpp: +d/actor/d_a_lstair.cpp: .text start:0x00000078 end:0x000012D4 .rodata start:0x00000000 end:0x000000AF .data start:0x00000000 end:0x0000008C diff --git a/config/GZLP01/rels/d_a_lwood/splits.txt b/config/GZLP01/rels/d_a_lwood/splits.txt index 87270cb..712dfd3 100644 --- a/config/GZLP01/rels/d_a_lwood/splits.txt +++ b/config/GZLP01/rels/d_a_lwood/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_lwood.cpp: +d/actor/d_a_lwood.cpp: .text start:0x00000078 end:0x00000794 .rodata start:0x00000000 end:0x00000074 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_machine/splits.txt b/config/GZLP01/rels/d_a_machine/splits.txt index 67cf140..c6b98e8 100644 --- a/config/GZLP01/rels/d_a_machine/splits.txt +++ b/config/GZLP01/rels/d_a_machine/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_machine.cpp: +d/actor/d_a_machine.cpp: .text start:0x00000078 end:0x000017A4 .rodata start:0x00000000 end:0x000000B1 .data start:0x00000000 end:0x000002A0 diff --git a/config/GZLP01/rels/d_a_magma/splits.txt b/config/GZLP01/rels/d_a_magma/splits.txt index 1bc26d2..5f6e463 100644 --- a/config/GZLP01/rels/d_a_magma/splits.txt +++ b/config/GZLP01/rels/d_a_magma/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_magma.cpp: +d/actor/d_a_magma.cpp: .text start:0x00000078 end:0x00000178 .rodata start:0x00000000 end:0x00000006 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_majuu_flag/splits.txt b/config/GZLP01/rels/d_a_majuu_flag/splits.txt index 4a156ab..5b291bf 100644 --- a/config/GZLP01/rels/d_a_majuu_flag/splits.txt +++ b/config/GZLP01/rels/d_a_majuu_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_majuu_flag.cpp: +d/actor/d_a_majuu_flag.cpp: .text start:0x000000EC end:0x00001C38 .text start:0x00001C38 end:0x00001D08 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_mant/splits.txt b/config/GZLP01/rels/d_a_mant/splits.txt index 61f1c2b..a68518d 100644 --- a/config/GZLP01/rels/d_a_mant/splits.txt +++ b/config/GZLP01/rels/d_a_mant/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mant.cpp: +d/actor/d_a_mant.cpp: .text start:0x000000EC end:0x0000229C .text start:0x0000229C end:0x0000233C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_mbdoor/splits.txt b/config/GZLP01/rels/d_a_mbdoor/splits.txt index 24a483e..17935b2 100644 --- a/config/GZLP01/rels/d_a_mbdoor/splits.txt +++ b/config/GZLP01/rels/d_a_mbdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mbdoor.cpp: +d/actor/d_a_mbdoor.cpp: .text start:0x00000078 end:0x000015F4 .text start:0x000015F4 end:0x000015F4 .rodata start:0x00000000 end:0x000000FB diff --git a/config/GZLP01/rels/d_a_mdoor/splits.txt b/config/GZLP01/rels/d_a_mdoor/splits.txt index 56f7087..af08c13 100644 --- a/config/GZLP01/rels/d_a_mdoor/splits.txt +++ b/config/GZLP01/rels/d_a_mdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mdoor.cpp: +d/actor/d_a_mdoor.cpp: .text start:0x00000078 end:0x00001128 .rodata start:0x00000000 end:0x000000A2 .data start:0x00000000 end:0x000000D8 diff --git a/config/GZLP01/rels/d_a_mflft/splits.txt b/config/GZLP01/rels/d_a_mflft/splits.txt index 3f8d714..11b3e80 100644 --- a/config/GZLP01/rels/d_a_mflft/splits.txt +++ b/config/GZLP01/rels/d_a_mflft/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mflft.cpp: +d/actor/d_a_mflft.cpp: .text start:0x00000078 end:0x00002E10 .rodata start:0x00000000 end:0x000000F6 .data start:0x00000000 end:0x00000300 diff --git a/config/GZLP01/rels/d_a_mgameboard/splits.txt b/config/GZLP01/rels/d_a_mgameboard/splits.txt index d527095..9a9c54b 100644 --- a/config/GZLP01/rels/d_a_mgameboard/splits.txt +++ b/config/GZLP01/rels/d_a_mgameboard/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mgameboard.cpp: +d/actor/d_a_mgameboard.cpp: .text start:0x000000EC end:0x00002CC0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000FE diff --git a/config/GZLP01/rels/d_a_mmusic/splits.txt b/config/GZLP01/rels/d_a_mmusic/splits.txt index 9d86e94..ca72dc6 100644 --- a/config/GZLP01/rels/d_a_mmusic/splits.txt +++ b/config/GZLP01/rels/d_a_mmusic/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mmusic.cpp: +d/actor/d_a_mmusic.cpp: .text start:0x00000078 end:0x000005F0 .rodata start:0x00000000 end:0x0000001C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_mo2/splits.txt b/config/GZLP01/rels/d_a_mo2/splits.txt index 70d7c7e..04f2868 100644 --- a/config/GZLP01/rels/d_a_mo2/splits.txt +++ b/config/GZLP01/rels/d_a_mo2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mo2.cpp: +d/actor/d_a_mo2.cpp: .text start:0x000000EC end:0x0000D3A4 .text start:0x0000D3A4 end:0x0000D3A4 .text start:0x0000D3A4 end:0x0000D464 diff --git a/config/GZLP01/rels/d_a_movie_player/splits.txt b/config/GZLP01/rels/d_a_movie_player/splits.txt index ed1e861..25af88d 100644 --- a/config/GZLP01/rels/d_a_movie_player/splits.txt +++ b/config/GZLP01/rels/d_a_movie_player/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000020 -d/a/d_a_movie_player.cpp: +d/actor/d_a_movie_player.cpp: .text start:0x000000EC end:0x00006914 .text start:0x00006914 end:0x00006990 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_mozo/splits.txt b/config/GZLP01/rels/d_a_mozo/splits.txt index 24d180c..14b828a 100644 --- a/config/GZLP01/rels/d_a_mozo/splits.txt +++ b/config/GZLP01/rels/d_a_mozo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mozo.cpp: +d/actor/d_a_mozo.cpp: .text start:0x000000EC end:0x000027F8 .text start:0x000027F8 end:0x00002834 .text start:0x00002834 end:0x00002834 diff --git a/config/GZLP01/rels/d_a_msw/splits.txt b/config/GZLP01/rels/d_a_msw/splits.txt index 4a40723..1cc2165 100644 --- a/config/GZLP01/rels/d_a_msw/splits.txt +++ b/config/GZLP01/rels/d_a_msw/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_msw.cpp: +d/actor/d_a_msw.cpp: .text start:0x00000078 end:0x0000131C .rodata start:0x00000000 end:0x0000008C .data start:0x00000000 end:0x000001A8 diff --git a/config/GZLP01/rels/d_a_mt/splits.txt b/config/GZLP01/rels/d_a_mt/splits.txt index addfdee..75a0710 100644 --- a/config/GZLP01/rels/d_a_mt/splits.txt +++ b/config/GZLP01/rels/d_a_mt/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_mt.cpp: +d/actor/d_a_mt.cpp: .text start:0x000000EC end:0x0000962C .text start:0x0000962C end:0x0000962C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_mtoge/splits.txt b/config/GZLP01/rels/d_a_mtoge/splits.txt index a2a41b4..93314ce 100644 --- a/config/GZLP01/rels/d_a_mtoge/splits.txt +++ b/config/GZLP01/rels/d_a_mtoge/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_mtoge.cpp: +d/actor/d_a_mtoge.cpp: .text start:0x00000078 end:0x000007B0 .rodata start:0x00000000 end:0x00000044 .data start:0x00000000 end:0x00000064 diff --git a/config/GZLP01/rels/d_a_npc_ac1/splits.txt b/config/GZLP01/rels/d_a_npc_ac1/splits.txt index a19ec17..6b35286 100644 --- a/config/GZLP01/rels/d_a_npc_ac1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_ac1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ac1.cpp: +d/actor/d_a_npc_ac1.cpp: .text start:0x000000EC end:0x0000328C .text start:0x0000328C end:0x000032A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_ah/splits.txt b/config/GZLP01/rels/d_a_npc_ah/splits.txt index 36d6db2..4e15a9e 100644 --- a/config/GZLP01/rels/d_a_npc_ah/splits.txt +++ b/config/GZLP01/rels/d_a_npc_ah/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_ah.cpp: +d/actor/d_a_npc_ah.cpp: .text start:0x00000078 end:0x000025EC .text start:0x000025EC end:0x0000261C .text start:0x0000261C end:0x000026E8 diff --git a/config/GZLP01/rels/d_a_npc_aj1/splits.txt b/config/GZLP01/rels/d_a_npc_aj1/splits.txt index 7555ca1..5c95b2d 100644 --- a/config/GZLP01/rels/d_a_npc_aj1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_aj1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_aj1.cpp: +d/actor/d_a_npc_aj1.cpp: .text start:0x000000EC end:0x000042DC .text start:0x000042DC end:0x000042F0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_auction/splits.txt b/config/GZLP01/rels/d_a_npc_auction/splits.txt index 366b494..bdaf6e2 100644 --- a/config/GZLP01/rels/d_a_npc_auction/splits.txt +++ b/config/GZLP01/rels/d_a_npc_auction/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_auction.cpp: +d/actor/d_a_npc_auction.cpp: .text start:0x000000EC end:0x00002F1C .text start:0x00002F1C end:0x00003E70 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_ba1/splits.txt b/config/GZLP01/rels/d_a_npc_ba1/splits.txt index d071164..f21eb58 100644 --- a/config/GZLP01/rels/d_a_npc_ba1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_ba1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ba1.cpp: +d/actor/d_a_npc_ba1.cpp: .text start:0x000000EC end:0x00004AA4 .text start:0x00004AA4 end:0x00004AA4 .text start:0x00004AA4 end:0x00004AB8 diff --git a/config/GZLP01/rels/d_a_npc_bj1/splits.txt b/config/GZLP01/rels/d_a_npc_bj1/splits.txt index b2cb4f1..02b8a6d 100644 --- a/config/GZLP01/rels/d_a_npc_bj1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_bj1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bj1.cpp: +d/actor/d_a_npc_bj1.cpp: .text start:0x000000EC end:0x000074B8 .text start:0x000074B8 end:0x000074CC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_bm1/splits.txt b/config/GZLP01/rels/d_a_npc_bm1/splits.txt index 4a972b4..13f31fc 100644 --- a/config/GZLP01/rels/d_a_npc_bm1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_bm1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bm1.cpp: +d/actor/d_a_npc_bm1.cpp: .text start:0x000000EC end:0x00009810 .text start:0x00009810 end:0x00009824 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_bmcon1/splits.txt b/config/GZLP01/rels/d_a_npc_bmcon1/splits.txt index e415d3c..9eaac60 100644 --- a/config/GZLP01/rels/d_a_npc_bmcon1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_bmcon1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bmcon1.cpp: +d/actor/d_a_npc_bmcon1.cpp: .text start:0x000000EC end:0x000040B0 .text start:0x000040B0 end:0x000040E0 .text start:0x000040E0 end:0x0000429C diff --git a/config/GZLP01/rels/d_a_npc_bms1/splits.txt b/config/GZLP01/rels/d_a_npc_bms1/splits.txt index c126732..7e30814 100644 --- a/config/GZLP01/rels/d_a_npc_bms1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_bms1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bms1.cpp: +d/actor/d_a_npc_bms1.cpp: .text start:0x000000EC end:0x00004764 .text start:0x00004764 end:0x000047AC .text start:0x000047AC end:0x00004820 diff --git a/config/GZLP01/rels/d_a_npc_bmsw/splits.txt b/config/GZLP01/rels/d_a_npc_bmsw/splits.txt index 93ba916..c83a124 100644 --- a/config/GZLP01/rels/d_a_npc_bmsw/splits.txt +++ b/config/GZLP01/rels/d_a_npc_bmsw/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bmsw.cpp: +d/actor/d_a_npc_bmsw.cpp: .text start:0x000000EC end:0x00005234 .text start:0x00005234 end:0x00005290 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_bs1/splits.txt b/config/GZLP01/rels/d_a_npc_bs1/splits.txt index 08f4f0d..2027465 100644 --- a/config/GZLP01/rels/d_a_npc_bs1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_bs1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_bs1.cpp: +d/actor/d_a_npc_bs1.cpp: .text start:0x000000EC end:0x00005800 .text start:0x00005800 end:0x00005848 .text start:0x00005848 end:0x000058BC diff --git a/config/GZLP01/rels/d_a_npc_btsw/splits.txt b/config/GZLP01/rels/d_a_npc_btsw/splits.txt index 385c648..c413c45 100644 --- a/config/GZLP01/rels/d_a_npc_btsw/splits.txt +++ b/config/GZLP01/rels/d_a_npc_btsw/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_btsw.cpp: +d/actor/d_a_npc_btsw.cpp: .text start:0x000000EC end:0x00004CB0 .text start:0x00004CB0 end:0x00004D0C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_btsw2/splits.txt b/config/GZLP01/rels/d_a_npc_btsw2/splits.txt index 4ee6240..27be6e0 100644 --- a/config/GZLP01/rels/d_a_npc_btsw2/splits.txt +++ b/config/GZLP01/rels/d_a_npc_btsw2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_btsw2.cpp: +d/actor/d_a_npc_btsw2.cpp: .text start:0x000000EC end:0x000022EC .text start:0x000022EC end:0x00002348 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_cb1/splits.txt b/config/GZLP01/rels/d_a_npc_cb1/splits.txt index 6096771..2045b78 100644 --- a/config/GZLP01/rels/d_a_npc_cb1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_cb1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_cb1.cpp: +d/actor/d_a_npc_cb1.cpp: .text start:0x000000EC end:0x00009AB4 .text start:0x00009AB4 end:0x00009AFC .text start:0x00009AFC end:0x0000A19C diff --git a/config/GZLP01/rels/d_a_npc_co1/splits.txt b/config/GZLP01/rels/d_a_npc_co1/splits.txt index fc33365..24b7084 100644 --- a/config/GZLP01/rels/d_a_npc_co1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_co1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_co1.cpp: +d/actor/d_a_npc_co1.cpp: .text start:0x000000EC end:0x00003A10 .text start:0x00003A10 end:0x00003A24 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_de1/splits.txt b/config/GZLP01/rels/d_a_npc_de1/splits.txt index 8f03615..efe7849 100644 --- a/config/GZLP01/rels/d_a_npc_de1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_de1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_de1.cpp: +d/actor/d_a_npc_de1.cpp: .text start:0x000000EC end:0x00002F54 .text start:0x00002F54 end:0x00002F54 .text start:0x00002F54 end:0x00002F58 diff --git a/config/GZLP01/rels/d_a_npc_ds1/splits.txt b/config/GZLP01/rels/d_a_npc_ds1/splits.txt index 3dda44e..8ee7775 100644 --- a/config/GZLP01/rels/d_a_npc_ds1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_ds1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ds1.cpp: +d/actor/d_a_npc_ds1.cpp: .text start:0x000000EC end:0x00005768 .text start:0x00005768 end:0x000057B0 .text start:0x000057B0 end:0x00005824 diff --git a/config/GZLP01/rels/d_a_npc_gk1/splits.txt b/config/GZLP01/rels/d_a_npc_gk1/splits.txt index 5302892..e274721 100644 --- a/config/GZLP01/rels/d_a_npc_gk1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_gk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_gk1.cpp: +d/actor/d_a_npc_gk1.cpp: .text start:0x000000EC end:0x00002FF0 .text start:0x00002FF0 end:0x00003004 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_gp1/splits.txt b/config/GZLP01/rels/d_a_npc_gp1/splits.txt index 09e3fe5..daa9d17 100644 --- a/config/GZLP01/rels/d_a_npc_gp1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_gp1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_gp1.cpp: +d/actor/d_a_npc_gp1.cpp: .text start:0x000000EC end:0x00003BE8 .text start:0x00003BE8 end:0x00003BFC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_hi1/splits.txt b/config/GZLP01/rels/d_a_npc_hi1/splits.txt index 387fa72..115b71b 100644 --- a/config/GZLP01/rels/d_a_npc_hi1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_hi1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_hi1.cpp: +d/actor/d_a_npc_hi1.cpp: .text start:0x000000EC end:0x00002AB0 .text start:0x00002AB0 end:0x00002AC4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_ho/splits.txt b/config/GZLP01/rels/d_a_npc_ho/splits.txt index eaa6c18..3651e35 100644 --- a/config/GZLP01/rels/d_a_npc_ho/splits.txt +++ b/config/GZLP01/rels/d_a_npc_ho/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_ho.cpp: +d/actor/d_a_npc_ho.cpp: .text start:0x00000078 end:0x00002934 .text start:0x00002934 end:0x0000296C .rodata start:0x00000000 end:0x00000108 diff --git a/config/GZLP01/rels/d_a_npc_hr/splits.txt b/config/GZLP01/rels/d_a_npc_hr/splits.txt index 20d9ce7..7b813ac 100644 --- a/config/GZLP01/rels/d_a_npc_hr/splits.txt +++ b/config/GZLP01/rels/d_a_npc_hr/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_hr.cpp: +d/actor/d_a_npc_hr.cpp: .text start:0x00000078 end:0x00005F84 .text start:0x00005F84 end:0x00005F84 .text start:0x00005F84 end:0x00005FBC diff --git a/config/GZLP01/rels/d_a_npc_jb1/splits.txt b/config/GZLP01/rels/d_a_npc_jb1/splits.txt index be56eb5..ab80bb0 100644 --- a/config/GZLP01/rels/d_a_npc_jb1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_jb1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_jb1.cpp: +d/actor/d_a_npc_jb1.cpp: .text start:0x000000EC end:0x00001E38 .text start:0x00001E38 end:0x00001E4C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_ji1/splits.txt b/config/GZLP01/rels/d_a_npc_ji1/splits.txt index fadf505..c42423c 100644 --- a/config/GZLP01/rels/d_a_npc_ji1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_ji1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ji1.cpp: +d/actor/d_a_npc_ji1.cpp: .text start:0x000000EC end:0x000124D8 .text start:0x000124D8 end:0x000124F4 .text start:0x000124F4 end:0x00012510 diff --git a/config/GZLP01/rels/d_a_npc_kamome/splits.txt b/config/GZLP01/rels/d_a_npc_kamome/splits.txt index 654f9f2..23bce03 100644 --- a/config/GZLP01/rels/d_a_npc_kamome/splits.txt +++ b/config/GZLP01/rels/d_a_npc_kamome/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kamome.cpp: +d/actor/d_a_npc_kamome.cpp: .text start:0x000000EC end:0x000049DC .text start:0x000049DC end:0x00004AD4 .text start:0x00004AD4 end:0x00004CC0 diff --git a/config/GZLP01/rels/d_a_npc_kf1/splits.txt b/config/GZLP01/rels/d_a_npc_kf1/splits.txt index a66ecd7..e6736f4 100644 --- a/config/GZLP01/rels/d_a_npc_kf1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_kf1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kf1.cpp: +d/actor/d_a_npc_kf1.cpp: .text start:0x000000EC end:0x00004760 .text start:0x00004760 end:0x00004774 .text start:0x00004774 end:0x00004884 diff --git a/config/GZLP01/rels/d_a_npc_kg1/splits.txt b/config/GZLP01/rels/d_a_npc_kg1/splits.txt index 0aea378..c72f2bc 100644 --- a/config/GZLP01/rels/d_a_npc_kg1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_kg1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kg1.cpp: +d/actor/d_a_npc_kg1.cpp: .text start:0x000000EC end:0x00002A34 .text start:0x00002A34 end:0x00002ABC .text start:0x00002ABC end:0x00002ABC diff --git a/config/GZLP01/rels/d_a_npc_kg2/splits.txt b/config/GZLP01/rels/d_a_npc_kg2/splits.txt index d0581aa..5c00571 100644 --- a/config/GZLP01/rels/d_a_npc_kg2/splits.txt +++ b/config/GZLP01/rels/d_a_npc_kg2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kg2.cpp: +d/actor/d_a_npc_kg2.cpp: .text start:0x000000EC end:0x000031F4 .text start:0x000031F4 end:0x00003250 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_kk1/splits.txt b/config/GZLP01/rels/d_a_npc_kk1/splits.txt index 245822e..b978349 100644 --- a/config/GZLP01/rels/d_a_npc_kk1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_kk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kk1.cpp: +d/actor/d_a_npc_kk1.cpp: .text start:0x000000EC end:0x00006948 .text start:0x00006948 end:0x00006948 .text start:0x00006948 end:0x0000695C diff --git a/config/GZLP01/rels/d_a_npc_km1/splits.txt b/config/GZLP01/rels/d_a_npc_km1/splits.txt index 66de594..36925d1 100644 --- a/config/GZLP01/rels/d_a_npc_km1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_km1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_km1.cpp: +d/actor/d_a_npc_km1.cpp: .text start:0x000000EC end:0x0000238C .text start:0x0000238C end:0x000023A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_ko1/splits.txt b/config/GZLP01/rels/d_a_npc_ko1/splits.txt index e7b917d..8deb91b 100644 --- a/config/GZLP01/rels/d_a_npc_ko1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_ko1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ko1.cpp: +d/actor/d_a_npc_ko1.cpp: .text start:0x000000EC end:0x00008948 .text start:0x00008948 end:0x0000895C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_kp1/splits.txt b/config/GZLP01/rels/d_a_npc_kp1/splits.txt index 2e42cdd..9f2230d 100644 --- a/config/GZLP01/rels/d_a_npc_kp1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_kp1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_kp1.cpp: +d/actor/d_a_npc_kp1.cpp: .text start:0x000000EC end:0x00002D5C .text start:0x00002D5C end:0x00002D70 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_ls1/splits.txt b/config/GZLP01/rels/d_a_npc_ls1/splits.txt index 9fbe874..70545e8 100644 --- a/config/GZLP01/rels/d_a_npc_ls1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_ls1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ls1.cpp: +d/actor/d_a_npc_ls1.cpp: .text start:0x000000EC end:0x00005880 .text start:0x00005880 end:0x00005880 .text start:0x00005880 end:0x00005894 diff --git a/config/GZLP01/rels/d_a_npc_md/splits.txt b/config/GZLP01/rels/d_a_npc_md/splits.txt index 9d9dd58..c482cd5 100644 --- a/config/GZLP01/rels/d_a_npc_md/splits.txt +++ b/config/GZLP01/rels/d_a_npc_md/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_md.cpp: +d/actor/d_a_npc_md.cpp: .text start:0x000000EC end:0x000118C4 .text start:0x000118C4 end:0x0001190C .text start:0x0001190C end:0x000119A8 diff --git a/config/GZLP01/rels/d_a_npc_mk/splits.txt b/config/GZLP01/rels/d_a_npc_mk/splits.txt index 7dd5d63..3d4797c 100644 --- a/config/GZLP01/rels/d_a_npc_mk/splits.txt +++ b/config/GZLP01/rels/d_a_npc_mk/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_mk.cpp: +d/actor/d_a_npc_mk.cpp: .text start:0x00000078 end:0x00004C38 .text start:0x00004C38 end:0x00004C70 .rodata start:0x00000000 end:0x00000227 diff --git a/config/GZLP01/rels/d_a_npc_mn/splits.txt b/config/GZLP01/rels/d_a_npc_mn/splits.txt index 6f33208..b1c9801 100644 --- a/config/GZLP01/rels/d_a_npc_mn/splits.txt +++ b/config/GZLP01/rels/d_a_npc_mn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_mn.cpp: +d/actor/d_a_npc_mn.cpp: .text start:0x00000078 end:0x00003F9C .text start:0x00003F9C end:0x00003FCC .text start:0x00003FCC end:0x00004128 diff --git a/config/GZLP01/rels/d_a_npc_mt/splits.txt b/config/GZLP01/rels/d_a_npc_mt/splits.txt index d79aed9..7d3263c 100644 --- a/config/GZLP01/rels/d_a_npc_mt/splits.txt +++ b/config/GZLP01/rels/d_a_npc_mt/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_mt.cpp: +d/actor/d_a_npc_mt.cpp: .text start:0x00000078 end:0x00003000 .text start:0x00003000 end:0x00003030 .text start:0x00003030 end:0x000030E0 diff --git a/config/GZLP01/rels/d_a_npc_nz/splits.txt b/config/GZLP01/rels/d_a_npc_nz/splits.txt index 7b1a863..b951be7 100644 --- a/config/GZLP01/rels/d_a_npc_nz/splits.txt +++ b/config/GZLP01/rels/d_a_npc_nz/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_nz.cpp: +d/actor/d_a_npc_nz.cpp: .text start:0x000000EC end:0x000032BC .text start:0x000032BC end:0x00004554 .text start:0x00004554 end:0x00004554 diff --git a/config/GZLP01/rels/d_a_npc_ob1/splits.txt b/config/GZLP01/rels/d_a_npc_ob1/splits.txt index 93c7f00..f52a8e5 100644 --- a/config/GZLP01/rels/d_a_npc_ob1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_ob1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ob1.cpp: +d/actor/d_a_npc_ob1.cpp: .text start:0x000000EC end:0x00003EAC .text start:0x00003EAC end:0x00003EC0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_os/splits.txt b/config/GZLP01/rels/d_a_npc_os/splits.txt index dc56fa5..af4de04 100644 --- a/config/GZLP01/rels/d_a_npc_os/splits.txt +++ b/config/GZLP01/rels/d_a_npc_os/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_os.cpp: +d/actor/d_a_npc_os.cpp: .text start:0x000000EC end:0x000074CC .text start:0x000074CC end:0x00007514 .text start:0x00007514 end:0x00007B48 diff --git a/config/GZLP01/rels/d_a_npc_p1/splits.txt b/config/GZLP01/rels/d_a_npc_p1/splits.txt index 9e9efbd..6f2cde8 100644 --- a/config/GZLP01/rels/d_a_npc_p1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_p1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_p1.cpp: +d/actor/d_a_npc_p1.cpp: .text start:0x000000EC end:0x00004F14 .text start:0x00004F14 end:0x00004F30 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_p2/splits.txt b/config/GZLP01/rels/d_a_npc_p2/splits.txt index aa1787c..e5e5d46 100644 --- a/config/GZLP01/rels/d_a_npc_p2/splits.txt +++ b/config/GZLP01/rels/d_a_npc_p2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_p2.cpp: +d/actor/d_a_npc_p2.cpp: .text start:0x000000EC end:0x000051D4 .text start:0x000051D4 end:0x00005238 .text start:0x00005238 end:0x00008400 diff --git a/config/GZLP01/rels/d_a_npc_people/splits.txt b/config/GZLP01/rels/d_a_npc_people/splits.txt index 4ad378d..8a020bf 100644 --- a/config/GZLP01/rels/d_a_npc_people/splits.txt +++ b/config/GZLP01/rels/d_a_npc_people/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_people.cpp: +d/actor/d_a_npc_people.cpp: .text start:0x00000078 end:0x00009BCC .text start:0x00009BCC end:0x00009BF0 .text start:0x00009BF0 end:0x00009C38 diff --git a/config/GZLP01/rels/d_a_npc_pf1/splits.txt b/config/GZLP01/rels/d_a_npc_pf1/splits.txt index 50f23bc..2e70056 100644 --- a/config/GZLP01/rels/d_a_npc_pf1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_pf1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_pf1.cpp: +d/actor/d_a_npc_pf1.cpp: .text start:0x000000EC end:0x00003AE0 .text start:0x00003AE0 end:0x00003AF4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_photo/splits.txt b/config/GZLP01/rels/d_a_npc_photo/splits.txt index 09e1a7d..96b0a18 100644 --- a/config/GZLP01/rels/d_a_npc_photo/splits.txt +++ b/config/GZLP01/rels/d_a_npc_photo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_photo.cpp: +d/actor/d_a_npc_photo.cpp: .text start:0x000000EC end:0x00004FF8 .text start:0x00004FF8 end:0x00005040 .text start:0x00005040 end:0x00005070 diff --git a/config/GZLP01/rels/d_a_npc_pm1/splits.txt b/config/GZLP01/rels/d_a_npc_pm1/splits.txt index fe31f87..874b80d 100644 --- a/config/GZLP01/rels/d_a_npc_pm1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_pm1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_pm1.cpp: +d/actor/d_a_npc_pm1.cpp: .text start:0x000000EC end:0x0000239C .text start:0x0000239C end:0x000023B0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_roten/splits.txt b/config/GZLP01/rels/d_a_npc_roten/splits.txt index cf10b6b..5fac535 100644 --- a/config/GZLP01/rels/d_a_npc_roten/splits.txt +++ b/config/GZLP01/rels/d_a_npc_roten/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_roten.cpp: +d/actor/d_a_npc_roten.cpp: .text start:0x00000078 end:0x00003F9C .text start:0x00003F9C end:0x00003FB8 .text start:0x00003FB8 end:0x000042C0 diff --git a/config/GZLP01/rels/d_a_npc_rsh1/splits.txt b/config/GZLP01/rels/d_a_npc_rsh1/splits.txt index 79e827f..bcbddac 100644 --- a/config/GZLP01/rels/d_a_npc_rsh1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_rsh1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_rsh1.cpp: +d/actor/d_a_npc_rsh1.cpp: .text start:0x000000EC end:0x00004F98 .text start:0x00004F98 end:0x00004FE0 .text start:0x00004FE0 end:0x00005018 diff --git a/config/GZLP01/rels/d_a_npc_sarace/splits.txt b/config/GZLP01/rels/d_a_npc_sarace/splits.txt index d5962fd..6e3b517 100644 --- a/config/GZLP01/rels/d_a_npc_sarace/splits.txt +++ b/config/GZLP01/rels/d_a_npc_sarace/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_sarace.cpp: +d/actor/d_a_npc_sarace.cpp: .text start:0x000000EC end:0x00002818 .text start:0x00002818 end:0x00002874 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_so/splits.txt b/config/GZLP01/rels/d_a_npc_so/splits.txt index 830541c..ce4d93e 100644 --- a/config/GZLP01/rels/d_a_npc_so/splits.txt +++ b/config/GZLP01/rels/d_a_npc_so/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_so.cpp: +d/actor/d_a_npc_so.cpp: .text start:0x000000EC end:0x00004BE0 .text start:0x00004BE0 end:0x00004C28 .text start:0x00004C28 end:0x00004CE8 diff --git a/config/GZLP01/rels/d_a_npc_sv/splits.txt b/config/GZLP01/rels/d_a_npc_sv/splits.txt index 92e216f..b6d7be8 100644 --- a/config/GZLP01/rels/d_a_npc_sv/splits.txt +++ b/config/GZLP01/rels/d_a_npc_sv/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_sv.cpp: +d/actor/d_a_npc_sv.cpp: .text start:0x00000078 end:0x00002C0C .text start:0x00002C0C end:0x00002C28 .text start:0x00002C28 end:0x00002C58 diff --git a/config/GZLP01/rels/d_a_npc_tc/splits.txt b/config/GZLP01/rels/d_a_npc_tc/splits.txt index a2ed88d..40da27d 100644 --- a/config/GZLP01/rels/d_a_npc_tc/splits.txt +++ b/config/GZLP01/rels/d_a_npc_tc/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_tc.cpp: +d/actor/d_a_npc_tc.cpp: .text start:0x000000EC end:0x00004BAC .text start:0x00004BAC end:0x00005158 .text start:0x00005158 end:0x00005498 diff --git a/config/GZLP01/rels/d_a_npc_tt/splits.txt b/config/GZLP01/rels/d_a_npc_tt/splits.txt index 2f49b20..3a06d97 100644 --- a/config/GZLP01/rels/d_a_npc_tt/splits.txt +++ b/config/GZLP01/rels/d_a_npc_tt/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_npc_tt.cpp: +d/actor/d_a_npc_tt.cpp: .text start:0x00000078 end:0x00002C60 .text start:0x00002C60 end:0x00002CD4 .text start:0x00002CD4 end:0x00003210 diff --git a/config/GZLP01/rels/d_a_npc_uk/splits.txt b/config/GZLP01/rels/d_a_npc_uk/splits.txt index 2037503..aad16a6 100644 --- a/config/GZLP01/rels/d_a_npc_uk/splits.txt +++ b/config/GZLP01/rels/d_a_npc_uk/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_uk.cpp: +d/actor/d_a_npc_uk.cpp: .text start:0x000000EC end:0x00005A0C .text start:0x00005A0C end:0x00005A44 .rodata start:0x00000000 end:0x0000026A diff --git a/config/GZLP01/rels/d_a_npc_ym1/splits.txt b/config/GZLP01/rels/d_a_npc_ym1/splits.txt index c83aa76..d6dc7b7 100644 --- a/config/GZLP01/rels/d_a_npc_ym1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_ym1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_ym1.cpp: +d/actor/d_a_npc_ym1.cpp: .text start:0x000000EC end:0x000048E4 .text start:0x000048E4 end:0x000048F8 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_yw1/splits.txt b/config/GZLP01/rels/d_a_npc_yw1/splits.txt index b107a04..5790be0 100644 --- a/config/GZLP01/rels/d_a_npc_yw1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_yw1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_yw1.cpp: +d/actor/d_a_npc_yw1.cpp: .text start:0x000000EC end:0x00004CF4 .text start:0x00004CF4 end:0x00004D08 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_zk1/splits.txt b/config/GZLP01/rels/d_a_npc_zk1/splits.txt index bc2d0ea..aaaa80d 100644 --- a/config/GZLP01/rels/d_a_npc_zk1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_zk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_zk1.cpp: +d/actor/d_a_npc_zk1.cpp: .text start:0x000000EC end:0x000029D0 .text start:0x000029D0 end:0x000029E4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_npc_zl1/splits.txt b/config/GZLP01/rels/d_a_npc_zl1/splits.txt index 32cdd71..abfb09b 100644 --- a/config/GZLP01/rels/d_a_npc_zl1/splits.txt +++ b/config/GZLP01/rels/d_a_npc_zl1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_npc_zl1.cpp: +d/actor/d_a_npc_zl1.cpp: .text start:0x000000EC end:0x00007CA0 .text start:0x00007CA0 end:0x00007CBC .text start:0x00007CBC end:0x00007CD0 diff --git a/config/GZLP01/rels/d_a_nz/splits.txt b/config/GZLP01/rels/d_a_nz/splits.txt index 58675e2..810f9cc 100644 --- a/config/GZLP01/rels/d_a_nz/splits.txt +++ b/config/GZLP01/rels/d_a_nz/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_nz.cpp: +d/actor/d_a_nz.cpp: .text start:0x000000EC end:0x00008E50 .text start:0x00008E50 end:0x00008E6C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_nzg/splits.txt b/config/GZLP01/rels/d_a_nzg/splits.txt index 9c3b47e..04e0d2c 100644 --- a/config/GZLP01/rels/d_a_nzg/splits.txt +++ b/config/GZLP01/rels/d_a_nzg/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_nzg.cpp: +d/actor/d_a_nzg.cpp: .text start:0x00000078 end:0x00000B18 .rodata start:0x00000000 end:0x00000072 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLP01/rels/d_a_obj_AjavW/splits.txt b/config/GZLP01/rels/d_a_obj_AjavW/splits.txt index 62ed544..d79baf4 100644 --- a/config/GZLP01/rels/d_a_obj_AjavW/splits.txt +++ b/config/GZLP01/rels/d_a_obj_AjavW/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_AjavW.cpp: +d/actor/d_a_obj_AjavW.cpp: .text start:0x00000078 end:0x00000600 .rodata start:0x00000000 end:0x00000025 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLP01/rels/d_a_obj_Itnak/splits.txt b/config/GZLP01/rels/d_a_obj_Itnak/splits.txt index 544e046..ac19ba8 100644 --- a/config/GZLP01/rels/d_a_obj_Itnak/splits.txt +++ b/config/GZLP01/rels/d_a_obj_Itnak/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Itnak.cpp: +d/actor/d_a_obj_Itnak.cpp: .text start:0x00000078 end:0x0000144C .text start:0x0000144C end:0x00001850 .text start:0x00001850 end:0x000018BC diff --git a/config/GZLP01/rels/d_a_obj_Vds/splits.txt b/config/GZLP01/rels/d_a_obj_Vds/splits.txt index 2354c0f..263aa35 100644 --- a/config/GZLP01/rels/d_a_obj_Vds/splits.txt +++ b/config/GZLP01/rels/d_a_obj_Vds/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Vds.cpp: +d/actor/d_a_obj_Vds.cpp: .text start:0x00000078 end:0x0000163C .text start:0x0000163C end:0x00001720 .text start:0x00001720 end:0x0000173C diff --git a/config/GZLP01/rels/d_a_obj_Vteng/splits.txt b/config/GZLP01/rels/d_a_obj_Vteng/splits.txt index 27a6c37..1871d8e 100644 --- a/config/GZLP01/rels/d_a_obj_Vteng/splits.txt +++ b/config/GZLP01/rels/d_a_obj_Vteng/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Vteng.cpp: +d/actor/d_a_obj_Vteng.cpp: .text start:0x00000078 end:0x0000060C .rodata start:0x00000000 end:0x0000002B .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_YLzou/splits.txt b/config/GZLP01/rels/d_a_obj_YLzou/splits.txt index 959c35c..c4b47f4 100644 --- a/config/GZLP01/rels/d_a_obj_YLzou/splits.txt +++ b/config/GZLP01/rels/d_a_obj_YLzou/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_YLzou.cpp: +d/actor/d_a_obj_YLzou.cpp: .text start:0x000000EC end:0x0000197C .text start:0x0000197C end:0x00001A48 .text start:0x00001A48 end:0x00001A64 diff --git a/config/GZLP01/rels/d_a_obj_Yboil/splits.txt b/config/GZLP01/rels/d_a_obj_Yboil/splits.txt index ac082ea..d60cbf5 100644 --- a/config/GZLP01/rels/d_a_obj_Yboil/splits.txt +++ b/config/GZLP01/rels/d_a_obj_Yboil/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Yboil.cpp: +d/actor/d_a_obj_Yboil.cpp: .text start:0x00000078 end:0x00000DFC .text start:0x00000DFC end:0x00000E18 .rodata start:0x00000000 end:0x0000007F diff --git a/config/GZLP01/rels/d_a_obj_Ygush00/splits.txt b/config/GZLP01/rels/d_a_obj_Ygush00/splits.txt index c47dd80..f5a2f9c 100644 --- a/config/GZLP01/rels/d_a_obj_Ygush00/splits.txt +++ b/config/GZLP01/rels/d_a_obj_Ygush00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_Ygush00.cpp: +d/actor/d_a_obj_Ygush00.cpp: .text start:0x00000078 end:0x00000790 .text start:0x00000790 end:0x000007AC .rodata start:0x00000000 end:0x0000003B diff --git a/config/GZLP01/rels/d_a_obj_adnno/splits.txt b/config/GZLP01/rels/d_a_obj_adnno/splits.txt index 7269693..7e593ff 100644 --- a/config/GZLP01/rels/d_a_obj_adnno/splits.txt +++ b/config/GZLP01/rels/d_a_obj_adnno/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_adnno.cpp: +d/actor/d_a_obj_adnno.cpp: .text start:0x00000078 end:0x00000524 .rodata start:0x00000000 end:0x000000B4 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_ajav/splits.txt b/config/GZLP01/rels/d_a_obj_ajav/splits.txt index 2d75f8f..bcfb7c0 100644 --- a/config/GZLP01/rels/d_a_obj_ajav/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ajav/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ajav.cpp: +d/actor/d_a_obj_ajav.cpp: .text start:0x000000EC end:0x00003580 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000001C1 diff --git a/config/GZLP01/rels/d_a_obj_akabe/splits.txt b/config/GZLP01/rels/d_a_obj_akabe/splits.txt index 30de780..e7012b1 100644 --- a/config/GZLP01/rels/d_a_obj_akabe/splits.txt +++ b/config/GZLP01/rels/d_a_obj_akabe/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_akabe.cpp: +d/actor/d_a_obj_akabe.cpp: .text start:0x00000078 end:0x00000680 .text start:0x00000680 end:0x0000069C .rodata start:0x00000000 end:0x0000007E diff --git a/config/GZLP01/rels/d_a_obj_apzl/splits.txt b/config/GZLP01/rels/d_a_obj_apzl/splits.txt index a505123..a43ad9d 100644 --- a/config/GZLP01/rels/d_a_obj_apzl/splits.txt +++ b/config/GZLP01/rels/d_a_obj_apzl/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_apzl.cpp: +d/actor/d_a_obj_apzl.cpp: .text start:0x00000078 end:0x00001E94 .rodata start:0x00000000 end:0x00000503 .data start:0x00000000 end:0x00000118 diff --git a/config/GZLP01/rels/d_a_obj_ashut/splits.txt b/config/GZLP01/rels/d_a_obj_ashut/splits.txt index 13b26a6..7be5e4b 100644 --- a/config/GZLP01/rels/d_a_obj_ashut/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ashut/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ashut.cpp: +d/actor/d_a_obj_ashut.cpp: .text start:0x00000078 end:0x00000E24 .text start:0x00000E24 end:0x00000E64 .text start:0x00000E64 end:0x00000E80 diff --git a/config/GZLP01/rels/d_a_obj_auzu/splits.txt b/config/GZLP01/rels/d_a_obj_auzu/splits.txt index 8cda9c0..80f1b45 100644 --- a/config/GZLP01/rels/d_a_obj_auzu/splits.txt +++ b/config/GZLP01/rels/d_a_obj_auzu/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_auzu.cpp: +d/actor/d_a_obj_auzu.cpp: .text start:0x00000078 end:0x00000CCC .text start:0x00000CCC end:0x00000CE8 .rodata start:0x00000000 end:0x0000008E diff --git a/config/GZLP01/rels/d_a_obj_aygr/splits.txt b/config/GZLP01/rels/d_a_obj_aygr/splits.txt index 5837805..e93d469 100644 --- a/config/GZLP01/rels/d_a_obj_aygr/splits.txt +++ b/config/GZLP01/rels/d_a_obj_aygr/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_aygr.cpp: +d/actor/d_a_obj_aygr.cpp: .text start:0x00000078 end:0x00000854 .text start:0x00000854 end:0x0000086C .text start:0x0000086C end:0x00000888 diff --git a/config/GZLP01/rels/d_a_obj_balancelift/splits.txt b/config/GZLP01/rels/d_a_obj_balancelift/splits.txt index a6cec87..0a011ed 100644 --- a/config/GZLP01/rels/d_a_obj_balancelift/splits.txt +++ b/config/GZLP01/rels/d_a_obj_balancelift/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_balancelift.cpp: +d/actor/d_a_obj_balancelift.cpp: .text start:0x000000EC end:0x000018FC .text start:0x000018FC end:0x000018FC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_barrel/splits.txt b/config/GZLP01/rels/d_a_obj_barrel/splits.txt index 526dc11..66139ff 100644 --- a/config/GZLP01/rels/d_a_obj_barrel/splits.txt +++ b/config/GZLP01/rels/d_a_obj_barrel/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_barrel.cpp: +d/actor/d_a_obj_barrel.cpp: .text start:0x00000078 end:0x000026D0 .text start:0x000026D0 end:0x0000270C .rodata start:0x00000000 end:0x000001A9 diff --git a/config/GZLP01/rels/d_a_obj_barrel2/splits.txt b/config/GZLP01/rels/d_a_obj_barrel2/splits.txt index 440802e..ab9f3ce 100644 --- a/config/GZLP01/rels/d_a_obj_barrel2/splits.txt +++ b/config/GZLP01/rels/d_a_obj_barrel2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_barrel2.cpp: +d/actor/d_a_obj_barrel2.cpp: .text start:0x000000EC end:0x000034C8 .text start:0x000034C8 end:0x0000352C .rodata start:0x00000000 end:0x00000305 diff --git a/config/GZLP01/rels/d_a_obj_barrier/splits.txt b/config/GZLP01/rels/d_a_obj_barrier/splits.txt index a89dd5b..fcad582 100644 --- a/config/GZLP01/rels/d_a_obj_barrier/splits.txt +++ b/config/GZLP01/rels/d_a_obj_barrier/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_barrier.cpp: +d/actor/d_a_obj_barrier.cpp: .text start:0x000000EC end:0x00001D9C .text start:0x00001D9C end:0x00002130 .text start:0x00002130 end:0x000021A4 diff --git a/config/GZLP01/rels/d_a_obj_bemos/splits.txt b/config/GZLP01/rels/d_a_obj_bemos/splits.txt index 6df5120..92be408 100644 --- a/config/GZLP01/rels/d_a_obj_bemos/splits.txt +++ b/config/GZLP01/rels/d_a_obj_bemos/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_bemos.cpp: +d/actor/d_a_obj_bemos.cpp: .text start:0x000000EC end:0x000050E8 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000120 diff --git a/config/GZLP01/rels/d_a_obj_bscurtain/splits.txt b/config/GZLP01/rels/d_a_obj_bscurtain/splits.txt index 7f0caa2..48c9a23 100644 --- a/config/GZLP01/rels/d_a_obj_bscurtain/splits.txt +++ b/config/GZLP01/rels/d_a_obj_bscurtain/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_bscurtain.cpp: +d/actor/d_a_obj_bscurtain.cpp: .text start:0x000000EC end:0x00000584 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000032 diff --git a/config/GZLP01/rels/d_a_obj_buoyflag/splits.txt b/config/GZLP01/rels/d_a_obj_buoyflag/splits.txt index c42f008..0ce69e2 100644 --- a/config/GZLP01/rels/d_a_obj_buoyflag/splits.txt +++ b/config/GZLP01/rels/d_a_obj_buoyflag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_buoyflag.cpp: +d/actor/d_a_obj_buoyflag.cpp: .text start:0x000000EC end:0x00002C90 .text start:0x00002C90 end:0x00003068 .text start:0x00003068 end:0x00003124 diff --git a/config/GZLP01/rels/d_a_obj_buoyrace/splits.txt b/config/GZLP01/rels/d_a_obj_buoyrace/splits.txt index bce9ddb..8c797b2 100644 --- a/config/GZLP01/rels/d_a_obj_buoyrace/splits.txt +++ b/config/GZLP01/rels/d_a_obj_buoyrace/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_buoyrace.cpp: +d/actor/d_a_obj_buoyrace.cpp: .text start:0x00000078 end:0x00000BBC .text start:0x00000BBC end:0x00000BD8 .rodata start:0x00000000 end:0x000000EA diff --git a/config/GZLP01/rels/d_a_obj_cafelmp/splits.txt b/config/GZLP01/rels/d_a_obj_cafelmp/splits.txt index 07f79dc..fd1ebe2 100644 --- a/config/GZLP01/rels/d_a_obj_cafelmp/splits.txt +++ b/config/GZLP01/rels/d_a_obj_cafelmp/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_cafelmp.cpp: +d/actor/d_a_obj_cafelmp.cpp: .text start:0x00000078 end:0x000003F8 .rodata start:0x00000000 end:0x00000044 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_canon/splits.txt b/config/GZLP01/rels/d_a_obj_canon/splits.txt index 8b883f7..638a00a 100644 --- a/config/GZLP01/rels/d_a_obj_canon/splits.txt +++ b/config/GZLP01/rels/d_a_obj_canon/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_canon.cpp: +d/actor/d_a_obj_canon.cpp: .text start:0x000000EC end:0x00001F90 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000140 diff --git a/config/GZLP01/rels/d_a_obj_coming/splits.txt b/config/GZLP01/rels/d_a_obj_coming/splits.txt index 5d72ede..9496612 100644 --- a/config/GZLP01/rels/d_a_obj_coming/splits.txt +++ b/config/GZLP01/rels/d_a_obj_coming/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_coming.cpp: +d/actor/d_a_obj_coming.cpp: .text start:0x000000EC end:0x000016D8 .text start:0x000016D8 end:0x0000205C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_correct/splits.txt b/config/GZLP01/rels/d_a_obj_correct/splits.txt index 8c7f277..5279c6a 100644 --- a/config/GZLP01/rels/d_a_obj_correct/splits.txt +++ b/config/GZLP01/rels/d_a_obj_correct/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_correct.cpp: +d/actor/d_a_obj_correct.cpp: .text start:0x00000078 end:0x00000E50 .text start:0x00000E50 end:0x00000E50 .text start:0x00000E50 end:0x00000EA4 diff --git a/config/GZLP01/rels/d_a_obj_demo_barrel/splits.txt b/config/GZLP01/rels/d_a_obj_demo_barrel/splits.txt index 60cc0c5..497d0f9 100644 --- a/config/GZLP01/rels/d_a_obj_demo_barrel/splits.txt +++ b/config/GZLP01/rels/d_a_obj_demo_barrel/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_demo_barrel.cpp: +d/actor/d_a_obj_demo_barrel.cpp: .text start:0x00000078 end:0x0000081C .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_dmgroom/splits.txt b/config/GZLP01/rels/d_a_obj_dmgroom/splits.txt index 3803eba..b2bf856 100644 --- a/config/GZLP01/rels/d_a_obj_dmgroom/splits.txt +++ b/config/GZLP01/rels/d_a_obj_dmgroom/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_dmgroom.cpp: +d/actor/d_a_obj_dmgroom.cpp: .text start:0x00000078 end:0x000005D4 .rodata start:0x00000000 end:0x0000004D .data start:0x00000000 end:0x00000068 diff --git a/config/GZLP01/rels/d_a_obj_doguu/splits.txt b/config/GZLP01/rels/d_a_obj_doguu/splits.txt index 692048d..c418ad6 100644 --- a/config/GZLP01/rels/d_a_obj_doguu/splits.txt +++ b/config/GZLP01/rels/d_a_obj_doguu/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_doguu.cpp: +d/actor/d_a_obj_doguu.cpp: .text start:0x00000078 end:0x000028A0 .text start:0x000028A0 end:0x000028A0 .text start:0x000028A0 end:0x000028D4 diff --git a/config/GZLP01/rels/d_a_obj_doguu_demo/splits.txt b/config/GZLP01/rels/d_a_obj_doguu_demo/splits.txt index e79911a..da3707f 100644 --- a/config/GZLP01/rels/d_a_obj_doguu_demo/splits.txt +++ b/config/GZLP01/rels/d_a_obj_doguu_demo/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_doguu_demo.cpp: +d/actor/d_a_obj_doguu_demo.cpp: .text start:0x00000078 end:0x00000540 .rodata start:0x00000000 end:0x00000042 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_dragonhead/splits.txt b/config/GZLP01/rels/d_a_obj_dragonhead/splits.txt index eee60bf..277a934 100644 --- a/config/GZLP01/rels/d_a_obj_dragonhead/splits.txt +++ b/config/GZLP01/rels/d_a_obj_dragonhead/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_dragonhead.cpp: +d/actor/d_a_obj_dragonhead.cpp: .text start:0x00000078 end:0x00000B4C .rodata start:0x00000000 end:0x00000046 .data start:0x00000000 end:0x00000184 diff --git a/config/GZLP01/rels/d_a_obj_drift/splits.txt b/config/GZLP01/rels/d_a_obj_drift/splits.txt index 4caf7ff..dfab859 100644 --- a/config/GZLP01/rels/d_a_obj_drift/splits.txt +++ b/config/GZLP01/rels/d_a_obj_drift/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_drift.cpp: +d/actor/d_a_obj_drift.cpp: .text start:0x000000EC end:0x00001328 .text start:0x00001328 end:0x0000149C .text start:0x0000149C end:0x000014C8 diff --git a/config/GZLP01/rels/d_a_obj_eayogn/splits.txt b/config/GZLP01/rels/d_a_obj_eayogn/splits.txt index 6da8846..29eaf65 100644 --- a/config/GZLP01/rels/d_a_obj_eayogn/splits.txt +++ b/config/GZLP01/rels/d_a_obj_eayogn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_eayogn.cpp: +d/actor/d_a_obj_eayogn.cpp: .text start:0x00000078 end:0x00000524 .rodata start:0x00000000 end:0x00000046 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_ebomzo/splits.txt b/config/GZLP01/rels/d_a_obj_ebomzo/splits.txt index d0aad60..e3c3ca1 100644 --- a/config/GZLP01/rels/d_a_obj_ebomzo/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ebomzo/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ebomzo.cpp: +d/actor/d_a_obj_ebomzo.cpp: .text start:0x00000078 end:0x00000C54 .text start:0x00000C54 end:0x00000D58 .text start:0x00000D58 end:0x00000D84 diff --git a/config/GZLP01/rels/d_a_obj_eff/splits.txt b/config/GZLP01/rels/d_a_obj_eff/splits.txt index ea72a6d..fe53fce 100644 --- a/config/GZLP01/rels/d_a_obj_eff/splits.txt +++ b/config/GZLP01/rels/d_a_obj_eff/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_eff.cpp: +d/actor/d_a_obj_eff.cpp: .text start:0x000000EC end:0x00001538 .text start:0x00001538 end:0x00001934 .text start:0x00001934 end:0x00001950 diff --git a/config/GZLP01/rels/d_a_obj_ekskz/splits.txt b/config/GZLP01/rels/d_a_obj_ekskz/splits.txt index b450c15..fcc1e09 100644 --- a/config/GZLP01/rels/d_a_obj_ekskz/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ekskz/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ekskz.cpp: +d/actor/d_a_obj_ekskz.cpp: .text start:0x00000078 end:0x000011DC .text start:0x000011DC end:0x00001394 .text start:0x00001394 end:0x000013C0 diff --git a/config/GZLP01/rels/d_a_obj_eskban/splits.txt b/config/GZLP01/rels/d_a_obj_eskban/splits.txt index 64f1932..ea58e33 100644 --- a/config/GZLP01/rels/d_a_obj_eskban/splits.txt +++ b/config/GZLP01/rels/d_a_obj_eskban/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_eskban.cpp: +d/actor/d_a_obj_eskban.cpp: .text start:0x000000EC end:0x0000156C .text start:0x0000156C end:0x00001798 .text start:0x00001798 end:0x000017D4 diff --git a/config/GZLP01/rels/d_a_obj_ferris/splits.txt b/config/GZLP01/rels/d_a_obj_ferris/splits.txt index 809e4be..6345d18 100644 --- a/config/GZLP01/rels/d_a_obj_ferris/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ferris/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ferris.cpp: +d/actor/d_a_obj_ferris.cpp: .text start:0x000000EC end:0x00002098 .text start:0x00002098 end:0x000020D4 .rodata start:0x00000000 end:0x000001F5 diff --git a/config/GZLP01/rels/d_a_obj_figure/splits.txt b/config/GZLP01/rels/d_a_obj_figure/splits.txt index d242e5e..0fec6f8 100644 --- a/config/GZLP01/rels/d_a_obj_figure/splits.txt +++ b/config/GZLP01/rels/d_a_obj_figure/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_figure.cpp: +d/actor/d_a_obj_figure.cpp: .text start:0x000000EC end:0x00002348 .text start:0x00002348 end:0x000023A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_firewall/splits.txt b/config/GZLP01/rels/d_a_obj_firewall/splits.txt index 33fb557..c61b212 100644 --- a/config/GZLP01/rels/d_a_obj_firewall/splits.txt +++ b/config/GZLP01/rels/d_a_obj_firewall/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_firewall.cpp: +d/actor/d_a_obj_firewall.cpp: .text start:0x00000078 end:0x00001E9C .text start:0x00001E9C end:0x00001EF4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_flame/splits.txt b/config/GZLP01/rels/d_a_obj_flame/splits.txt index 643454b..8d7f3fa 100644 --- a/config/GZLP01/rels/d_a_obj_flame/splits.txt +++ b/config/GZLP01/rels/d_a_obj_flame/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_flame.cpp: +d/actor/d_a_obj_flame.cpp: .text start:0x00000078 end:0x0000298C .text start:0x0000298C end:0x000029B8 .rodata start:0x00000000 end:0x0000028B diff --git a/config/GZLP01/rels/d_a_obj_ftree/splits.txt b/config/GZLP01/rels/d_a_obj_ftree/splits.txt index acc6e88..3ffab4b 100644 --- a/config/GZLP01/rels/d_a_obj_ftree/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ftree/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ftree.cpp: +d/actor/d_a_obj_ftree.cpp: .text start:0x00000078 end:0x0000476C .text start:0x0000476C end:0x0000476C .text start:0x0000476C end:0x00004AB8 diff --git a/config/GZLP01/rels/d_a_obj_ganonbed/splits.txt b/config/GZLP01/rels/d_a_obj_ganonbed/splits.txt index 65240d5..7e3aa32 100644 --- a/config/GZLP01/rels/d_a_obj_ganonbed/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ganonbed/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ganonbed.cpp: +d/actor/d_a_obj_ganonbed.cpp: .text start:0x00000078 end:0x000004D8 .rodata start:0x00000000 end:0x00000024 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_gaship/splits.txt b/config/GZLP01/rels/d_a_obj_gaship/splits.txt index 4c382a4..04ad4a9 100644 --- a/config/GZLP01/rels/d_a_obj_gaship/splits.txt +++ b/config/GZLP01/rels/d_a_obj_gaship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_gaship.cpp: +d/actor/d_a_obj_gaship.cpp: .text start:0x000000EC end:0x00000700 .text start:0x00000700 end:0x00000760 .rodata start:0x00000000 end:0x00000046 diff --git a/config/GZLP01/rels/d_a_obj_gaship2/splits.txt b/config/GZLP01/rels/d_a_obj_gaship2/splits.txt index c68c789..d1fa201 100644 --- a/config/GZLP01/rels/d_a_obj_gaship2/splits.txt +++ b/config/GZLP01/rels/d_a_obj_gaship2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gaship2.cpp: +d/actor/d_a_obj_gaship2.cpp: .text start:0x00000078 end:0x0000059C .text start:0x0000059C end:0x000005FC .rodata start:0x00000000 end:0x0000003D diff --git a/config/GZLP01/rels/d_a_obj_gnnbtltaki/splits.txt b/config/GZLP01/rels/d_a_obj_gnnbtltaki/splits.txt index 7b821c4..464a975 100644 --- a/config/GZLP01/rels/d_a_obj_gnnbtltaki/splits.txt +++ b/config/GZLP01/rels/d_a_obj_gnnbtltaki/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gnnbtltaki.cpp: +d/actor/d_a_obj_gnnbtltaki.cpp: .text start:0x00000078 end:0x00000660 .rodata start:0x00000000 end:0x00000068 .data start:0x00000000 end:0x00000068 diff --git a/config/GZLP01/rels/d_a_obj_gnndemotakie/splits.txt b/config/GZLP01/rels/d_a_obj_gnndemotakie/splits.txt index 820f1a6..4f06466 100644 --- a/config/GZLP01/rels/d_a_obj_gnndemotakie/splits.txt +++ b/config/GZLP01/rels/d_a_obj_gnndemotakie/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gnndemotakie.cpp: +d/actor/d_a_obj_gnndemotakie.cpp: .text start:0x00000078 end:0x00000528 .rodata start:0x00000000 end:0x0000005A .data start:0x00000000 end:0x00000068 diff --git a/config/GZLP01/rels/d_a_obj_gnndemotakis/splits.txt b/config/GZLP01/rels/d_a_obj_gnndemotakis/splits.txt index dd10c35..ee01fde 100644 --- a/config/GZLP01/rels/d_a_obj_gnndemotakis/splits.txt +++ b/config/GZLP01/rels/d_a_obj_gnndemotakis/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gnndemotakis.cpp: +d/actor/d_a_obj_gnndemotakis.cpp: .text start:0x00000078 end:0x00000620 .rodata start:0x00000000 end:0x0000006A .data start:0x00000000 end:0x00000068 diff --git a/config/GZLP01/rels/d_a_obj_gong/splits.txt b/config/GZLP01/rels/d_a_obj_gong/splits.txt index 94350c4..b5ba6b9 100644 --- a/config/GZLP01/rels/d_a_obj_gong/splits.txt +++ b/config/GZLP01/rels/d_a_obj_gong/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gong.cpp: +d/actor/d_a_obj_gong.cpp: .text start:0x00000078 end:0x00000614 .rodata start:0x00000000 end:0x000000A6 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_gryw00/splits.txt b/config/GZLP01/rels/d_a_obj_gryw00/splits.txt index 7f42da2..f59bcb3 100644 --- a/config/GZLP01/rels/d_a_obj_gryw00/splits.txt +++ b/config/GZLP01/rels/d_a_obj_gryw00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gryw00.cpp: +d/actor/d_a_obj_gryw00.cpp: .text start:0x00000078 end:0x00000F84 .text start:0x00000F84 end:0x00000F9C .text start:0x00000F9C end:0x00000FB8 diff --git a/config/GZLP01/rels/d_a_obj_gtaki/splits.txt b/config/GZLP01/rels/d_a_obj_gtaki/splits.txt index fe2e271..e4728eb 100644 --- a/config/GZLP01/rels/d_a_obj_gtaki/splits.txt +++ b/config/GZLP01/rels/d_a_obj_gtaki/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_gtaki.cpp: +d/actor/d_a_obj_gtaki.cpp: .text start:0x00000078 end:0x00000D68 .rodata start:0x00000000 end:0x00000073 .data start:0x00000000 end:0x000001A0 diff --git a/config/GZLP01/rels/d_a_obj_hami2/splits.txt b/config/GZLP01/rels/d_a_obj_hami2/splits.txt index e7b9d4c..524dbf3 100644 --- a/config/GZLP01/rels/d_a_obj_hami2/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hami2/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hami2.cpp: +d/actor/d_a_obj_hami2.cpp: .text start:0x00000078 end:0x00000C10 .text start:0x00000C10 end:0x00000C28 .text start:0x00000C28 end:0x00000C44 diff --git a/config/GZLP01/rels/d_a_obj_hami3/splits.txt b/config/GZLP01/rels/d_a_obj_hami3/splits.txt index ad44b11..b5ecf6e 100644 --- a/config/GZLP01/rels/d_a_obj_hami3/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hami3/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hami3.cpp: +d/actor/d_a_obj_hami3.cpp: .text start:0x00000078 end:0x00000B4C .text start:0x00000B4C end:0x00000B64 .text start:0x00000B64 end:0x00000B80 diff --git a/config/GZLP01/rels/d_a_obj_hami4/splits.txt b/config/GZLP01/rels/d_a_obj_hami4/splits.txt index 83bc34d..15de4e3 100644 --- a/config/GZLP01/rels/d_a_obj_hami4/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hami4/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hami4.cpp: +d/actor/d_a_obj_hami4.cpp: .text start:0x00000078 end:0x00000A60 .text start:0x00000A60 end:0x00000A7C .rodata start:0x00000000 end:0x00000062 diff --git a/config/GZLP01/rels/d_a_obj_hat/splits.txt b/config/GZLP01/rels/d_a_obj_hat/splits.txt index d5a6203..f2ed35a 100644 --- a/config/GZLP01/rels/d_a_obj_hat/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hat/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hat.cpp: +d/actor/d_a_obj_hat.cpp: .text start:0x00000078 end:0x00000B94 .text start:0x00000B94 end:0x00000BB0 .text start:0x00000BB0 end:0x00000C18 diff --git a/config/GZLP01/rels/d_a_obj_hbrf1/splits.txt b/config/GZLP01/rels/d_a_obj_hbrf1/splits.txt index fe74f8d..c7ca024 100644 --- a/config/GZLP01/rels/d_a_obj_hbrf1/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hbrf1/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hbrf1.cpp: +d/actor/d_a_obj_hbrf1.cpp: .text start:0x00000078 end:0x00000D74 .text start:0x00000D74 end:0x00000D8C .text start:0x00000D8C end:0x00000DA8 diff --git a/config/GZLP01/rels/d_a_obj_hcbh/splits.txt b/config/GZLP01/rels/d_a_obj_hcbh/splits.txt index 4232f51..bd481d4 100644 --- a/config/GZLP01/rels/d_a_obj_hcbh/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hcbh/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hcbh.cpp: +d/actor/d_a_obj_hcbh.cpp: .text start:0x00000078 end:0x00001BB4 .text start:0x00001BB4 end:0x00001C00 .rodata start:0x00000000 end:0x00000130 diff --git a/config/GZLP01/rels/d_a_obj_hfuck1/splits.txt b/config/GZLP01/rels/d_a_obj_hfuck1/splits.txt index 2463231..3bc28d8 100644 --- a/config/GZLP01/rels/d_a_obj_hfuck1/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hfuck1/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hfuck1.cpp: +d/actor/d_a_obj_hfuck1.cpp: .text start:0x00000078 end:0x000009BC .text start:0x000009BC end:0x000009BC .rodata start:0x00000000 end:0x0000007A diff --git a/config/GZLP01/rels/d_a_obj_hha/splits.txt b/config/GZLP01/rels/d_a_obj_hha/splits.txt index 9b9f3d1..82e54a9 100644 --- a/config/GZLP01/rels/d_a_obj_hha/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hha/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hha.cpp: +d/actor/d_a_obj_hha.cpp: .text start:0x00000078 end:0x00003064 .text start:0x00003064 end:0x000030D4 .rodata start:0x00000000 end:0x000001B0 diff --git a/config/GZLP01/rels/d_a_obj_hlift/splits.txt b/config/GZLP01/rels/d_a_obj_hlift/splits.txt index 5856514..160f2e3 100644 --- a/config/GZLP01/rels/d_a_obj_hlift/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hlift/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_hlift.cpp: +d/actor/d_a_obj_hlift.cpp: .text start:0x00000078 end:0x00001148 .text start:0x00001148 end:0x00001188 .text start:0x00001188 end:0x000011A4 diff --git a/config/GZLP01/rels/d_a_obj_hole/splits.txt b/config/GZLP01/rels/d_a_obj_hole/splits.txt index f38d632..33422d5 100644 --- a/config/GZLP01/rels/d_a_obj_hole/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hole/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_hole.cpp: +d/actor/d_a_obj_hole.cpp: .text start:0x000000EC end:0x00001468 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000077 diff --git a/config/GZLP01/rels/d_a_obj_homen/splits.txt b/config/GZLP01/rels/d_a_obj_homen/splits.txt index 2a25dc6..6832414 100644 --- a/config/GZLP01/rels/d_a_obj_homen/splits.txt +++ b/config/GZLP01/rels/d_a_obj_homen/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_homen.cpp: +d/actor/d_a_obj_homen.cpp: .text start:0x000000EC end:0x00002C0C .text start:0x00002C0C end:0x00002C0C .text start:0x00002C0C end:0x00002E88 diff --git a/config/GZLP01/rels/d_a_obj_homensmoke/splits.txt b/config/GZLP01/rels/d_a_obj_homensmoke/splits.txt index 2ecc2b5..faaff2e 100644 --- a/config/GZLP01/rels/d_a_obj_homensmoke/splits.txt +++ b/config/GZLP01/rels/d_a_obj_homensmoke/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_homensmoke.cpp: +d/actor/d_a_obj_homensmoke.cpp: .text start:0x000000EC end:0x00000888 .text start:0x00000888 end:0x0000093C .text start:0x0000093C end:0x00000958 diff --git a/config/GZLP01/rels/d_a_obj_hsehi1/splits.txt b/config/GZLP01/rels/d_a_obj_hsehi1/splits.txt index 7998a20..5277bfc 100644 --- a/config/GZLP01/rels/d_a_obj_hsehi1/splits.txt +++ b/config/GZLP01/rels/d_a_obj_hsehi1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_hsehi1.cpp: +d/actor/d_a_obj_hsehi1.cpp: .text start:0x000000EC end:0x000024D4 .text start:0x000024D4 end:0x000024D4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_htetu1/splits.txt b/config/GZLP01/rels/d_a_obj_htetu1/splits.txt index 7819263..ea4efbd 100644 --- a/config/GZLP01/rels/d_a_obj_htetu1/splits.txt +++ b/config/GZLP01/rels/d_a_obj_htetu1/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_htetu1.cpp: +d/actor/d_a_obj_htetu1.cpp: .text start:0x00000078 end:0x00001528 .rodata start:0x00000000 end:0x00000082 .data start:0x00000000 end:0x00000140 diff --git a/config/GZLP01/rels/d_a_obj_ice/splits.txt b/config/GZLP01/rels/d_a_obj_ice/splits.txt index 537db80..bd981eb 100644 --- a/config/GZLP01/rels/d_a_obj_ice/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ice/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ice.cpp: +d/actor/d_a_obj_ice.cpp: .text start:0x00000078 end:0x00001520 .text start:0x00001520 end:0x0000154C .rodata start:0x00000000 end:0x000000C3 diff --git a/config/GZLP01/rels/d_a_obj_iceisland/splits.txt b/config/GZLP01/rels/d_a_obj_iceisland/splits.txt index d1f7adc..7f3c0b1 100644 --- a/config/GZLP01/rels/d_a_obj_iceisland/splits.txt +++ b/config/GZLP01/rels/d_a_obj_iceisland/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_iceisland.cpp: +d/actor/d_a_obj_iceisland.cpp: .text start:0x00000078 end:0x00000EC8 .rodata start:0x00000000 end:0x00000076 .data start:0x00000000 end:0x00000094 diff --git a/config/GZLP01/rels/d_a_obj_ikada/splits.txt b/config/GZLP01/rels/d_a_obj_ikada/splits.txt index 9cec548..581fe3e 100644 --- a/config/GZLP01/rels/d_a_obj_ikada/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ikada/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ikada.cpp: +d/actor/d_a_obj_ikada.cpp: .text start:0x000000EC end:0x00005840 .text start:0x00005840 end:0x0000585C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_jump/splits.txt b/config/GZLP01/rels/d_a_obj_jump/splits.txt index 1288aaf..9bebb88 100644 --- a/config/GZLP01/rels/d_a_obj_jump/splits.txt +++ b/config/GZLP01/rels/d_a_obj_jump/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_jump.cpp: +d/actor/d_a_obj_jump.cpp: .text start:0x00000078 end:0x0000164C .text start:0x0000164C end:0x000016D4 .text start:0x000016D4 end:0x00001730 diff --git a/config/GZLP01/rels/d_a_obj_kanat/splits.txt b/config/GZLP01/rels/d_a_obj_kanat/splits.txt index 2a2eff9..87d03f6 100644 --- a/config/GZLP01/rels/d_a_obj_kanat/splits.txt +++ b/config/GZLP01/rels/d_a_obj_kanat/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_kanat.cpp: +d/actor/d_a_obj_kanat.cpp: .text start:0x00000078 end:0x000006FC .text start:0x000006FC end:0x00000714 .text start:0x00000714 end:0x00000730 diff --git a/config/GZLP01/rels/d_a_obj_kanoke/splits.txt b/config/GZLP01/rels/d_a_obj_kanoke/splits.txt index aed47de..689bce2 100644 --- a/config/GZLP01/rels/d_a_obj_kanoke/splits.txt +++ b/config/GZLP01/rels/d_a_obj_kanoke/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_kanoke.cpp: +d/actor/d_a_obj_kanoke.cpp: .text start:0x000000EC end:0x000020AC .text start:0x000020AC end:0x00002370 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_ladder/splits.txt b/config/GZLP01/rels/d_a_obj_ladder/splits.txt index 141baf6..0011b34 100644 --- a/config/GZLP01/rels/d_a_obj_ladder/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ladder/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ladder.cpp: +d/actor/d_a_obj_ladder.cpp: .text start:0x00000078 end:0x000011F8 .text start:0x000011F8 end:0x00001280 .text start:0x00001280 end:0x000012DC diff --git a/config/GZLP01/rels/d_a_obj_leaves/splits.txt b/config/GZLP01/rels/d_a_obj_leaves/splits.txt index 8298793..f62ed07 100644 --- a/config/GZLP01/rels/d_a_obj_leaves/splits.txt +++ b/config/GZLP01/rels/d_a_obj_leaves/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_leaves.cpp: +d/actor/d_a_obj_leaves.cpp: .text start:0x00000078 end:0x00001410 .text start:0x00001410 end:0x0000143C .rodata start:0x00000000 end:0x0000009A diff --git a/config/GZLP01/rels/d_a_obj_light/splits.txt b/config/GZLP01/rels/d_a_obj_light/splits.txt index 7716580..5583555 100644 --- a/config/GZLP01/rels/d_a_obj_light/splits.txt +++ b/config/GZLP01/rels/d_a_obj_light/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_light.cpp: +d/actor/d_a_obj_light.cpp: .text start:0x000000EC end:0x000016B8 .rodata start:0x00000000 end:0x000000F2 .data start:0x00000000 end:0x00000144 diff --git a/config/GZLP01/rels/d_a_obj_lpalm/splits.txt b/config/GZLP01/rels/d_a_obj_lpalm/splits.txt index 5e55d4a..966a63a 100644 --- a/config/GZLP01/rels/d_a_obj_lpalm/splits.txt +++ b/config/GZLP01/rels/d_a_obj_lpalm/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_lpalm.cpp: +d/actor/d_a_obj_lpalm.cpp: .text start:0x00000078 end:0x00000958 .rodata start:0x00000000 end:0x00000068 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_magmarock/splits.txt b/config/GZLP01/rels/d_a_obj_magmarock/splits.txt index 634b416..21fa452 100644 --- a/config/GZLP01/rels/d_a_obj_magmarock/splits.txt +++ b/config/GZLP01/rels/d_a_obj_magmarock/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_magmarock.cpp: +d/actor/d_a_obj_magmarock.cpp: .text start:0x00000078 end:0x00002130 .rodata start:0x00000000 end:0x00000106 .data start:0x00000000 end:0x0000013C diff --git a/config/GZLP01/rels/d_a_obj_majyuu_door/splits.txt b/config/GZLP01/rels/d_a_obj_majyuu_door/splits.txt index b2e940f..24910c6 100644 --- a/config/GZLP01/rels/d_a_obj_majyuu_door/splits.txt +++ b/config/GZLP01/rels/d_a_obj_majyuu_door/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_majyuu_door.cpp: +d/actor/d_a_obj_majyuu_door.cpp: .text start:0x000000EC end:0x0000116C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000078 diff --git a/config/GZLP01/rels/d_a_obj_mkie/splits.txt b/config/GZLP01/rels/d_a_obj_mkie/splits.txt index 5e245e2..51a7236 100644 --- a/config/GZLP01/rels/d_a_obj_mkie/splits.txt +++ b/config/GZLP01/rels/d_a_obj_mkie/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mkie.cpp: +d/actor/d_a_obj_mkie.cpp: .text start:0x00000078 end:0x00001670 .text start:0x00001670 end:0x000017EC .text start:0x000017EC end:0x00001818 diff --git a/config/GZLP01/rels/d_a_obj_mkiek/splits.txt b/config/GZLP01/rels/d_a_obj_mkiek/splits.txt index 1987bd6..dbe72f6 100644 --- a/config/GZLP01/rels/d_a_obj_mkiek/splits.txt +++ b/config/GZLP01/rels/d_a_obj_mkiek/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mkiek.cpp: +d/actor/d_a_obj_mkiek.cpp: .text start:0x00000078 end:0x00000ED4 .text start:0x00000ED4 end:0x00000FD8 .text start:0x00000FD8 end:0x00001004 diff --git a/config/GZLP01/rels/d_a_obj_mknjd/splits.txt b/config/GZLP01/rels/d_a_obj_mknjd/splits.txt index ee0ea6f..18ad603 100644 --- a/config/GZLP01/rels/d_a_obj_mknjd/splits.txt +++ b/config/GZLP01/rels/d_a_obj_mknjd/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mknjd.cpp: +d/actor/d_a_obj_mknjd.cpp: .text start:0x00000078 end:0x000024E8 .text start:0x000024E8 end:0x000024E8 .text start:0x000024E8 end:0x000025B4 diff --git a/config/GZLP01/rels/d_a_obj_mmrr/splits.txt b/config/GZLP01/rels/d_a_obj_mmrr/splits.txt index 499b660..2307520 100644 --- a/config/GZLP01/rels/d_a_obj_mmrr/splits.txt +++ b/config/GZLP01/rels/d_a_obj_mmrr/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mmrr.cpp: +d/actor/d_a_obj_mmrr.cpp: .text start:0x00000078 end:0x00001B74 .text start:0x00001B74 end:0x000021C8 .rodata start:0x00000000 end:0x00000208 diff --git a/config/GZLP01/rels/d_a_obj_monument/splits.txt b/config/GZLP01/rels/d_a_obj_monument/splits.txt index 3da8c5f..a0e1ebc 100644 --- a/config/GZLP01/rels/d_a_obj_monument/splits.txt +++ b/config/GZLP01/rels/d_a_obj_monument/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_monument.cpp: +d/actor/d_a_obj_monument.cpp: .text start:0x00000078 end:0x000005CC .text start:0x000005CC end:0x000005E8 .rodata start:0x00000000 end:0x00000031 diff --git a/config/GZLP01/rels/d_a_obj_movebox/splits.txt b/config/GZLP01/rels/d_a_obj_movebox/splits.txt index 97313d9..d152ce8 100644 --- a/config/GZLP01/rels/d_a_obj_movebox/splits.txt +++ b/config/GZLP01/rels/d_a_obj_movebox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_movebox.cpp: +d/actor/d_a_obj_movebox.cpp: .text start:0x000000EC end:0x000045BC .text start:0x000045BC end:0x0000489C .text start:0x0000489C end:0x00004AC4 diff --git a/config/GZLP01/rels/d_a_obj_msdan/splits.txt b/config/GZLP01/rels/d_a_obj_msdan/splits.txt index 05d6368..0a61df0 100644 --- a/config/GZLP01/rels/d_a_obj_msdan/splits.txt +++ b/config/GZLP01/rels/d_a_obj_msdan/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan.cpp: +d/actor/d_a_obj_msdan.cpp: .text start:0x00000078 end:0x00000660 .text start:0x00000660 end:0x0000067C .rodata start:0x00000000 end:0x0000002A diff --git a/config/GZLP01/rels/d_a_obj_msdan2/splits.txt b/config/GZLP01/rels/d_a_obj_msdan2/splits.txt index 6a09ad9..97dd469 100644 --- a/config/GZLP01/rels/d_a_obj_msdan2/splits.txt +++ b/config/GZLP01/rels/d_a_obj_msdan2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan2.cpp: +d/actor/d_a_obj_msdan2.cpp: .text start:0x00000078 end:0x000003BC .text start:0x000003BC end:0x000003D8 .rodata start:0x00000000 end:0x0000000F diff --git a/config/GZLP01/rels/d_a_obj_msdan_sub/splits.txt b/config/GZLP01/rels/d_a_obj_msdan_sub/splits.txt index 2dd7fb2..6aa5372 100644 --- a/config/GZLP01/rels/d_a_obj_msdan_sub/splits.txt +++ b/config/GZLP01/rels/d_a_obj_msdan_sub/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan_sub.cpp: +d/actor/d_a_obj_msdan_sub.cpp: .text start:0x00000078 end:0x00000D0C .text start:0x00000D0C end:0x00000D24 .text start:0x00000D24 end:0x00000D40 diff --git a/config/GZLP01/rels/d_a_obj_msdan_sub2/splits.txt b/config/GZLP01/rels/d_a_obj_msdan_sub2/splits.txt index 9e137cf..0bc5fc0 100644 --- a/config/GZLP01/rels/d_a_obj_msdan_sub2/splits.txt +++ b/config/GZLP01/rels/d_a_obj_msdan_sub2/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_msdan_sub2.cpp: +d/actor/d_a_obj_msdan_sub2.cpp: .text start:0x00000078 end:0x00000A64 .text start:0x00000A64 end:0x00000A7C .text start:0x00000A7C end:0x00000A98 diff --git a/config/GZLP01/rels/d_a_obj_mshokki/splits.txt b/config/GZLP01/rels/d_a_obj_mshokki/splits.txt index 88d4711..a991d21 100644 --- a/config/GZLP01/rels/d_a_obj_mshokki/splits.txt +++ b/config/GZLP01/rels/d_a_obj_mshokki/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_mshokki.cpp: +d/actor/d_a_obj_mshokki.cpp: .text start:0x00000078 end:0x00001004 .text start:0x00001004 end:0x00001040 .rodata start:0x00000000 end:0x000000F3 diff --git a/config/GZLP01/rels/d_a_obj_mtest/splits.txt b/config/GZLP01/rels/d_a_obj_mtest/splits.txt index a2a97cb..04353f3 100644 --- a/config/GZLP01/rels/d_a_obj_mtest/splits.txt +++ b/config/GZLP01/rels/d_a_obj_mtest/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_mtest.cpp: +d/actor/d_a_obj_mtest.cpp: .text start:0x000000EC end:0x00000D1C .text start:0x00000D1C end:0x00000E90 .text start:0x00000E90 end:0x000010A0 diff --git a/config/GZLP01/rels/d_a_obj_nest/splits.txt b/config/GZLP01/rels/d_a_obj_nest/splits.txt index e3a39e0..672b0e0 100644 --- a/config/GZLP01/rels/d_a_obj_nest/splits.txt +++ b/config/GZLP01/rels/d_a_obj_nest/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_nest.cpp: +d/actor/d_a_obj_nest.cpp: .text start:0x00000078 end:0x000008B4 .text start:0x000008B4 end:0x000008CC .rodata start:0x00000000 end:0x000000C1 diff --git a/config/GZLP01/rels/d_a_obj_ohatch/splits.txt b/config/GZLP01/rels/d_a_obj_ohatch/splits.txt index 68c294b..a58b1f4 100644 --- a/config/GZLP01/rels/d_a_obj_ohatch/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ohatch/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ohatch.cpp: +d/actor/d_a_obj_ohatch.cpp: .text start:0x00000078 end:0x00000BF8 .text start:0x00000BF8 end:0x00000C14 .rodata start:0x00000000 end:0x0000007C diff --git a/config/GZLP01/rels/d_a_obj_ojtree/splits.txt b/config/GZLP01/rels/d_a_obj_ojtree/splits.txt index 73d845b..f70c506 100644 --- a/config/GZLP01/rels/d_a_obj_ojtree/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ojtree/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_ojtree.cpp: +d/actor/d_a_obj_ojtree.cpp: .text start:0x00000078 end:0x000005B4 .text start:0x000005B4 end:0x000005CC .rodata start:0x00000000 end:0x0000008B diff --git a/config/GZLP01/rels/d_a_obj_ospbox/splits.txt b/config/GZLP01/rels/d_a_obj_ospbox/splits.txt index 38e5f41..0302943 100644 --- a/config/GZLP01/rels/d_a_obj_ospbox/splits.txt +++ b/config/GZLP01/rels/d_a_obj_ospbox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_ospbox.cpp: +d/actor/d_a_obj_ospbox.cpp: .text start:0x000000EC end:0x0000125C .text start:0x0000125C end:0x000013A8 .text start:0x000013A8 end:0x00001414 diff --git a/config/GZLP01/rels/d_a_obj_otble/splits.txt b/config/GZLP01/rels/d_a_obj_otble/splits.txt index 9d2e2e4..dd70aeb 100644 --- a/config/GZLP01/rels/d_a_obj_otble/splits.txt +++ b/config/GZLP01/rels/d_a_obj_otble/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_otble.cpp: +d/actor/d_a_obj_otble.cpp: .text start:0x00000078 end:0x000007F4 .rodata start:0x00000000 end:0x00000079 .data start:0x00000000 end:0x00000074 diff --git a/config/GZLP01/rels/d_a_obj_paper/splits.txt b/config/GZLP01/rels/d_a_obj_paper/splits.txt index 2897021..d7dab83 100644 --- a/config/GZLP01/rels/d_a_obj_paper/splits.txt +++ b/config/GZLP01/rels/d_a_obj_paper/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_paper.cpp: +d/actor/d_a_obj_paper.cpp: .text start:0x00000078 end:0x00000D9C .text start:0x00000D9C end:0x00000DC8 .rodata start:0x00000000 end:0x000000DE diff --git a/config/GZLP01/rels/d_a_obj_pbco/splits.txt b/config/GZLP01/rels/d_a_obj_pbco/splits.txt index bdda05e..c872668 100644 --- a/config/GZLP01/rels/d_a_obj_pbco/splits.txt +++ b/config/GZLP01/rels/d_a_obj_pbco/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_pbco.cpp: +d/actor/d_a_obj_pbco.cpp: .text start:0x000000EC end:0x000005C8 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000002D diff --git a/config/GZLP01/rels/d_a_obj_pbka/splits.txt b/config/GZLP01/rels/d_a_obj_pbka/splits.txt index 4fd8aca..8d46771 100644 --- a/config/GZLP01/rels/d_a_obj_pbka/splits.txt +++ b/config/GZLP01/rels/d_a_obj_pbka/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_pbka.cpp: +d/actor/d_a_obj_pbka.cpp: .text start:0x00000078 end:0x00000458 .rodata start:0x00000000 end:0x0000003A .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_pfall/splits.txt b/config/GZLP01/rels/d_a_obj_pfall/splits.txt index 7a099d6..8ae4237 100644 --- a/config/GZLP01/rels/d_a_obj_pfall/splits.txt +++ b/config/GZLP01/rels/d_a_obj_pfall/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_pfall.cpp: +d/actor/d_a_obj_pfall.cpp: .text start:0x000000EC end:0x00001620 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000113 diff --git a/config/GZLP01/rels/d_a_obj_pirateship/splits.txt b/config/GZLP01/rels/d_a_obj_pirateship/splits.txt index a76b788..ff6240a 100644 --- a/config/GZLP01/rels/d_a_obj_pirateship/splits.txt +++ b/config/GZLP01/rels/d_a_obj_pirateship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_pirateship.cpp: +d/actor/d_a_obj_pirateship.cpp: .text start:0x000000EC end:0x00002044 .text start:0x00002044 end:0x000022DC .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_plant/splits.txt b/config/GZLP01/rels/d_a_obj_plant/splits.txt index 44b0536..c9dcd48 100644 --- a/config/GZLP01/rels/d_a_obj_plant/splits.txt +++ b/config/GZLP01/rels/d_a_obj_plant/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_plant.cpp: +d/actor/d_a_obj_plant.cpp: .text start:0x00000078 end:0x00000B5C .rodata start:0x00000000 end:0x0000006B .data start:0x00000000 end:0x00000188 diff --git a/config/GZLP01/rels/d_a_obj_quake/splits.txt b/config/GZLP01/rels/d_a_obj_quake/splits.txt index fdf3459..ed372f9 100644 --- a/config/GZLP01/rels/d_a_obj_quake/splits.txt +++ b/config/GZLP01/rels/d_a_obj_quake/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_quake.cpp: +d/actor/d_a_obj_quake.cpp: .text start:0x000000EC end:0x000007C8 .text start:0x000007C8 end:0x00000820 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_rcloud/splits.txt b/config/GZLP01/rels/d_a_obj_rcloud/splits.txt index 65cf715..d7f435c 100644 --- a/config/GZLP01/rels/d_a_obj_rcloud/splits.txt +++ b/config/GZLP01/rels/d_a_obj_rcloud/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_rcloud.cpp: +d/actor/d_a_obj_rcloud.cpp: .text start:0x00000078 end:0x000008DC .text start:0x000008DC end:0x000008F8 .rodata start:0x00000000 end:0x0000004A diff --git a/config/GZLP01/rels/d_a_obj_rflw/splits.txt b/config/GZLP01/rels/d_a_obj_rflw/splits.txt index adab6bc..eb10fa5 100644 --- a/config/GZLP01/rels/d_a_obj_rflw/splits.txt +++ b/config/GZLP01/rels/d_a_obj_rflw/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_rflw.cpp: +d/actor/d_a_obj_rflw.cpp: .text start:0x00000078 end:0x00000AF0 .rodata start:0x00000000 end:0x00000059 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLP01/rels/d_a_obj_rforce/splits.txt b/config/GZLP01/rels/d_a_obj_rforce/splits.txt index ecb6854..125a2af 100644 --- a/config/GZLP01/rels/d_a_obj_rforce/splits.txt +++ b/config/GZLP01/rels/d_a_obj_rforce/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_rforce.cpp: +d/actor/d_a_obj_rforce.cpp: .text start:0x00000078 end:0x0000059C .text start:0x0000059C end:0x000005FC .rodata start:0x00000000 end:0x0000003C diff --git a/config/GZLP01/rels/d_a_obj_roten/splits.txt b/config/GZLP01/rels/d_a_obj_roten/splits.txt index a6b2d01..d3ee9d2 100644 --- a/config/GZLP01/rels/d_a_obj_roten/splits.txt +++ b/config/GZLP01/rels/d_a_obj_roten/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_roten.cpp: +d/actor/d_a_obj_roten.cpp: .text start:0x000000EC end:0x000006BC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000003E diff --git a/config/GZLP01/rels/d_a_obj_shelf/splits.txt b/config/GZLP01/rels/d_a_obj_shelf/splits.txt index e05e801..b419a06 100644 --- a/config/GZLP01/rels/d_a_obj_shelf/splits.txt +++ b/config/GZLP01/rels/d_a_obj_shelf/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_shelf.cpp: +d/actor/d_a_obj_shelf.cpp: .text start:0x00000078 end:0x00000B08 .text start:0x00000B08 end:0x00000B48 .text start:0x00000B48 end:0x00000B64 diff --git a/config/GZLP01/rels/d_a_obj_shmrgrd/splits.txt b/config/GZLP01/rels/d_a_obj_shmrgrd/splits.txt index ab2c8b1..523a1d6 100644 --- a/config/GZLP01/rels/d_a_obj_shmrgrd/splits.txt +++ b/config/GZLP01/rels/d_a_obj_shmrgrd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_shmrgrd.cpp: +d/actor/d_a_obj_shmrgrd.cpp: .text start:0x000000EC end:0x00001CF0 .text start:0x00001CF0 end:0x00002124 .text start:0x00002124 end:0x00002150 diff --git a/config/GZLP01/rels/d_a_obj_smplbg/splits.txt b/config/GZLP01/rels/d_a_obj_smplbg/splits.txt index 9c50490..3734e8e 100644 --- a/config/GZLP01/rels/d_a_obj_smplbg/splits.txt +++ b/config/GZLP01/rels/d_a_obj_smplbg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_smplbg.cpp: +d/actor/d_a_obj_smplbg.cpp: .text start:0x00000078 end:0x0000081C .text start:0x0000081C end:0x00000834 .text start:0x00000834 end:0x00000850 diff --git a/config/GZLP01/rels/d_a_obj_stair/splits.txt b/config/GZLP01/rels/d_a_obj_stair/splits.txt index 9ee5970..320eeed 100644 --- a/config/GZLP01/rels/d_a_obj_stair/splits.txt +++ b/config/GZLP01/rels/d_a_obj_stair/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_stair.cpp: +d/actor/d_a_obj_stair.cpp: .text start:0x000000EC end:0x00001438 .text start:0x00001438 end:0x0000152C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_swflat/splits.txt b/config/GZLP01/rels/d_a_obj_swflat/splits.txt index 3c872fe..183d8f5 100644 --- a/config/GZLP01/rels/d_a_obj_swflat/splits.txt +++ b/config/GZLP01/rels/d_a_obj_swflat/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swflat.cpp: +d/actor/d_a_obj_swflat.cpp: .text start:0x000000EC end:0x000013DC .text start:0x000013DC end:0x00001534 .text start:0x00001534 end:0x0000159C diff --git a/config/GZLP01/rels/d_a_obj_swhammer/splits.txt b/config/GZLP01/rels/d_a_obj_swhammer/splits.txt index a4b28a9..c92c93d 100644 --- a/config/GZLP01/rels/d_a_obj_swhammer/splits.txt +++ b/config/GZLP01/rels/d_a_obj_swhammer/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swhammer.cpp: +d/actor/d_a_obj_swhammer.cpp: .text start:0x000000EC end:0x00001620 .text start:0x00001620 end:0x00001848 .text start:0x00001848 end:0x00001AD0 diff --git a/config/GZLP01/rels/d_a_obj_swheavy/splits.txt b/config/GZLP01/rels/d_a_obj_swheavy/splits.txt index 99a5cd5..5c24f13 100644 --- a/config/GZLP01/rels/d_a_obj_swheavy/splits.txt +++ b/config/GZLP01/rels/d_a_obj_swheavy/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_swheavy.cpp: +d/actor/d_a_obj_swheavy.cpp: .text start:0x00000078 end:0x00001254 .text start:0x00001254 end:0x00001270 .rodata start:0x00000000 end:0x000000FD diff --git a/config/GZLP01/rels/d_a_obj_swlight/splits.txt b/config/GZLP01/rels/d_a_obj_swlight/splits.txt index d763e1f..73c1858 100644 --- a/config/GZLP01/rels/d_a_obj_swlight/splits.txt +++ b/config/GZLP01/rels/d_a_obj_swlight/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swlight.cpp: +d/actor/d_a_obj_swlight.cpp: .text start:0x000000EC end:0x00001C94 .text start:0x00001C94 end:0x00001CC0 .rodata start:0x00000000 end:0x000000F8 diff --git a/config/GZLP01/rels/d_a_obj_swpush/splits.txt b/config/GZLP01/rels/d_a_obj_swpush/splits.txt index e590f0e..473d27e 100644 --- a/config/GZLP01/rels/d_a_obj_swpush/splits.txt +++ b/config/GZLP01/rels/d_a_obj_swpush/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_swpush.cpp: +d/actor/d_a_obj_swpush.cpp: .text start:0x000000EC end:0x00002080 .text start:0x00002080 end:0x0000209C .rodata start:0x00000000 end:0x000001CF diff --git a/config/GZLP01/rels/d_a_obj_table/splits.txt b/config/GZLP01/rels/d_a_obj_table/splits.txt index 40c4ef3..6c05082 100644 --- a/config/GZLP01/rels/d_a_obj_table/splits.txt +++ b/config/GZLP01/rels/d_a_obj_table/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_table.cpp: +d/actor/d_a_obj_table.cpp: .text start:0x00000078 end:0x000006C0 .text start:0x000006C0 end:0x000006D8 .text start:0x000006D8 end:0x000006F4 diff --git a/config/GZLP01/rels/d_a_obj_tapestry/splits.txt b/config/GZLP01/rels/d_a_obj_tapestry/splits.txt index 9a86d3d..d060341 100644 --- a/config/GZLP01/rels/d_a_obj_tapestry/splits.txt +++ b/config/GZLP01/rels/d_a_obj_tapestry/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000020 -d/a/d_a_obj_tapestry.cpp: +d/actor/d_a_obj_tapestry.cpp: .text start:0x000000EC end:0x00005F58 .text start:0x00005F58 end:0x00006278 .text start:0x00006278 end:0x00006398 diff --git a/config/GZLP01/rels/d_a_obj_tenmado/splits.txt b/config/GZLP01/rels/d_a_obj_tenmado/splits.txt index fea86e9..9572958 100644 --- a/config/GZLP01/rels/d_a_obj_tenmado/splits.txt +++ b/config/GZLP01/rels/d_a_obj_tenmado/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tenmado.cpp: +d/actor/d_a_obj_tenmado.cpp: .text start:0x00000078 end:0x00000808 .text start:0x00000808 end:0x00000820 .text start:0x00000820 end:0x0000083C diff --git a/config/GZLP01/rels/d_a_obj_tide/splits.txt b/config/GZLP01/rels/d_a_obj_tide/splits.txt index 8a044a6..0248803 100644 --- a/config/GZLP01/rels/d_a_obj_tide/splits.txt +++ b/config/GZLP01/rels/d_a_obj_tide/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tide.cpp: +d/actor/d_a_obj_tide.cpp: .text start:0x00000078 end:0x00001E88 .text start:0x00001E88 end:0x00001FDC .text start:0x00001FDC end:0x00001FF8 diff --git a/config/GZLP01/rels/d_a_obj_timer/splits.txt b/config/GZLP01/rels/d_a_obj_timer/splits.txt index 956e466..162441e 100644 --- a/config/GZLP01/rels/d_a_obj_timer/splits.txt +++ b/config/GZLP01/rels/d_a_obj_timer/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_timer.cpp: +d/actor/d_a_obj_timer.cpp: .text start:0x00000078 end:0x0000040C .text start:0x0000040C end:0x00000428 .rodata start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_tntrap/splits.txt b/config/GZLP01/rels/d_a_obj_tntrap/splits.txt index 96e6362..31738ad 100644 --- a/config/GZLP01/rels/d_a_obj_tntrap/splits.txt +++ b/config/GZLP01/rels/d_a_obj_tntrap/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tntrap.cpp: +d/actor/d_a_obj_tntrap.cpp: .text start:0x00000078 end:0x00001DC0 .text start:0x00001DC0 end:0x00001DEC .rodata start:0x00000000 end:0x00000173 diff --git a/config/GZLP01/rels/d_a_obj_toripost/splits.txt b/config/GZLP01/rels/d_a_obj_toripost/splits.txt index f77f570..16007bf 100644 --- a/config/GZLP01/rels/d_a_obj_toripost/splits.txt +++ b/config/GZLP01/rels/d_a_obj_toripost/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_toripost.cpp: +d/actor/d_a_obj_toripost.cpp: .text start:0x000000EC end:0x00002438 .text start:0x00002438 end:0x0000244C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_tousekiki/splits.txt b/config/GZLP01/rels/d_a_obj_tousekiki/splits.txt index 3eedcb7..daa1763 100644 --- a/config/GZLP01/rels/d_a_obj_tousekiki/splits.txt +++ b/config/GZLP01/rels/d_a_obj_tousekiki/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_tousekiki.cpp: +d/actor/d_a_obj_tousekiki.cpp: .text start:0x000000EC end:0x00000A38 .rodata start:0x00000000 end:0x00000030 .data start:0x00000000 end:0x00000144 diff --git a/config/GZLP01/rels/d_a_obj_tower/splits.txt b/config/GZLP01/rels/d_a_obj_tower/splits.txt index c7fba0a..c181478 100644 --- a/config/GZLP01/rels/d_a_obj_tower/splits.txt +++ b/config/GZLP01/rels/d_a_obj_tower/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_tower.cpp: +d/actor/d_a_obj_tower.cpp: .text start:0x00000078 end:0x00000570 .rodata start:0x00000000 end:0x0000003E .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_trap/splits.txt b/config/GZLP01/rels/d_a_obj_trap/splits.txt index 2402a10..295a9c2 100644 --- a/config/GZLP01/rels/d_a_obj_trap/splits.txt +++ b/config/GZLP01/rels/d_a_obj_trap/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_trap.cpp: +d/actor/d_a_obj_trap.cpp: .text start:0x000000EC end:0x00002F5C .rodata start:0x00000000 end:0x000000C2 .data start:0x00000000 end:0x000002F4 diff --git a/config/GZLP01/rels/d_a_obj_tribox/splits.txt b/config/GZLP01/rels/d_a_obj_tribox/splits.txt index 6749e23..12d337a 100644 --- a/config/GZLP01/rels/d_a_obj_tribox/splits.txt +++ b/config/GZLP01/rels/d_a_obj_tribox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_tribox.cpp: +d/actor/d_a_obj_tribox.cpp: .text start:0x000000EC end:0x000036C8 .text start:0x000036C8 end:0x00003D78 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_try/splits.txt b/config/GZLP01/rels/d_a_obj_try/splits.txt index 4432218..a99398c 100644 --- a/config/GZLP01/rels/d_a_obj_try/splits.txt +++ b/config/GZLP01/rels/d_a_obj_try/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_try.cpp: +d/actor/d_a_obj_try.cpp: .text start:0x00000078 end:0x000034F0 .text start:0x000034F0 end:0x00003564 .rodata start:0x00000000 end:0x00000710 diff --git a/config/GZLP01/rels/d_a_obj_usovmc/splits.txt b/config/GZLP01/rels/d_a_obj_usovmc/splits.txt index 9060ce0..c03bd0d 100644 --- a/config/GZLP01/rels/d_a_obj_usovmc/splits.txt +++ b/config/GZLP01/rels/d_a_obj_usovmc/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_usovmc.cpp: +d/actor/d_a_obj_usovmc.cpp: .text start:0x00000078 end:0x00000534 .text start:0x00000534 end:0x0000054C .rodata start:0x00000000 end:0x00000083 diff --git a/config/GZLP01/rels/d_a_obj_vfan/splits.txt b/config/GZLP01/rels/d_a_obj_vfan/splits.txt index 149cf01..9942399 100644 --- a/config/GZLP01/rels/d_a_obj_vfan/splits.txt +++ b/config/GZLP01/rels/d_a_obj_vfan/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vfan.cpp: +d/actor/d_a_obj_vfan.cpp: .text start:0x00000078 end:0x00000DD8 .text start:0x00000DD8 end:0x00000EDC .text start:0x00000EDC end:0x00000F08 diff --git a/config/GZLP01/rels/d_a_obj_vgnfd/splits.txt b/config/GZLP01/rels/d_a_obj_vgnfd/splits.txt index 1401541..70e0bde 100644 --- a/config/GZLP01/rels/d_a_obj_vgnfd/splits.txt +++ b/config/GZLP01/rels/d_a_obj_vgnfd/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vgnfd.cpp: +d/actor/d_a_obj_vgnfd.cpp: .text start:0x00000078 end:0x00001538 .rodata start:0x00000000 end:0x00000130 .data start:0x00000000 end:0x0000011C diff --git a/config/GZLP01/rels/d_a_obj_vmc/splits.txt b/config/GZLP01/rels/d_a_obj_vmc/splits.txt index c16936e..baa6c27 100644 --- a/config/GZLP01/rels/d_a_obj_vmc/splits.txt +++ b/config/GZLP01/rels/d_a_obj_vmc/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vmc.cpp: +d/actor/d_a_obj_vmc.cpp: .text start:0x00000078 end:0x0000144C .text start:0x0000144C end:0x00001478 .rodata start:0x00000000 end:0x000000AA diff --git a/config/GZLP01/rels/d_a_obj_vmsdz/splits.txt b/config/GZLP01/rels/d_a_obj_vmsdz/splits.txt index dc59069..addf58a 100644 --- a/config/GZLP01/rels/d_a_obj_vmsdz/splits.txt +++ b/config/GZLP01/rels/d_a_obj_vmsdz/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vmsdz.cpp: +d/actor/d_a_obj_vmsdz.cpp: .text start:0x00000078 end:0x00000394 .rodata start:0x00000000 end:0x0000002D .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_vmsms/splits.txt b/config/GZLP01/rels/d_a_obj_vmsms/splits.txt index 60a3039..efd64f5 100644 --- a/config/GZLP01/rels/d_a_obj_vmsms/splits.txt +++ b/config/GZLP01/rels/d_a_obj_vmsms/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vmsms.cpp: +d/actor/d_a_obj_vmsms.cpp: .text start:0x00000078 end:0x00000400 .rodata start:0x00000000 end:0x0000003A .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_obj_volcano/splits.txt b/config/GZLP01/rels/d_a_obj_volcano/splits.txt index 9aac53a..e0701d7 100644 --- a/config/GZLP01/rels/d_a_obj_volcano/splits.txt +++ b/config/GZLP01/rels/d_a_obj_volcano/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_volcano.cpp: +d/actor/d_a_obj_volcano.cpp: .text start:0x00000078 end:0x00001C44 .text start:0x00001C44 end:0x00001D48 .text start:0x00001D48 end:0x00001D74 diff --git a/config/GZLP01/rels/d_a_obj_vtil/splits.txt b/config/GZLP01/rels/d_a_obj_vtil/splits.txt index b5a862d..22793da 100644 --- a/config/GZLP01/rels/d_a_obj_vtil/splits.txt +++ b/config/GZLP01/rels/d_a_obj_vtil/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_vtil.cpp: +d/actor/d_a_obj_vtil.cpp: .text start:0x00000078 end:0x00001B18 .text start:0x00001B18 end:0x00001B54 .rodata start:0x00000000 end:0x00000130 diff --git a/config/GZLP01/rels/d_a_obj_vyasi/splits.txt b/config/GZLP01/rels/d_a_obj_vyasi/splits.txt index 76580b3..f9c1034 100644 --- a/config/GZLP01/rels/d_a_obj_vyasi/splits.txt +++ b/config/GZLP01/rels/d_a_obj_vyasi/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_vyasi.cpp: +d/actor/d_a_obj_vyasi.cpp: .text start:0x000000EC end:0x00002D94 .text start:0x00002D94 end:0x00002F68 .text start:0x00002F68 end:0x00002FB4 diff --git a/config/GZLP01/rels/d_a_obj_warpt/splits.txt b/config/GZLP01/rels/d_a_obj_warpt/splits.txt index ab4fa8f..d32c4e5 100644 --- a/config/GZLP01/rels/d_a_obj_warpt/splits.txt +++ b/config/GZLP01/rels/d_a_obj_warpt/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_obj_warpt.cpp: +d/actor/d_a_obj_warpt.cpp: .text start:0x000000EC end:0x00002CB0 .text start:0x00002CB0 end:0x00002CB0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_obj_wood/splits.txt b/config/GZLP01/rels/d_a_obj_wood/splits.txt index e7f634c..64face4 100644 --- a/config/GZLP01/rels/d_a_obj_wood/splits.txt +++ b/config/GZLP01/rels/d_a_obj_wood/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_wood.cpp: +d/actor/d_a_obj_wood.cpp: .text start:0x00000078 end:0x0000048C .data start:0x00000000 end:0x00000144 diff --git a/config/GZLP01/rels/d_a_obj_xfuta/splits.txt b/config/GZLP01/rels/d_a_obj_xfuta/splits.txt index 6ff70af..b0404b9 100644 --- a/config/GZLP01/rels/d_a_obj_xfuta/splits.txt +++ b/config/GZLP01/rels/d_a_obj_xfuta/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_xfuta.cpp: +d/actor/d_a_obj_xfuta.cpp: .text start:0x00000078 end:0x000004A0 .text start:0x000004A0 end:0x00000500 .rodata start:0x00000000 end:0x00000031 diff --git a/config/GZLP01/rels/d_a_obj_zouK/splits.txt b/config/GZLP01/rels/d_a_obj_zouK/splits.txt index 8161d38..0934d91 100644 --- a/config/GZLP01/rels/d_a_obj_zouK/splits.txt +++ b/config/GZLP01/rels/d_a_obj_zouK/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_obj_zouK.cpp: +d/actor/d_a_obj_zouK.cpp: .text start:0x00000078 end:0x00001A14 .text start:0x00001A14 end:0x00001E18 .text start:0x00001E18 end:0x00001E84 diff --git a/config/GZLP01/rels/d_a_oq/splits.txt b/config/GZLP01/rels/d_a_oq/splits.txt index 3618cd4..96547c6 100644 --- a/config/GZLP01/rels/d_a_oq/splits.txt +++ b/config/GZLP01/rels/d_a_oq/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_oq.cpp: +d/actor/d_a_oq.cpp: .text start:0x000000EC end:0x00005A50 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000132 diff --git a/config/GZLP01/rels/d_a_oship/splits.txt b/config/GZLP01/rels/d_a_oship/splits.txt index 9eedc6b..6c0b2c8 100644 --- a/config/GZLP01/rels/d_a_oship/splits.txt +++ b/config/GZLP01/rels/d_a_oship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_oship.cpp: +d/actor/d_a_oship.cpp: .text start:0x000000EC end:0x000042B0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000001F3 diff --git a/config/GZLP01/rels/d_a_pedestal/splits.txt b/config/GZLP01/rels/d_a_pedestal/splits.txt index 895563a..60865b8 100644 --- a/config/GZLP01/rels/d_a_pedestal/splits.txt +++ b/config/GZLP01/rels/d_a_pedestal/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_pedestal.cpp: +d/actor/d_a_pedestal.cpp: .text start:0x00000078 end:0x000010D4 .text start:0x000010D4 end:0x00001374 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_ph/splits.txt b/config/GZLP01/rels/d_a_ph/splits.txt index b4c5d3f..f269945 100644 --- a/config/GZLP01/rels/d_a_ph/splits.txt +++ b/config/GZLP01/rels/d_a_ph/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ph.cpp: +d/actor/d_a_ph.cpp: .text start:0x00000078 end:0x00007874 .rodata start:0x00000000 end:0x0000014C .data start:0x00000000 end:0x000004C8 diff --git a/config/GZLP01/rels/d_a_pirate_flag/splits.txt b/config/GZLP01/rels/d_a_pirate_flag/splits.txt index 487a894..135aff7 100644 --- a/config/GZLP01/rels/d_a_pirate_flag/splits.txt +++ b/config/GZLP01/rels/d_a_pirate_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_pirate_flag.cpp: +d/actor/d_a_pirate_flag.cpp: .text start:0x000000EC end:0x00001D6C .text start:0x00001D6C end:0x00001E3C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_pt/splits.txt b/config/GZLP01/rels/d_a_pt/splits.txt index 9a7bebc..0cdc19f 100644 --- a/config/GZLP01/rels/d_a_pt/splits.txt +++ b/config/GZLP01/rels/d_a_pt/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_pt.cpp: +d/actor/d_a_pt.cpp: .text start:0x000000EC end:0x000059A0 .text start:0x000059A0 end:0x000059A0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_pw/splits.txt b/config/GZLP01/rels/d_a_pw/splits.txt index 06d9a21..a82ddbe 100644 --- a/config/GZLP01/rels/d_a_pw/splits.txt +++ b/config/GZLP01/rels/d_a_pw/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_pw.cpp: +d/actor/d_a_pw.cpp: .text start:0x00000078 end:0x00007704 .rodata start:0x00000000 end:0x00000113 .data start:0x00000000 end:0x000006AC diff --git a/config/GZLP01/rels/d_a_pz/splits.txt b/config/GZLP01/rels/d_a_pz/splits.txt index 9f719de..6f1a154 100644 --- a/config/GZLP01/rels/d_a_pz/splits.txt +++ b/config/GZLP01/rels/d_a_pz/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_pz.cpp: +d/actor/d_a_pz.cpp: .text start:0x000000EC end:0x000082AC .text start:0x000082AC end:0x00008350 .text start:0x00008350 end:0x000083AC diff --git a/config/GZLP01/rels/d_a_race_item/splits.txt b/config/GZLP01/rels/d_a_race_item/splits.txt index ba5a0c1..4636ccd 100644 --- a/config/GZLP01/rels/d_a_race_item/splits.txt +++ b/config/GZLP01/rels/d_a_race_item/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_race_item.cpp: +d/actor/d_a_race_item.cpp: .text start:0x00000078 end:0x00000C8C .text start:0x00000C8C end:0x00000CA8 .text start:0x00000CA8 end:0x00000DB8 diff --git a/config/GZLP01/rels/d_a_rd/splits.txt b/config/GZLP01/rels/d_a_rd/splits.txt index d5d9453..72c5b74 100644 --- a/config/GZLP01/rels/d_a_rd/splits.txt +++ b/config/GZLP01/rels/d_a_rd/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_rd.cpp: +d/actor/d_a_rd.cpp: .text start:0x000000EC end:0x00005450 .text start:0x00005450 end:0x00005498 .text start:0x00005498 end:0x00005528 diff --git a/config/GZLP01/rels/d_a_rectangle/splits.txt b/config/GZLP01/rels/d_a_rectangle/splits.txt index cd04c36..9861d3b 100644 --- a/config/GZLP01/rels/d_a_rectangle/splits.txt +++ b/config/GZLP01/rels/d_a_rectangle/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_rectangle.cpp: +d/actor/d_a_rectangle.cpp: .text start:0x00000078 end:0x000000A0 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_sail/splits.txt b/config/GZLP01/rels/d_a_sail/splits.txt index 81a93ae..245bcfd 100644 --- a/config/GZLP01/rels/d_a_sail/splits.txt +++ b/config/GZLP01/rels/d_a_sail/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sail.cpp: +d/actor/d_a_sail.cpp: .text start:0x000000EC end:0x0000259C .text start:0x0000259C end:0x0000266C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_saku/splits.txt b/config/GZLP01/rels/d_a_saku/splits.txt index 29400c9..8ef6f37 100644 --- a/config/GZLP01/rels/d_a_saku/splits.txt +++ b/config/GZLP01/rels/d_a_saku/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_saku.cpp: +d/actor/d_a_saku.cpp: .text start:0x000000EC end:0x00002840 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000014C diff --git a/config/GZLP01/rels/d_a_salvage/splits.txt b/config/GZLP01/rels/d_a_salvage/splits.txt index 205709d..aa69585 100644 --- a/config/GZLP01/rels/d_a_salvage/splits.txt +++ b/config/GZLP01/rels/d_a_salvage/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_salvage.cpp: +d/actor/d_a_salvage.cpp: .text start:0x00000078 end:0x000025A4 .text start:0x000025A4 end:0x000026B0 .rodata start:0x00000000 end:0x000000EB diff --git a/config/GZLP01/rels/d_a_salvage_tbox/splits.txt b/config/GZLP01/rels/d_a_salvage_tbox/splits.txt index b623b42..a92bff1 100644 --- a/config/GZLP01/rels/d_a_salvage_tbox/splits.txt +++ b/config/GZLP01/rels/d_a_salvage_tbox/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_salvage_tbox.cpp: +d/actor/d_a_salvage_tbox.cpp: .text start:0x00000078 end:0x000014A8 .text start:0x000014A8 end:0x000016D4 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_sbox/splits.txt b/config/GZLP01/rels/d_a_sbox/splits.txt index bfb551e..f4d7afb 100644 --- a/config/GZLP01/rels/d_a_sbox/splits.txt +++ b/config/GZLP01/rels/d_a_sbox/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_sbox.cpp: +d/actor/d_a_sbox.cpp: .text start:0x00000078 end:0x00001660 .rodata start:0x00000000 end:0x000000BA .data start:0x00000000 end:0x0000008C diff --git a/config/GZLP01/rels/d_a_scene_change/splits.txt b/config/GZLP01/rels/d_a_scene_change/splits.txt index 03cf2d5..83746d6 100644 --- a/config/GZLP01/rels/d_a_scene_change/splits.txt +++ b/config/GZLP01/rels/d_a_scene_change/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_scene_change.cpp: +d/actor/d_a_scene_change.cpp: .text start:0x000000EC end:0x00000254 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000004 diff --git a/config/GZLP01/rels/d_a_seatag/splits.txt b/config/GZLP01/rels/d_a_seatag/splits.txt index 8325b88..9e6142b 100644 --- a/config/GZLP01/rels/d_a_seatag/splits.txt +++ b/config/GZLP01/rels/d_a_seatag/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_seatag.cpp: +d/actor/d_a_seatag.cpp: .text start:0x00000078 end:0x00000110 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_shand/splits.txt b/config/GZLP01/rels/d_a_shand/splits.txt index ef371ba..c6198c0 100644 --- a/config/GZLP01/rels/d_a_shand/splits.txt +++ b/config/GZLP01/rels/d_a_shand/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_shand.cpp: +d/actor/d_a_shand.cpp: .text start:0x000000EC end:0x00002C80 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000093 diff --git a/config/GZLP01/rels/d_a_ship/splits.txt b/config/GZLP01/rels/d_a_ship/splits.txt index fc6a38c..58799bc 100644 --- a/config/GZLP01/rels/d_a_ship/splits.txt +++ b/config/GZLP01/rels/d_a_ship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ship.cpp: +d/actor/d_a_ship.cpp: .text start:0x000000EC end:0x0000D3FC .text start:0x0000D3FC end:0x0000D498 .text start:0x0000D498 end:0x0000D500 diff --git a/config/GZLP01/rels/d_a_shop_item/splits.txt b/config/GZLP01/rels/d_a_shop_item/splits.txt index 8068f1c..1a803c7 100644 --- a/config/GZLP01/rels/d_a_shop_item/splits.txt +++ b/config/GZLP01/rels/d_a_shop_item/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_shop_item.cpp: +d/actor/d_a_shop_item.cpp: .text start:0x00000078 end:0x00000E68 .text start:0x00000E68 end:0x00000E84 .text start:0x00000E84 end:0x00000EA8 diff --git a/config/GZLP01/rels/d_a_shutter/splits.txt b/config/GZLP01/rels/d_a_shutter/splits.txt index c0a9829..67eb0a5 100644 --- a/config/GZLP01/rels/d_a_shutter/splits.txt +++ b/config/GZLP01/rels/d_a_shutter/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_shutter.cpp: +d/actor/d_a_shutter.cpp: .text start:0x00000078 end:0x00000E7C .rodata start:0x00000000 end:0x000000EA .data start:0x00000000 end:0x00000080 diff --git a/config/GZLP01/rels/d_a_shutter2/splits.txt b/config/GZLP01/rels/d_a_shutter2/splits.txt index 4761bbb..ed55be2 100644 --- a/config/GZLP01/rels/d_a_shutter2/splits.txt +++ b/config/GZLP01/rels/d_a_shutter2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_shutter2.cpp: +d/actor/d_a_shutter2.cpp: .text start:0x00000078 end:0x000009E4 .text start:0x000009E4 end:0x000009FC .rodata start:0x00000000 end:0x000000AB diff --git a/config/GZLP01/rels/d_a_sie_flag/splits.txt b/config/GZLP01/rels/d_a_sie_flag/splits.txt index 34a39e9..abef897 100644 --- a/config/GZLP01/rels/d_a_sie_flag/splits.txt +++ b/config/GZLP01/rels/d_a_sie_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sie_flag.cpp: +d/actor/d_a_sie_flag.cpp: .text start:0x000000EC end:0x00000E10 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000087 diff --git a/config/GZLP01/rels/d_a_sitem/splits.txt b/config/GZLP01/rels/d_a_sitem/splits.txt index d2247b3..689075d 100644 --- a/config/GZLP01/rels/d_a_sitem/splits.txt +++ b/config/GZLP01/rels/d_a_sitem/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sitem.cpp: +d/actor/d_a_sitem.cpp: .text start:0x000000EC end:0x000031F0 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000086 diff --git a/config/GZLP01/rels/d_a_sk/splits.txt b/config/GZLP01/rels/d_a_sk/splits.txt index 5985903..507867c 100644 --- a/config/GZLP01/rels/d_a_sk/splits.txt +++ b/config/GZLP01/rels/d_a_sk/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_sk.cpp: +d/actor/d_a_sk.cpp: .text start:0x00000078 end:0x000011AC .rodata start:0x00000000 end:0x0000003F .data start:0x00000000 end:0x000001B4 diff --git a/config/GZLP01/rels/d_a_sk2/splits.txt b/config/GZLP01/rels/d_a_sk2/splits.txt index d2d84e5..b96314e 100644 --- a/config/GZLP01/rels/d_a_sk2/splits.txt +++ b/config/GZLP01/rels/d_a_sk2/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_sk2.cpp: +d/actor/d_a_sk2.cpp: .text start:0x00000078 end:0x00000C78 .text start:0x00000C78 end:0x00000C7C .text start:0x00000C7C end:0x00000D38 diff --git a/config/GZLP01/rels/d_a_spotbox/splits.txt b/config/GZLP01/rels/d_a_spotbox/splits.txt index 093b55b..98bd808 100644 --- a/config/GZLP01/rels/d_a_spotbox/splits.txt +++ b/config/GZLP01/rels/d_a_spotbox/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_spotbox.cpp: +d/actor/d_a_spotbox.cpp: .text start:0x00000078 end:0x00000250 .rodata start:0x00000000 end:0x00000014 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_ss/splits.txt b/config/GZLP01/rels/d_a_ss/splits.txt index 63dcda7..809c19e 100644 --- a/config/GZLP01/rels/d_a_ss/splits.txt +++ b/config/GZLP01/rels/d_a_ss/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ss.cpp: +d/actor/d_a_ss.cpp: .text start:0x000000EC end:0x0000387C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000BE diff --git a/config/GZLP01/rels/d_a_ssk/splits.txt b/config/GZLP01/rels/d_a_ssk/splits.txt index 2aec56f..5ffdf5d 100644 --- a/config/GZLP01/rels/d_a_ssk/splits.txt +++ b/config/GZLP01/rels/d_a_ssk/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ssk.cpp: +d/actor/d_a_ssk.cpp: .text start:0x00000078 end:0x000015BC .rodata start:0x00000000 end:0x0000005C .data start:0x00000000 end:0x000001DC diff --git a/config/GZLP01/rels/d_a_sss/splits.txt b/config/GZLP01/rels/d_a_sss/splits.txt index ac93ea2..63ab59c 100644 --- a/config/GZLP01/rels/d_a_sss/splits.txt +++ b/config/GZLP01/rels/d_a_sss/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_sss.cpp: +d/actor/d_a_sss.cpp: .text start:0x000000EC end:0x00002FD4 .text start:0x00002FD4 end:0x00003354 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_st/splits.txt b/config/GZLP01/rels/d_a_st/splits.txt index a56c22a..faa4b05 100644 --- a/config/GZLP01/rels/d_a_st/splits.txt +++ b/config/GZLP01/rels/d_a_st/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_st.cpp: +d/actor/d_a_st.cpp: .text start:0x000000EC end:0x00009DBC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000159 diff --git a/config/GZLP01/rels/d_a_steam_tag/splits.txt b/config/GZLP01/rels/d_a_steam_tag/splits.txt index 9a9fa6e..b0dbb10 100644 --- a/config/GZLP01/rels/d_a_steam_tag/splits.txt +++ b/config/GZLP01/rels/d_a_steam_tag/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_steam_tag.cpp: +d/actor/d_a_steam_tag.cpp: .text start:0x00000078 end:0x00001064 .rodata start:0x00000000 end:0x0000002C .data start:0x00000000 end:0x00000258 diff --git a/config/GZLP01/rels/d_a_stone/splits.txt b/config/GZLP01/rels/d_a_stone/splits.txt index 4fa911a..0b982fb 100644 --- a/config/GZLP01/rels/d_a_stone/splits.txt +++ b/config/GZLP01/rels/d_a_stone/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_stone.cpp: +d/actor/d_a_stone.cpp: .text start:0x000000EC end:0x00003700 .text start:0x00003700 end:0x00003700 .text start:0x00003700 end:0x000037E8 diff --git a/config/GZLP01/rels/d_a_stone2/splits.txt b/config/GZLP01/rels/d_a_stone2/splits.txt index 53f3f74..93feacf 100644 --- a/config/GZLP01/rels/d_a_stone2/splits.txt +++ b/config/GZLP01/rels/d_a_stone2/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_stone2.cpp: +d/actor/d_a_stone2.cpp: .text start:0x000000EC end:0x000027F4 .text start:0x000027F4 end:0x00002B08 .text start:0x00002B08 end:0x00002D80 diff --git a/config/GZLP01/rels/d_a_swattack/splits.txt b/config/GZLP01/rels/d_a_swattack/splits.txt index e4f3858..455374a 100644 --- a/config/GZLP01/rels/d_a_swattack/splits.txt +++ b/config/GZLP01/rels/d_a_swattack/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swattack.cpp: +d/actor/d_a_swattack.cpp: .text start:0x00000078 end:0x000006F4 .rodata start:0x00000000 end:0x00000008 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLP01/rels/d_a_swc00/splits.txt b/config/GZLP01/rels/d_a_swc00/splits.txt index 8664d0e..7ec2062 100644 --- a/config/GZLP01/rels/d_a_swc00/splits.txt +++ b/config/GZLP01/rels/d_a_swc00/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swc00.cpp: +d/actor/d_a_swc00.cpp: .text start:0x00000078 end:0x00000274 .rodata start:0x00000000 end:0x0000000C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_swhit0/splits.txt b/config/GZLP01/rels/d_a_swhit0/splits.txt index 2776ed9..b21e624 100644 --- a/config/GZLP01/rels/d_a_swhit0/splits.txt +++ b/config/GZLP01/rels/d_a_swhit0/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swhit0.cpp: +d/actor/d_a_swhit0.cpp: .text start:0x00000078 end:0x00001698 .text start:0x00001698 end:0x000018A8 .rodata start:0x00000000 end:0x0000006F diff --git a/config/GZLP01/rels/d_a_switem/splits.txt b/config/GZLP01/rels/d_a_switem/splits.txt index 45dcd7e..e2d5eae 100644 --- a/config/GZLP01/rels/d_a_switem/splits.txt +++ b/config/GZLP01/rels/d_a_switem/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_switem.cpp: +d/actor/d_a_switem.cpp: .text start:0x00000078 end:0x00000904 .rodata start:0x00000000 end:0x00000010 .data start:0x00000000 end:0x00000188 diff --git a/config/GZLP01/rels/d_a_swpropeller/splits.txt b/config/GZLP01/rels/d_a_swpropeller/splits.txt index 027f610..1ee8ed3 100644 --- a/config/GZLP01/rels/d_a_swpropeller/splits.txt +++ b/config/GZLP01/rels/d_a_swpropeller/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swpropeller.cpp: +d/actor/d_a_swpropeller.cpp: .text start:0x00000078 end:0x00000DA0 .rodata start:0x00000000 end:0x00000087 .data start:0x00000000 end:0x000001B4 diff --git a/config/GZLP01/rels/d_a_swtact/splits.txt b/config/GZLP01/rels/d_a_swtact/splits.txt index 0b7d244..f2d1e7e 100644 --- a/config/GZLP01/rels/d_a_swtact/splits.txt +++ b/config/GZLP01/rels/d_a_swtact/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swtact.cpp: +d/actor/d_a_swtact.cpp: .text start:0x00000078 end:0x000007B4 .text start:0x000007B4 end:0x000007B4 .rodata start:0x00000000 end:0x00000069 diff --git a/config/GZLP01/rels/d_a_swtdoor/splits.txt b/config/GZLP01/rels/d_a_swtdoor/splits.txt index 6d8402b..a0af862 100644 --- a/config/GZLP01/rels/d_a_swtdoor/splits.txt +++ b/config/GZLP01/rels/d_a_swtdoor/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_swtdoor.cpp: +d/actor/d_a_swtdoor.cpp: .text start:0x00000078 end:0x00000374 .rodata start:0x00000000 end:0x00000024 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_syan/splits.txt b/config/GZLP01/rels/d_a_syan/splits.txt index 00e6ec3..9bf3a13 100644 --- a/config/GZLP01/rels/d_a_syan/splits.txt +++ b/config/GZLP01/rels/d_a_syan/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_syan.cpp: +d/actor/d_a_syan.cpp: .text start:0x000000EC end:0x0000116C .rodata start:0x00000000 end:0x000000A5 .data start:0x00000000 end:0x00000110 diff --git a/config/GZLP01/rels/d_a_tag_attention/splits.txt b/config/GZLP01/rels/d_a_tag_attention/splits.txt index 4dfdcd4..dbedfae 100644 --- a/config/GZLP01/rels/d_a_tag_attention/splits.txt +++ b/config/GZLP01/rels/d_a_tag_attention/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_attention.cpp: +d/actor/d_a_tag_attention.cpp: .text start:0x00000078 end:0x000005C4 .text start:0x000005C4 end:0x000007E0 .text start:0x000007E0 end:0x0000080C diff --git a/config/GZLP01/rels/d_a_tag_ba1/splits.txt b/config/GZLP01/rels/d_a_tag_ba1/splits.txt index 379cdc1..3e7e3ce 100644 --- a/config/GZLP01/rels/d_a_tag_ba1/splits.txt +++ b/config/GZLP01/rels/d_a_tag_ba1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_ba1.cpp: +d/actor/d_a_tag_ba1.cpp: .text start:0x000000EC end:0x00000560 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000022 diff --git a/config/GZLP01/rels/d_a_tag_etc/splits.txt b/config/GZLP01/rels/d_a_tag_etc/splits.txt index 0a35785..0a07536 100644 --- a/config/GZLP01/rels/d_a_tag_etc/splits.txt +++ b/config/GZLP01/rels/d_a_tag_etc/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_etc.cpp: +d/actor/d_a_tag_etc.cpp: .text start:0x00000078 end:0x00000788 .rodata start:0x00000000 end:0x0000002E .data start:0x00000000 end:0x00000064 diff --git a/config/GZLP01/rels/d_a_tag_event/splits.txt b/config/GZLP01/rels/d_a_tag_event/splits.txt index a24eaa0..411f375 100644 --- a/config/GZLP01/rels/d_a_tag_event/splits.txt +++ b/config/GZLP01/rels/d_a_tag_event/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_event.cpp: +d/actor/d_a_tag_event.cpp: .text start:0x00000078 end:0x00001524 .rodata start:0x00000000 end:0x00000057 .data start:0x00000000 end:0x000000E4 diff --git a/config/GZLP01/rels/d_a_tag_evsw/splits.txt b/config/GZLP01/rels/d_a_tag_evsw/splits.txt index ba2a120..595935f 100644 --- a/config/GZLP01/rels/d_a_tag_evsw/splits.txt +++ b/config/GZLP01/rels/d_a_tag_evsw/splits.txt @@ -7,7 +7,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_evsw.cpp: +d/actor/d_a_tag_evsw.cpp: .text start:0x00000078 end:0x00000604 .text start:0x00000604 end:0x00000630 .data start:0x00000000 end:0x00000144 diff --git a/config/GZLP01/rels/d_a_tag_ghostship/splits.txt b/config/GZLP01/rels/d_a_tag_ghostship/splits.txt index a855c58..bab6807 100644 --- a/config/GZLP01/rels/d_a_tag_ghostship/splits.txt +++ b/config/GZLP01/rels/d_a_tag_ghostship/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_ghostship.cpp: +d/actor/d_a_tag_ghostship.cpp: .text start:0x000000EC end:0x0000070C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000008E diff --git a/config/GZLP01/rels/d_a_tag_hint/splits.txt b/config/GZLP01/rels/d_a_tag_hint/splits.txt index e31c7c9..0747b40 100644 --- a/config/GZLP01/rels/d_a_tag_hint/splits.txt +++ b/config/GZLP01/rels/d_a_tag_hint/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_hint.cpp: +d/actor/d_a_tag_hint.cpp: .text start:0x000000EC end:0x00002264 .text start:0x00002264 end:0x00002280 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_tag_island/splits.txt b/config/GZLP01/rels/d_a_tag_island/splits.txt index ce90485..89d2487 100644 --- a/config/GZLP01/rels/d_a_tag_island/splits.txt +++ b/config/GZLP01/rels/d_a_tag_island/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_island.cpp: +d/actor/d_a_tag_island.cpp: .text start:0x00000078 end:0x000013D8 .text start:0x000013D8 end:0x000013D8 .rodata start:0x00000000 end:0x0000011E diff --git a/config/GZLP01/rels/d_a_tag_kb_item/splits.txt b/config/GZLP01/rels/d_a_tag_kb_item/splits.txt index 9f4ed36..b01664e 100644 --- a/config/GZLP01/rels/d_a_tag_kb_item/splits.txt +++ b/config/GZLP01/rels/d_a_tag_kb_item/splits.txt @@ -7,6 +7,6 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_kb_item.cpp: +d/actor/d_a_tag_kb_item.cpp: .text start:0x00000078 end:0x00000260 .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_tag_kf1/splits.txt b/config/GZLP01/rels/d_a_tag_kf1/splits.txt index 2a616fa..5008033 100644 --- a/config/GZLP01/rels/d_a_tag_kf1/splits.txt +++ b/config/GZLP01/rels/d_a_tag_kf1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_kf1.cpp: +d/actor/d_a_tag_kf1.cpp: .text start:0x000000EC end:0x0000127C .text start:0x0000127C end:0x00001290 .text start:0x00001290 end:0x00001308 diff --git a/config/GZLP01/rels/d_a_tag_kk1/splits.txt b/config/GZLP01/rels/d_a_tag_kk1/splits.txt index 856b4a1..367f15e 100644 --- a/config/GZLP01/rels/d_a_tag_kk1/splits.txt +++ b/config/GZLP01/rels/d_a_tag_kk1/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_kk1.cpp: +d/actor/d_a_tag_kk1.cpp: .text start:0x000000EC end:0x000007C0 .text start:0x000007C0 end:0x000008C0 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_tag_light/splits.txt b/config/GZLP01/rels/d_a_tag_light/splits.txt index 144c6f8..d4cec52 100644 --- a/config/GZLP01/rels/d_a_tag_light/splits.txt +++ b/config/GZLP01/rels/d_a_tag_light/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_light.cpp: +d/actor/d_a_tag_light.cpp: .text start:0x00000078 end:0x00002088 .text start:0x00002088 end:0x000020F4 .rodata start:0x00000000 end:0x0000012C diff --git a/config/GZLP01/rels/d_a_tag_md_cb/splits.txt b/config/GZLP01/rels/d_a_tag_md_cb/splits.txt index 289f265..150f73d 100644 --- a/config/GZLP01/rels/d_a_tag_md_cb/splits.txt +++ b/config/GZLP01/rels/d_a_tag_md_cb/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_md_cb.cpp: +d/actor/d_a_tag_md_cb.cpp: .text start:0x000000EC end:0x00001B88 .text start:0x00001B88 end:0x00001B88 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_tag_mk/splits.txt b/config/GZLP01/rels/d_a_tag_mk/splits.txt index 0326d8d..eeafc56 100644 --- a/config/GZLP01/rels/d_a_tag_mk/splits.txt +++ b/config/GZLP01/rels/d_a_tag_mk/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_mk.cpp: +d/actor/d_a_tag_mk.cpp: .text start:0x00000078 end:0x000011E4 .rodata start:0x00000000 end:0x00000093 .data start:0x00000000 end:0x000000BC diff --git a/config/GZLP01/rels/d_a_tag_msg/splits.txt b/config/GZLP01/rels/d_a_tag_msg/splits.txt index 9fd4638..4858dde 100644 --- a/config/GZLP01/rels/d_a_tag_msg/splits.txt +++ b/config/GZLP01/rels/d_a_tag_msg/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_msg.cpp: +d/actor/d_a_tag_msg.cpp: .text start:0x00000078 end:0x00000964 .rodata start:0x00000000 end:0x00000046 .data start:0x00000000 end:0x00000060 diff --git a/config/GZLP01/rels/d_a_tag_photo/splits.txt b/config/GZLP01/rels/d_a_tag_photo/splits.txt index 22e7671..5ce0228 100644 --- a/config/GZLP01/rels/d_a_tag_photo/splits.txt +++ b/config/GZLP01/rels/d_a_tag_photo/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_photo.cpp: +d/actor/d_a_tag_photo.cpp: .text start:0x00000078 end:0x000009B0 .text start:0x000009B0 end:0x00000A0C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_tag_ret/splits.txt b/config/GZLP01/rels/d_a_tag_ret/splits.txt index 3b1672c..e10cf0a 100644 --- a/config/GZLP01/rels/d_a_tag_ret/splits.txt +++ b/config/GZLP01/rels/d_a_tag_ret/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_ret.cpp: +d/actor/d_a_tag_ret.cpp: .text start:0x00000078 end:0x000005E8 .text start:0x000005E8 end:0x00000614 .rodata start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_tag_so/splits.txt b/config/GZLP01/rels/d_a_tag_so/splits.txt index 2c07a38..5d83bb4 100644 --- a/config/GZLP01/rels/d_a_tag_so/splits.txt +++ b/config/GZLP01/rels/d_a_tag_so/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tag_so.cpp: +d/actor/d_a_tag_so.cpp: .text start:0x000000EC end:0x0000039C .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000018 diff --git a/config/GZLP01/rels/d_a_tag_volcano/splits.txt b/config/GZLP01/rels/d_a_tag_volcano/splits.txt index 0862d75..3bce29d 100644 --- a/config/GZLP01/rels/d_a_tag_volcano/splits.txt +++ b/config/GZLP01/rels/d_a_tag_volcano/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_volcano.cpp: +d/actor/d_a_tag_volcano.cpp: .text start:0x00000078 end:0x00000A34 .text start:0x00000A34 end:0x00000A50 .rodata start:0x00000000 end:0x00000058 diff --git a/config/GZLP01/rels/d_a_tag_waterlevel/splits.txt b/config/GZLP01/rels/d_a_tag_waterlevel/splits.txt index 4e97882..7687a03 100644 --- a/config/GZLP01/rels/d_a_tag_waterlevel/splits.txt +++ b/config/GZLP01/rels/d_a_tag_waterlevel/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tag_waterlevel.cpp: +d/actor/d_a_tag_waterlevel.cpp: .text start:0x00000078 end:0x00000400 .text start:0x00000400 end:0x0000041C .rodata start:0x00000000 end:0x00000024 diff --git a/config/GZLP01/rels/d_a_tama/splits.txt b/config/GZLP01/rels/d_a_tama/splits.txt index c154694..1b95705 100644 --- a/config/GZLP01/rels/d_a_tama/splits.txt +++ b/config/GZLP01/rels/d_a_tama/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tama.cpp: +d/actor/d_a_tama.cpp: .text start:0x00000078 end:0x000007CC .rodata start:0x00000000 end:0x00000010 .data start:0x00000000 end:0x000001A8 diff --git a/config/GZLP01/rels/d_a_tbox/splits.txt b/config/GZLP01/rels/d_a_tbox/splits.txt index c88ba79..f965722 100644 --- a/config/GZLP01/rels/d_a_tbox/splits.txt +++ b/config/GZLP01/rels/d_a_tbox/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tbox.cpp: +d/actor/d_a_tbox.cpp: .text start:0x000000EC end:0x00003A88 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000015C diff --git a/config/GZLP01/rels/d_a_title/splits.txt b/config/GZLP01/rels/d_a_title/splits.txt index 99aaca6..c0fe6d1 100644 --- a/config/GZLP01/rels/d_a_title/splits.txt +++ b/config/GZLP01/rels/d_a_title/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_title.cpp: +d/actor/d_a_title.cpp: .text start:0x00000078 end:0x00001E48 .text start:0x00001E48 end:0x00001E6C .rodata start:0x00000000 end:0x000001E7 diff --git a/config/GZLP01/rels/d_a_tn/splits.txt b/config/GZLP01/rels/d_a_tn/splits.txt index 01b83b9..64751f0 100644 --- a/config/GZLP01/rels/d_a_tn/splits.txt +++ b/config/GZLP01/rels/d_a_tn/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tn.cpp: +d/actor/d_a_tn.cpp: .text start:0x000000EC end:0x0000DBEC .text start:0x0000DBEC end:0x0000DBEC .text start:0x0000DBEC end:0x0000DCAC diff --git a/config/GZLP01/rels/d_a_toge/splits.txt b/config/GZLP01/rels/d_a_toge/splits.txt index f11c82c..10d5a18 100644 --- a/config/GZLP01/rels/d_a_toge/splits.txt +++ b/config/GZLP01/rels/d_a_toge/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_toge.cpp: +d/actor/d_a_toge.cpp: .text start:0x00000078 end:0x00000EE4 .rodata start:0x00000000 end:0x0000006A .data start:0x00000000 end:0x00000188 diff --git a/config/GZLP01/rels/d_a_tori_flag/splits.txt b/config/GZLP01/rels/d_a_tori_flag/splits.txt index cab8985..bea92da 100644 --- a/config/GZLP01/rels/d_a_tori_flag/splits.txt +++ b/config/GZLP01/rels/d_a_tori_flag/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tori_flag.cpp: +d/actor/d_a_tori_flag.cpp: .text start:0x000000EC end:0x00000D78 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x0000007C diff --git a/config/GZLP01/rels/d_a_tornado/splits.txt b/config/GZLP01/rels/d_a_tornado/splits.txt index 4c8c115..6878d93 100644 --- a/config/GZLP01/rels/d_a_tornado/splits.txt +++ b/config/GZLP01/rels/d_a_tornado/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tornado.cpp: +d/actor/d_a_tornado.cpp: .text start:0x000000EC end:0x0000164C .rodata start:0x00000000 end:0x000000DC .data start:0x00000000 end:0x00000088 diff --git a/config/GZLP01/rels/d_a_tpota/splits.txt b/config/GZLP01/rels/d_a_tpota/splits.txt index 674a456..fb7b612 100644 --- a/config/GZLP01/rels/d_a_tpota/splits.txt +++ b/config/GZLP01/rels/d_a_tpota/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_tpota.cpp: +d/actor/d_a_tpota.cpp: .text start:0x00000078 end:0x00000564 .rodata start:0x00000000 end:0x0000000C .data start:0x00000000 end:0x00000050 diff --git a/config/GZLP01/rels/d_a_tsubo/splits.txt b/config/GZLP01/rels/d_a_tsubo/splits.txt index b5f3514..0fb1896 100644 --- a/config/GZLP01/rels/d_a_tsubo/splits.txt +++ b/config/GZLP01/rels/d_a_tsubo/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_tsubo.cpp: +d/actor/d_a_tsubo.cpp: .text start:0x000000EC end:0x0000810C .text start:0x0000810C end:0x0000810C .text start:0x0000810C end:0x000081A0 diff --git a/config/GZLP01/rels/d_a_wall/splits.txt b/config/GZLP01/rels/d_a_wall/splits.txt index 1c8e5e5..358fb98 100644 --- a/config/GZLP01/rels/d_a_wall/splits.txt +++ b/config/GZLP01/rels/d_a_wall/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wall.cpp: +d/actor/d_a_wall.cpp: .text start:0x00000078 end:0x000012D8 .rodata start:0x00000000 end:0x00000144 .data start:0x00000000 end:0x00000268 diff --git a/config/GZLP01/rels/d_a_warpdm20/splits.txt b/config/GZLP01/rels/d_a_warpdm20/splits.txt index 7d580f3..49ddf8f 100644 --- a/config/GZLP01/rels/d_a_warpdm20/splits.txt +++ b/config/GZLP01/rels/d_a_warpdm20/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpdm20.cpp: +d/actor/d_a_warpdm20.cpp: .text start:0x00000078 end:0x00001AAC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000F5 diff --git a/config/GZLP01/rels/d_a_warpf/splits.txt b/config/GZLP01/rels/d_a_warpf/splits.txt index 089bc0c..3cc81e1 100644 --- a/config/GZLP01/rels/d_a_warpf/splits.txt +++ b/config/GZLP01/rels/d_a_warpf/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpf.cpp: +d/actor/d_a_warpf.cpp: .text start:0x00000078 end:0x00002638 .text start:0x00002638 end:0x00002638 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_warpfout/splits.txt b/config/GZLP01/rels/d_a_warpfout/splits.txt index 4ba4781..de43b6d 100644 --- a/config/GZLP01/rels/d_a_warpfout/splits.txt +++ b/config/GZLP01/rels/d_a_warpfout/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpfout.cpp: +d/actor/d_a_warpfout.cpp: .text start:0x00000078 end:0x00000808 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x00000037 diff --git a/config/GZLP01/rels/d_a_warpgn/splits.txt b/config/GZLP01/rels/d_a_warpgn/splits.txt index 973aa9b..84893c4 100644 --- a/config/GZLP01/rels/d_a_warpgn/splits.txt +++ b/config/GZLP01/rels/d_a_warpgn/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpgn.cpp: +d/actor/d_a_warpgn.cpp: .text start:0x00000078 end:0x00001BCC .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000DF diff --git a/config/GZLP01/rels/d_a_warphr/splits.txt b/config/GZLP01/rels/d_a_warphr/splits.txt index c190dc3..a205393 100644 --- a/config/GZLP01/rels/d_a_warphr/splits.txt +++ b/config/GZLP01/rels/d_a_warphr/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_warphr.cpp: +d/actor/d_a_warphr.cpp: .text start:0x000000EC end:0x00001930 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000FE diff --git a/config/GZLP01/rels/d_a_warpls/splits.txt b/config/GZLP01/rels/d_a_warpls/splits.txt index 328a64d..33d5bd7 100644 --- a/config/GZLP01/rels/d_a_warpls/splits.txt +++ b/config/GZLP01/rels/d_a_warpls/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpls.cpp: +d/actor/d_a_warpls.cpp: .text start:0x00000078 end:0x000012B4 .rodata start:0x00000000 end:0x000000D8 .data start:0x00000000 end:0x0000007C diff --git a/config/GZLP01/rels/d_a_warpmj/splits.txt b/config/GZLP01/rels/d_a_warpmj/splits.txt index 877edd4..5b18f08 100644 --- a/config/GZLP01/rels/d_a_warpmj/splits.txt +++ b/config/GZLP01/rels/d_a_warpmj/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_warpmj.cpp: +d/actor/d_a_warpmj.cpp: .text start:0x00000078 end:0x00001398 .ctors start:0x00000000 end:0x00000008 .rodata start:0x00000000 end:0x000000B8 diff --git a/config/GZLP01/rels/d_a_waterfall/splits.txt b/config/GZLP01/rels/d_a_waterfall/splits.txt index 07d394d..7291a9d 100644 --- a/config/GZLP01/rels/d_a_waterfall/splits.txt +++ b/config/GZLP01/rels/d_a_waterfall/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_waterfall.cpp: +d/actor/d_a_waterfall.cpp: .text start:0x00000078 end:0x00001994 .rodata start:0x00000000 end:0x000000AC .data start:0x00000000 end:0x000001C4 diff --git a/config/GZLP01/rels/d_a_wbird/splits.txt b/config/GZLP01/rels/d_a_wbird/splits.txt index dc25d25..68f4b40 100644 --- a/config/GZLP01/rels/d_a_wbird/splits.txt +++ b/config/GZLP01/rels/d_a_wbird/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wbird.cpp: +d/actor/d_a_wbird.cpp: .text start:0x00000078 end:0x00000928 .text start:0x00000928 end:0x00000928 .rodata start:0x00000000 end:0x00000063 diff --git a/config/GZLP01/rels/d_a_wind_tag/splits.txt b/config/GZLP01/rels/d_a_wind_tag/splits.txt index 46152d5..8d35ac8 100644 --- a/config/GZLP01/rels/d_a_wind_tag/splits.txt +++ b/config/GZLP01/rels/d_a_wind_tag/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wind_tag.cpp: +d/actor/d_a_wind_tag.cpp: .text start:0x00000078 end:0x00001CC8 .rodata start:0x00000000 end:0x0000008D .data start:0x00000000 end:0x00000208 diff --git a/config/GZLP01/rels/d_a_windmill/splits.txt b/config/GZLP01/rels/d_a_windmill/splits.txt index b1266d6..cafe8ee 100644 --- a/config/GZLP01/rels/d_a_windmill/splits.txt +++ b/config/GZLP01/rels/d_a_windmill/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_windmill.cpp: +d/actor/d_a_windmill.cpp: .text start:0x00000078 end:0x00001AFC .rodata start:0x00000000 end:0x000000B7 .data start:0x00000000 end:0x00000398 diff --git a/config/GZLP01/rels/d_a_wz/splits.txt b/config/GZLP01/rels/d_a_wz/splits.txt index 835009e..1807db7 100644 --- a/config/GZLP01/rels/d_a_wz/splits.txt +++ b/config/GZLP01/rels/d_a_wz/splits.txt @@ -9,7 +9,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_wz.cpp: +d/actor/d_a_wz.cpp: .text start:0x00000078 end:0x00007D08 .text start:0x00007D08 end:0x00007D08 .rodata start:0x00000000 end:0x0000018A diff --git a/config/GZLP01/rels/d_a_ygcwp/splits.txt b/config/GZLP01/rels/d_a_ygcwp/splits.txt index 8e7f94f..98f7ccf 100644 --- a/config/GZLP01/rels/d_a_ygcwp/splits.txt +++ b/config/GZLP01/rels/d_a_ygcwp/splits.txt @@ -8,7 +8,7 @@ Sections: REL/executor.c: .text start:0x00000000 end:0x00000078 -d/a/d_a_ygcwp.cpp: +d/actor/d_a_ygcwp.cpp: .text start:0x00000078 end:0x00000970 .rodata start:0x00000000 end:0x000000A2 .data start:0x00000000 end:0x00000074 diff --git a/config/GZLP01/rels/d_a_ykgr/splits.txt b/config/GZLP01/rels/d_a_ykgr/splits.txt index 8b6abcf..e6296ce 100644 --- a/config/GZLP01/rels/d_a_ykgr/splits.txt +++ b/config/GZLP01/rels/d_a_ykgr/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_ykgr.cpp: +d/actor/d_a_ykgr.cpp: .text start:0x000000EC end:0x000009A0 .text start:0x000009A0 end:0x00000B54 .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/rels/d_a_yougan/splits.txt b/config/GZLP01/rels/d_a_yougan/splits.txt index 3af3df9..34570cc 100644 --- a/config/GZLP01/rels/d_a_yougan/splits.txt +++ b/config/GZLP01/rels/d_a_yougan/splits.txt @@ -14,7 +14,7 @@ REL/global_destructor_chain.c: .dtors start:0x00000000 end:0x00000008 .bss start:0x00000000 end:0x00000008 -d/a/d_a_yougan.cpp: +d/actor/d_a_yougan.cpp: .text start:0x000000EC end:0x00000A4C .text start:0x00000A4C end:0x00000C1C .ctors start:0x00000000 end:0x00000008 diff --git a/config/GZLP01/splits.txt b/config/GZLP01/splits.txt index 128b602..cb2f8b3 100644 --- a/config/GZLP01/splits.txt +++ b/config/GZLP01/splits.txt @@ -403,7 +403,7 @@ d/d_stage.cpp: .sbss start:0x803FE270 end:0x803FE288 .sdata2 start:0x803FF9B0 end:0x803FF9E0 -d/map/d_map.cpp: +d/d_map.cpp: .text start:0x80049360 end:0x8005558C .text start:0x8005558C end:0x80055F14 .ctors start:0x8033DBF8 end:0x8033DBFC @@ -414,7 +414,7 @@ d/map/d_map.cpp: .sdata2 start:0x803FF9E0 end:0x803FFB30 .sbss2 start:0x80404788 end:0x80404790 -d/com/d_com_inf_game.cpp: +d/d_com_inf_game.cpp: .text start:0x80055F14 end:0x8005A3AC .ctors start:0x8033DBFC end:0x8033DC00 .rodata start:0x80355880 end:0x80355A20 @@ -423,10 +423,10 @@ d/com/d_com_inf_game.cpp: .sdata start:0x803FD9A0 end:0x803FD9B0 .sdata2 start:0x803FFB30 end:0x803FFB48 -d/com/d_com_lib_game.cpp: +d/d_com_lib_game.cpp: .text start:0x8005A3AC end:0x8005A40C -d/com/d_com_static.cpp: +d/d_com_static.cpp: .text start:0x8005A40C end:0x8005ADE0 .ctors start:0x8033DC00 end:0x8033DC04 .rodata start:0x80355A20 end:0x80355AA0 @@ -442,7 +442,7 @@ d/d_lib.cpp: .data start:0x8037C9E8 end:0x8037CA18 .sdata2 start:0x803FFB90 end:0x803FFBC0 -d/save/d_save.cpp: +d/d_save.cpp: .text start:0x8005C788 end:0x80062D68 .rodata start:0x80355B28 end:0x80355ED8 .data start:0x8037CA18 end:0x8037CAD8 @@ -451,7 +451,7 @@ d/save/d_save.cpp: .sbss start:0x803FE388 end:0x803FE390 .sdata2 start:0x803FFBC0 end:0x803FFBD0 -d/save/d_save_init.cpp: +d/d_save_init.cpp: .text start:0x80062D68 end:0x80062DBC d/d_shop.cpp: @@ -481,7 +481,7 @@ d/d_cloth_packet.cpp: .sbss start:0x803FE390 end:0x803FE3A0 .sdata2 start:0x803FFC68 end:0x803FFCF0 -d/a/d_a_obj.cpp: +d/actor/d_a_obj.cpp: .text start:0x8006A4CC end:0x8006BAFC .rodata start:0x80355F08 end:0x80355FA8 .data start:0x8037DC98 end:0x8037DCF8 @@ -489,52 +489,52 @@ d/a/d_a_obj.cpp: .sbss start:0x803FE3A0 end:0x803FE3A8 .sdata2 start:0x803FFCF0 end:0x803FFD58 -d/a/d_a_obj_tribox_static.cpp: +d/actor/d_a_obj_tribox_static.cpp: .text start:0x8006BAFC end:0x8006BB74 .ctors start:0x8033DC08 end:0x8033DC0C .bss start:0x803E9858 end:0x803E9870 .sbss start:0x803FE3A8 end:0x803FE3C0 -d/a/d_a_ship_static.cpp: +d/actor/d_a_ship_static.cpp: .text start:0x8006BB74 end:0x8006BC58 .sdata2 start:0x803FFD58 end:0x803FFD60 -d/a/d_a_boko_static.cpp: +d/actor/d_a_boko_static.cpp: .text start:0x8006BC58 end:0x8006BD80 .data start:0x8037DCF8 end:0x8037DE48 .sdata start:0x803FD9E0 end:0x803FD9E8 -d/a/d_a_bomb_static.cpp: +d/actor/d_a_bomb_static.cpp: .text start:0x8006BD80 end:0x8006C2D4 .text start:0x8006C2D4 end:0x8006C2F0 .rodata start:0x80355FA8 end:0x80355FE0 -d/a/d_a_branch_static.cpp: +d/actor/d_a_branch_static.cpp: .text start:0x8006C2F0 end:0x8006C3D8 .rodata start:0x80355FE0 end:0x80356010 -d/a/d_a_mgameboard_static.cpp: +d/actor/d_a_mgameboard_static.cpp: .text start:0x8006C3D8 end:0x8006C430 -d/a/d_a_itembase_static.cpp: +d/actor/d_a_itembase_static.cpp: .text start:0x8006C430 end:0x8006C600 .rodata start:0x80356010 end:0x80356060 -d/a/d_a_item_static.cpp: +d/actor/d_a_item_static.cpp: .text start:0x8006C600 end:0x8006C7D0 .sdata2 start:0x803FFD60 end:0x803FFD68 -d/a/d_a_shop_item_static.cpp: +d/actor/d_a_shop_item_static.cpp: .text start:0x8006C7D0 end:0x8006C838 .rodata start:0x80356060 end:0x80358140 .sdata2 start:0x803FFD68 end:0x803FFD78 -d/a/d_a_race_item_static.cpp: +d/actor/d_a_race_item_static.cpp: .text start:0x8006C838 end:0x8006CEC4 .data start:0x8037DE48 end:0x8037DF08 .sdata2 start:0x803FFD78 end:0x803FFD80 -d/a/d_a_leaflift_static.cpp: +d/actor/d_a_leaflift_static.cpp: .text start:0x8006CEC4 end:0x8006D0A4 .sdata2 start:0x803FFD80 end:0x803FFDA8 @@ -573,7 +573,7 @@ d/d_event.cpp: .data start:0x8037E2D0 end:0x8037E308 .sdata2 start:0x803FFE68 end:0x803FFE78 -d/event/d_event_data.cpp: +d/d_event_data.cpp: .text start:0x80075558 end:0x800775BC .rodata start:0x80358918 end:0x80358B78 .data start:0x8037E308 end:0x8037E490 @@ -581,7 +581,7 @@ d/event/d_event_data.cpp: .sbss start:0x803FE3E0 end:0x803FE3F0 .sdata2 start:0x803FFE78 end:0x803FFEA0 -d/event/d_event_manager.cpp: +d/d_event_manager.cpp: .text start:0x800775BC end:0x80079384 .rodata start:0x80358B78 end:0x80358D00 .data start:0x8037E490 end:0x8037E4E0 @@ -621,7 +621,7 @@ d/d_tree.cpp: .sbss start:0x803FE408 end:0x803FE410 .sdata2 start:0x80400018 end:0x804000A8 -d/particle/d_particle.cpp: +d/d_particle.cpp: .text start:0x8007E2B8 end:0x80083DEC .ctors start:0x8033DC18 end:0x8033DC1C .rodata start:0x80358DD0 end:0x80358F08 @@ -631,7 +631,7 @@ d/particle/d_particle.cpp: .sdata2 start:0x804000A8 end:0x80400118 .sbss2 start:0x80404790 end:0x80404798 -d/particle/d_particle_name.cpp: +d/d_particle_name.cpp: .text start:0x80083DEC end:0x80083DEC .data start:0x80382310 end:0x80382380 @@ -651,11 +651,11 @@ d/d_drawlist.cpp: .sbss start:0x803FE448 end:0x803FE460 .sdata2 start:0x80400120 end:0x804001F8 -d/kankyo/d_kankyo_data.cpp: +d/d_kankyo_data.cpp: .text start:0x8008ACB4 end:0x8008AD48 .data start:0x80383A08 end:0x80383FC8 -d/kankyo/d_kankyo_wether.cpp: +d/d_kankyo_wether.cpp: .text start:0x8008AD48 end:0x8008E804 .rodata start:0x80358FE0 end:0x803590D8 .data start:0x80383FC8 end:0x803840B8 @@ -663,7 +663,7 @@ d/kankyo/d_kankyo_wether.cpp: .sbss start:0x803FE460 end:0x803FE468 .sdata2 start:0x804001F8 end:0x804002C0 -d/kankyo/d_kankyo_rain.cpp: +d/d_kankyo_rain.cpp: .text start:0x8008E804 end:0x8009FBF0 .text start:0x8009FBF0 end:0x8009FC38 .rodata start:0x803590D8 end:0x80359320 @@ -673,7 +673,7 @@ d/kankyo/d_kankyo_rain.cpp: .sbss start:0x803FE468 end:0x803FE4A8 .sdata2 start:0x804002C0 end:0x80400668 -d/kankyo/d_kankyo_demo.cpp: +d/d_kankyo_demo.cpp: .text start:0x8009FC38 end:0x8009FDA8 .sdata2 start:0x80400668 end:0x80400680 @@ -706,7 +706,7 @@ d/d_att_dist.cpp: .text start:0x800A4044 end:0x800A4044 .data start:0x803841C8 end:0x80385620 -d/bg/d_bg_s.cpp: +d/d_bg_s.cpp: .text start:0x800A4044 end:0x800A6324 .text start:0x800A6324 end:0x800A6324 .text start:0x800A6324 end:0x800A6324 @@ -726,7 +726,7 @@ d/bg/d_bg_s.cpp: .data start:0x80385620 end:0x803856B8 .sdata2 start:0x80400710 end:0x80400730 -d/bg/d_bg_s_acch.cpp: +d/d_bg_s_acch.cpp: .text start:0x800A6350 end:0x800A811C .text start:0x800A811C end:0x800A8178 .text start:0x800A8178 end:0x800A81C0 @@ -752,7 +752,7 @@ d/bg/d_bg_s_acch.cpp: .data start:0x803856B8 end:0x80385730 .sdata2 start:0x80400730 end:0x80400768 -d/bg/d_bg_s_func.cpp: +d/d_bg_s_func.cpp: .text start:0x800A8338 end:0x800A92CC .text start:0x800A92CC end:0x800A9434 .text start:0x800A9434 end:0x800A9434 @@ -768,16 +768,16 @@ d/bg/d_bg_s_func.cpp: .data start:0x80385730 end:0x80385760 .sdata2 start:0x80400768 end:0x80400770 -d/bg/d_bg_s_lin_chk.cpp: +d/d_bg_s_lin_chk.cpp: .text start:0x800A944C end:0x800A948C -d/bg/d_bg_s_movebg_actor.cpp: +d/d_bg_s_movebg_actor.cpp: .text start:0x800A948C end:0x800A9810 .text start:0x800A9810 end:0x800A9850 .data start:0x80385760 end:0x80385788 .sbss start:0x803FE4B0 end:0x803FE4C0 -d/bg/d_bg_s_spl_grp_chk.cpp: +d/d_bg_s_spl_grp_chk.cpp: .text start:0x800A9850 end:0x800A99B0 .text start:0x800A99B0 end:0x800A99B0 .text start:0x800A99B0 end:0x800A99B0 @@ -789,7 +789,7 @@ d/bg/d_bg_s_spl_grp_chk.cpp: .text start:0x800A99B0 end:0x800A99B0 .sdata2 start:0x80400770 end:0x80400778 -d/bg/d_bg_s_wtr_chk.cpp: +d/d_bg_s_wtr_chk.cpp: .text start:0x800A99B0 end:0x800A9A10 .text start:0x800A9A10 end:0x800A9A10 .text start:0x800A9A10 end:0x800A9A10 @@ -800,7 +800,7 @@ d/bg/d_bg_s_wtr_chk.cpp: .text start:0x800A9A10 end:0x800A9A10 .text start:0x800A9A10 end:0x800A9A10 -d/bg/d_bg_w.cpp: +d/d_bg_w.cpp: .text start:0x800A9A10 end:0x800AD640 .text start:0x800AD640 end:0x800AD69C .text start:0x800AD69C end:0x800AD69C @@ -810,11 +810,11 @@ d/bg/d_bg_w.cpp: .data start:0x80385788 end:0x803857C8 .sdata2 start:0x80400778 end:0x804007A8 -d/bg/d_bg_w_deform.cpp: +d/d_bg_w_deform.cpp: .text start:0x800AD6FC end:0x800AD81C .rodata start:0x80359E30 end:0x80359E88 -d/bg/d_bg_w_hf.cpp: +d/d_bg_w_hf.cpp: .text start:0x800AD81C end:0x800AE94C .text start:0x800AE94C end:0x800AE9CC .text start:0x800AE9CC end:0x800AE9D0 @@ -822,14 +822,14 @@ d/bg/d_bg_w_hf.cpp: .data start:0x803857C8 end:0x803857F8 .sdata2 start:0x804007A8 end:0x804007B8 -d/bg/d_bg_w_sv.cpp: +d/d_bg_w_sv.cpp: .text start:0x800AE9D0 end:0x800AF010 .text start:0x800AF010 end:0x800AF010 .text start:0x800AF010 end:0x800AF080 .data start:0x803857F8 end:0x80385828 .sdata2 start:0x804007B8 end:0x804007C0 -d/cc/d_cc_d.cpp: +d/d_cc_d.cpp: .text start:0x800AF080 end:0x800AFEBC .text start:0x800AFEBC end:0x800B0368 .text start:0x800B0368 end:0x800B05E4 @@ -837,7 +837,7 @@ d/cc/d_cc_d.cpp: .rodata start:0x8035A2D8 end:0x8035A2F8 .data start:0x80385828 end:0x80385948 -d/cc/d_cc_mass_s.cpp: +d/d_cc_mass_s.cpp: .text start:0x800B05E4 end:0x800B11CC .text start:0x800B11CC end:0x800B1368 .text start:0x800B1368 end:0x800B1368 @@ -849,7 +849,7 @@ d/cc/d_cc_mass_s.cpp: .rodata start:0x8035A2F8 end:0x8035A328 .sdata2 start:0x804007C0 end:0x804007D8 -d/cc/d_cc_s.cpp: +d/d_cc_s.cpp: .text start:0x800B1384 end:0x800B2670 .text start:0x800B2670 end:0x800B2670 .text start:0x800B2670 end:0x800B2670 @@ -864,7 +864,7 @@ d/cc/d_cc_s.cpp: .data start:0x80385948 end:0x803859F8 .sdata2 start:0x804007D8 end:0x80400800 -d/cc/d_cc_uty.cpp: +d/d_cc_uty.cpp: .text start:0x800B270C end:0x800B313C .text start:0x800B313C end:0x800B3158 .sdata2 start:0x80400800 end:0x80400828 @@ -935,7 +935,7 @@ d/d_spline_path.cpp: .text start:0x800C64A8 end:0x800C64A8 .sdata2 start:0x80400C88 end:0x80400C98 -d/s/d_s_actor_data_mng.cpp: +d/d_s_actor_data_mng.cpp: .text start:0x800C64A8 end:0x800C6BD0 .rodata start:0x80360D68 end:0x80360E80 .data start:0x8038F598 end:0x8038F5A8 @@ -952,11 +952,11 @@ d/d_2dnumber.cpp: .data start:0x8038FDA8 end:0x8038FE18 .sdata2 start:0x80400CB0 end:0x80400D30 -d/a/d_a_npc_cb1_static.cpp: +d/actor/d_a_npc_cb1_static.cpp: .text start:0x800CF264 end:0x800CF26C .sbss start:0x803FE660 end:0x803FE668 -d/a/d_a_npc_mk_static.cpp: +d/actor/d_a_npc_mk_static.cpp: .text start:0x800CF26C end:0x800D03D4 .sdata2 start:0x80400D30 end:0x80400D88 @@ -983,7 +983,7 @@ d/d_point_wind.cpp: .rodata start:0x80361AE8 end:0x80361AF0 .sdata2 start:0x80400DF8 end:0x80400E28 -d/a/d_a_agb.cpp: +d/actor/d_a_agb.cpp: .text start:0x800D328C end:0x800D8294 .text start:0x800D8294 end:0x800D829C .ctors start:0x8033DC30 end:0x8033DC34 @@ -993,7 +993,7 @@ d/a/d_a_agb.cpp: .sbss start:0x803FE668 end:0x803FE690 .sdata2 start:0x80400E28 end:0x80400EE8 -d/a/d_a_arrow.cpp: +d/actor/d_a_arrow.cpp: .text start:0x800D829C end:0x800DC174 .rodata start:0x80361BA8 end:0x80361CB0 .data start:0x80390570 end:0x80390970 @@ -1001,14 +1001,14 @@ d/a/d_a_arrow.cpp: .sbss start:0x803FE690 end:0x803FE698 .sdata2 start:0x80400EE8 end:0x80400FB0 -d/a/d_a_bg.cpp: +d/actor/d_a_bg.cpp: .text start:0x800DC174 end:0x800DD058 .rodata start:0x80361CB0 end:0x80361CE8 .data start:0x80390970 end:0x80390A98 .bss start:0x803EAF90 end:0x803EAFB0 .sdata2 start:0x80400FB0 end:0x80400FC8 -d/a/d_a_bomb.cpp: +d/actor/d_a_bomb.cpp: .text start:0x800DD058 end:0x800DD058 .text start:0x800DD058 end:0x800E0EE4 .text start:0x800E0EE4 end:0x800E0EE4 @@ -1020,7 +1020,7 @@ d/a/d_a_bomb.cpp: .sdata2 start:0x80400FC8 end:0x804010B8 .sbss2 start:0x80404798 end:0x804047A0 -d/a/d_a_bomb2.cpp: +d/actor/d_a_bomb2.cpp: .text start:0x800E10BC end:0x800E4854 .text start:0x800E4854 end:0x800E492C .text start:0x800E492C end:0x800E492C @@ -1032,7 +1032,7 @@ d/a/d_a_bomb2.cpp: .sdata2 start:0x804010B8 end:0x80401168 .sbss2 start:0x804047A0 end:0x804047A8 -d/a/d_a_boomerang.cpp: +d/actor/d_a_boomerang.cpp: .text start:0x800E4948 end:0x800E71E4 .text start:0x800E71E4 end:0x800E71EC .text start:0x800E71EC end:0x800E7250 @@ -1045,7 +1045,7 @@ d/a/d_a_boomerang.cpp: .sbss start:0x803FE6A8 end:0x803FE6B0 .sdata2 start:0x80401168 end:0x80401208 -d/a/d_a_dai_item.cpp: +d/actor/d_a_dai_item.cpp: .text start:0x800E7378 end:0x800E969C .ctors start:0x8033DC38 end:0x8033DC3C .rodata start:0x80361EC8 end:0x80362018 @@ -1055,18 +1055,18 @@ d/a/d_a_dai_item.cpp: .sbss start:0x803FE6B0 end:0x803FE6B8 .sdata2 start:0x80401208 end:0x80401278 -d/a/d_a_demo00.cpp: +d/actor/d_a_demo00.cpp: .text start:0x800E969C end:0x800EB700 .rodata start:0x80362018 end:0x80362130 .data start:0x80391CF8 end:0x80391DA0 .sdata2 start:0x80401278 end:0x804012C0 -d/a/d_a_disappear.cpp: +d/actor/d_a_disappear.cpp: .text start:0x800EB700 end:0x800EBBA0 .data start:0x80391DA0 end:0x80391E38 .sdata2 start:0x804012C0 end:0x804012D8 -d/a/d_a_esa.cpp: +d/actor/d_a_esa.cpp: .text start:0x800EBBA0 end:0x800EC9E4 .text start:0x800EC9E4 end:0x800ECA00 .rodata start:0x80362130 end:0x80362160 @@ -1075,7 +1075,7 @@ d/a/d_a_esa.cpp: .sbss start:0x803FE6B8 end:0x803FE6C0 .sdata2 start:0x804012D8 end:0x80401350 -d/a/d_a_grid.cpp: +d/actor/d_a_grid.cpp: .text start:0x800ECA00 end:0x800EF260 .text start:0x800EF260 end:0x800EF318 .text start:0x800EF318 end:0x800EF34C @@ -1086,7 +1086,7 @@ d/a/d_a_grid.cpp: .sbss start:0x803FE6C0 end:0x803FE6C8 .sdata2 start:0x80401350 end:0x80401450 -d/a/d_a_himo2.cpp: +d/actor/d_a_himo2.cpp: .text start:0x800EF34C end:0x800F4920 .text start:0x800F4920 end:0x800F4994 .text start:0x800F4994 end:0x800F4A0C @@ -1099,7 +1099,7 @@ d/a/d_a_himo2.cpp: .sbss start:0x803FE6C8 end:0x803FE6D8 .sdata2 start:0x80401450 end:0x804015F8 -d/a/d_a_hookshot.cpp: +d/actor/d_a_hookshot.cpp: .text start:0x800F4D8C end:0x800F6ED8 .text start:0x800F6ED8 end:0x800F6F0C .text start:0x800F6F0C end:0x800F6F68 @@ -1108,14 +1108,14 @@ d/a/d_a_hookshot.cpp: .data start:0x80392A00 end:0x803931E0 .sdata2 start:0x804015F8 end:0x80401650 -d/a/d_a_ib.cpp: +d/actor/d_a_ib.cpp: .text start:0x800F6F68 end:0x800F8908 .rodata start:0x803621C0 end:0x80362250 .data start:0x803931E0 end:0x80393580 .sbss start:0x803FE6D8 end:0x803FE6E0 .sdata2 start:0x80401650 end:0x804016A8 -d/a/d_a_item.cpp: +d/actor/d_a_item.cpp: .text start:0x800F8908 end:0x800FC738 .text start:0x800FC738 end:0x800FC754 .rodata start:0x80362250 end:0x80362260 @@ -1124,13 +1124,13 @@ d/a/d_a_item.cpp: .sbss start:0x803FE6E0 end:0x803FE6E8 .sdata2 start:0x804016A8 end:0x80401720 -d/a/d_a_itembase.cpp: +d/actor/d_a_itembase.cpp: .text start:0x800FC754 end:0x800FD2F8 .rodata start:0x80362260 end:0x803622C8 .data start:0x80393E00 end:0x80393E28 .sdata2 start:0x80401720 end:0x80401740 -d/a/d_a_nh.cpp: +d/actor/d_a_nh.cpp: .text start:0x800FD2F8 end:0x800FED00 .ctors start:0x8033DC48 end:0x8033DC4C .rodata start:0x803622C8 end:0x80362340 @@ -1139,7 +1139,7 @@ d/a/d_a_nh.cpp: .sbss start:0x803FE6E8 end:0x803FE6F0 .sdata2 start:0x80401740 end:0x80401780 -d/a/d_a_npc_fa1.cpp: +d/actor/d_a_npc_fa1.cpp: .text start:0x800FED00 end:0x80101828 .text start:0x80101828 end:0x8010183C .ctors start:0x8033DC4C end:0x8033DC50 @@ -1149,7 +1149,7 @@ d/a/d_a_npc_fa1.cpp: .sbss start:0x803FE6F0 end:0x803FE700 .sdata2 start:0x80401780 end:0x804017E8 -d/a/d_a_obj_search.cpp: +d/actor/d_a_obj_search.cpp: .text start:0x8010183C end:0x8010663C .text start:0x8010663C end:0x8010663C .rodata start:0x803623D8 end:0x80362558 @@ -1160,7 +1160,7 @@ d/a/d_a_obj_search.cpp: .sdata2 start:0x804017E8 end:0x804018E0 .sbss2 start:0x804047A8 end:0x804047B0 -d/a/d_a_player.cpp: +d/actor/d_a_player.cpp: .text start:0x8010663C end:0x80106B58 .text start:0x80106B58 end:0x80106B58 .text start:0x80106B58 end:0x80106BCC @@ -1168,7 +1168,7 @@ d/a/d_a_player.cpp: .data start:0x80394930 end:0x80394960 .sdata2 start:0x804018E0 end:0x80401908 -d/a/d_a_player_main.cpp: +d/actor/d_a_player_main.cpp: .text start:0x80106BCC end:0x8012CD5C .text start:0x8012CD5C end:0x80130AA0 .text start:0x80130AA0 end:0x80136C74 @@ -1207,14 +1207,14 @@ d/a/d_a_player_main.cpp: .sdata2 start:0x80401908 end:0x80401DE0 .sbss2 start:0x804047B0 end:0x804047B8 -d/a/d_a_player_npc.cpp: +d/actor/d_a_player_npc.cpp: .text start:0x8015E0F0 end:0x8015EE18 .rodata start:0x803647E8 end:0x80364888 .bss start:0x803EC048 end:0x803EC060 .sbss start:0x803FE758 end:0x803FE760 .sdata2 start:0x80401DE0 end:0x80401E10 -d/a/d_a_sea.cpp: +d/actor/d_a_sea.cpp: .text start:0x8015EE18 end:0x80161710 .text start:0x80161710 end:0x80161820 .text start:0x80161820 end:0x80161868 @@ -1225,18 +1225,18 @@ d/a/d_a_sea.cpp: .sdata start:0x803FDAC0 end:0x803FDAC8 .sdata2 start:0x80401E10 end:0x80401EA0 -d/a/d_a_spc_item01.cpp: +d/actor/d_a_spc_item01.cpp: .text start:0x80161868 end:0x80162164 .data start:0x80397468 end:0x80397520 .sdata2 start:0x80401EA0 end:0x80401ED0 -d/a/d_a_vrbox.cpp: +d/actor/d_a_vrbox.cpp: .text start:0x80162164 end:0x80162788 .rodata start:0x803648C0 end:0x80364910 .data start:0x80397520 end:0x80397570 .sdata2 start:0x80401ED0 end:0x80401ED8 -d/a/d_a_vrbox2.cpp: +d/actor/d_a_vrbox2.cpp: .text start:0x80162788 end:0x801632C4 .rodata start:0x80364910 end:0x803649A0 .data start:0x80397570 end:0x803975C0 @@ -1282,7 +1282,7 @@ d/d_envse.cpp: .sdata2 start:0x804021C8 end:0x804021D0 .sbss2 start:0x804047B8 end:0x804047C0 -d/file/d_file_error.cpp: +d/d_file_error.cpp: .text start:0x801818C0 end:0x80183528 .text start:0x80183528 end:0x8018375C .ctors start:0x8033DC60 end:0x8033DC64 @@ -1293,7 +1293,7 @@ d/file/d_file_error.cpp: .sbss start:0x803FE7B0 end:0x803FE7B8 .sdata2 start:0x804021D0 end:0x80402248 -d/file/d_file_select.cpp: +d/d_file_select.cpp: .text start:0x8018375C end:0x8019420C .text start:0x8019420C end:0x801946F0 .ctors start:0x8033DC64 end:0x8033DC68 @@ -1312,7 +1312,7 @@ d/d_gameover.cpp: .sdata start:0x803FDAE0 end:0x803FDAE8 .sdata2 start:0x804022C8 end:0x80402318 -d/kankyo/d_kankyo.cpp: +d/d_kankyo.cpp: .text start:0x80195D20 end:0x8019DFDC .text start:0x8019DFDC end:0x8019E508 .ctors start:0x8033DC68 end:0x8033DC6C @@ -1350,7 +1350,7 @@ d/d_level_se.cpp: .data start:0x80398A78 end:0x80398AC0 .sdata2 start:0x804024D0 end:0x804024D8 -d/menu/d_menu_cloth.cpp: +d/d_menu_cloth.cpp: .text start:0x8019F930 end:0x801A23B0 .ctors start:0x8033DC6C end:0x8033DC70 .rodata start:0x80365558 end:0x80365598 @@ -1360,7 +1360,7 @@ d/menu/d_menu_cloth.cpp: .sdata2 start:0x804024D8 end:0x804025A8 .sbss2 start:0x804047C0 end:0x804047C8 -d/menu/d_menu_collect.cpp: +d/d_menu_collect.cpp: .text start:0x801A23B0 end:0x801AEB08 .text start:0x801AEB08 end:0x801AEB08 .text start:0x801AEB08 end:0x801AEB50 @@ -1371,7 +1371,7 @@ d/menu/d_menu_collect.cpp: .bss start:0x803ED910 end:0x803ED980 .sdata2 start:0x804025A8 end:0x80402650 -d/menu/d_menu_dmap.cpp: +d/d_menu_dmap.cpp: .text start:0x801AECF8 end:0x801B5A74 .text start:0x801B5A74 end:0x801B5A74 .text start:0x801B5A74 end:0x801B5BAC @@ -1381,7 +1381,7 @@ d/menu/d_menu_dmap.cpp: .bss start:0x803ED980 end:0x803ED9D8 .sdata2 start:0x80402650 end:0x804026C8 -d/menu/d_menu_fmap.cpp: +d/d_menu_fmap.cpp: .text start:0x801B5BAC end:0x801C1944 .text start:0x801C1944 end:0x801C1CA0 .ctors start:0x8033DC78 end:0x8033DC7C @@ -1391,7 +1391,7 @@ d/menu/d_menu_fmap.cpp: .sdata start:0x803FDB10 end:0x803FDB18 .sdata2 start:0x804026C8 end:0x80402798 -d/menu/d_menu_fmap2.cpp: +d/d_menu_fmap2.cpp: .text start:0x801C1CA0 end:0x801CE310 .text start:0x801CE310 end:0x801CE310 .text start:0x801CE310 end:0x801CE550 @@ -1402,7 +1402,7 @@ d/menu/d_menu_fmap2.cpp: .sdata start:0x803FDB18 end:0x803FDB20 .sdata2 start:0x80402798 end:0x80402840 -d/menu/d_menu_item.cpp: +d/d_menu_item.cpp: .text start:0x801CE550 end:0x801D9564 .text start:0x801D9564 end:0x801D9564 .text start:0x801D9564 end:0x801D9680 @@ -1412,7 +1412,7 @@ d/menu/d_menu_item.cpp: .bss start:0x803EDBB0 end:0x803EDC20 .sdata2 start:0x80402840 end:0x804028A0 -d/menu/d_menu_option.cpp: +d/d_menu_option.cpp: .text start:0x801D9680 end:0x801DC850 .text start:0x801DC850 end:0x801DC8D0 .ctors start:0x8033DC84 end:0x8033DC88 @@ -1422,7 +1422,7 @@ d/menu/d_menu_option.cpp: .sbss start:0x803FE7D8 end:0x803FE7E0 .sdata2 start:0x804028A0 end:0x80402900 -d/menu/d_menu_save.cpp: +d/d_menu_save.cpp: .text start:0x801DC8D0 end:0x801E1C20 .text start:0x801E1C20 end:0x801E1C94 .text start:0x801E1C94 end:0x801E20D4 @@ -1432,7 +1432,7 @@ d/menu/d_menu_save.cpp: .bss start:0x803EDC30 end:0x803EDC70 .sdata2 start:0x80402900 end:0x80402960 -d/menu/d_menu_window.cpp: +d/d_menu_window.cpp: .text start:0x801E20D4 end:0x801E6574 .text start:0x801E6574 end:0x801E6A18 .text start:0x801E6A18 end:0x801E6A18 @@ -1460,7 +1460,7 @@ d/d_mesg.cpp: .sbss start:0x803FE818 end:0x803FE860 .sdata2 start:0x80402978 end:0x80402A00 -d/message/d_message.cpp: +d/d_message.cpp: .text start:0x801EE1AC end:0x801F1FB0 .ctors start:0x8033DC90 end:0x8033DC94 .rodata start:0x803671F0 end:0x80367370 @@ -1470,7 +1470,7 @@ d/message/d_message.cpp: .sdata2 start:0x80402A00 end:0x80402A88 .sbss2 start:0x804047C8 end:0x804047D0 -d/message/d_message_paper.cpp: +d/d_message_paper.cpp: .text start:0x801F1FB0 end:0x801F2294 .rodata start:0x80367370 end:0x80367398 .data start:0x80399F90 end:0x80399FD0 @@ -1490,7 +1490,7 @@ d/d_meter.cpp: .sdata2 start:0x80402A88 end:0x80402C18 .sbss2 start:0x804047D0 end:0x804047D8 -d/minigame/d_minigame_starter.cpp: +d/d_minigame_starter.cpp: .text start:0x802092B0 end:0x8020A308 .text start:0x8020A308 end:0x8020A364 .rodata start:0x80367D38 end:0x80367D78 @@ -1498,7 +1498,7 @@ d/minigame/d_minigame_starter.cpp: .sdata start:0x803FDB50 end:0x803FDB68 .sdata2 start:0x80402C18 end:0x80402C78 -d/minigame/d_minigame_terminater.cpp: +d/d_minigame_terminater.cpp: .text start:0x8020A364 end:0x8020E4F8 .text start:0x8020E4F8 end:0x8020E554 .rodata start:0x80367D78 end:0x803687B0 @@ -1553,22 +1553,22 @@ d/d_metronome.cpp: .bss start:0x803EE7F0 end:0x803EE820 .sdata2 start:0x80402EE8 end:0x80402F38 -d/ovlp/d_ovlp_fade.cpp: +d/d_ovlp_fade.cpp: .text start:0x802275E8 end:0x80227810 .data start:0x8039A9F8 end:0x8039AAD8 .sbss start:0x803FEA18 end:0x803FEA20 -d/ovlp/d_ovlp_fade2.cpp: +d/d_ovlp_fade2.cpp: .text start:0x80227810 end:0x802282A0 .text start:0x802282A0 end:0x80228358 .data start:0x8039AAD8 end:0x8039AB80 .sdata2 start:0x80402F38 end:0x80402F80 -d/ovlp/d_ovlp_fade3.cpp: +d/d_ovlp_fade3.cpp: .text start:0x80228358 end:0x802283AC .data start:0x8039AB80 end:0x8039AB90 -d/ovlp/d_ovlp_fade4.cpp: +d/d_ovlp_fade4.cpp: .text start:0x802283AC end:0x802296DC .text start:0x802296DC end:0x802298E4 .rodata start:0x80368FC8 end:0x80368FF0 @@ -1585,7 +1585,7 @@ d/d_picture_box.cpp: .sbss start:0x803FEA20 end:0x803FEA28 .sdata2 start:0x80402FE0 end:0x80403068 -d/s/d_s_logo.cpp: +d/d_s_logo.cpp: .text start:0x802301B0 end:0x80232BF8 .rodata start:0x80369330 end:0x80369730 .data start:0x8039AD00 end:0x8039AD78 @@ -1593,7 +1593,7 @@ d/s/d_s_logo.cpp: .sdata2 start:0x80403068 end:0x804030D8 .sbss2 start:0x804047E0 end:0x804047F0 -d/s/d_s_menu.cpp: +d/d_s_menu.cpp: .text start:0x80232BF8 end:0x80233C74 .rodata start:0x80369730 end:0x803699B0 .data start:0x8039AD78 end:0x8039AE18 @@ -1601,7 +1601,7 @@ d/s/d_s_menu.cpp: .sbss start:0x803FEAA0 end:0x803FEAC0 .sdata2 start:0x804030D8 end:0x80403128 -d/s/d_s_name.cpp: +d/d_s_name.cpp: .text start:0x80233C74 end:0x802375A0 .text start:0x802375A0 end:0x802375A0 .text start:0x802375A0 end:0x802375A0 @@ -1616,19 +1616,19 @@ d/s/d_s_name.cpp: .sdata2 start:0x80403128 end:0x80403178 .sbss2 start:0x804047F0 end:0x804047F8 -d/s/d_s_open.cpp: +d/d_s_open.cpp: .text start:0x80237AF0 end:0x80237F84 .rodata start:0x80369C20 end:0x80369C68 .data start:0x8039B358 end:0x8039B3C0 -d/s/d_s_open_sub.cpp: +d/d_s_open_sub.cpp: .text start:0x80237F84 end:0x802395D8 .text start:0x802395D8 end:0x802395F8 .rodata start:0x80369C68 end:0x80369CE8 .data start:0x8039B3C0 end:0x8039B4A8 .sdata2 start:0x80403178 end:0x804031C0 -d/s/d_s_play.cpp: +d/d_s_play.cpp: .text start:0x802395F8 end:0x8023B9C0 .ctors start:0x8033DCAC end:0x8033DCB0 .rodata start:0x80369CE8 end:0x8036A440 @@ -1638,13 +1638,13 @@ d/s/d_s_play.cpp: .sbss start:0x803FEAC8 end:0x803FEAF0 .sdata2 start:0x804031C0 end:0x80403200 -d/s/d_s_room.cpp: +d/d_s_room.cpp: .text start:0x8023B9C0 end:0x8023C37C .rodata start:0x8036A440 end:0x8036A4E0 .data start:0x8039B9A0 end:0x8039B9F0 .bss start:0x803EF7E8 end:0x803EF808 -d/s/d_s_title.cpp: +d/d_s_title.cpp: .text start:0x8023C37C end:0x8023C654 .rodata start:0x8036A4E0 end:0x8036A4F8 .data start:0x8039B9F0 end:0x8039BA58 diff --git a/src/d/a/d_a_acorn_leaf.cpp b/src/d/actor/d_a_acorn_leaf.cpp similarity index 100% rename from src/d/a/d_a_acorn_leaf.cpp rename to src/d/actor/d_a_acorn_leaf.cpp diff --git a/src/d/a/d_a_agb.cpp b/src/d/actor/d_a_agb.cpp similarity index 100% rename from src/d/a/d_a_agb.cpp rename to src/d/actor/d_a_agb.cpp diff --git a/src/d/a/d_a_agbsw0.cpp b/src/d/actor/d_a_agbsw0.cpp similarity index 100% rename from src/d/a/d_a_agbsw0.cpp rename to src/d/actor/d_a_agbsw0.cpp diff --git a/src/d/a/d_a_alldie.cpp b/src/d/actor/d_a_alldie.cpp similarity index 100% rename from src/d/a/d_a_alldie.cpp rename to src/d/actor/d_a_alldie.cpp diff --git a/src/d/a/d_a_am.cpp b/src/d/actor/d_a_am.cpp similarity index 100% rename from src/d/a/d_a_am.cpp rename to src/d/actor/d_a_am.cpp diff --git a/src/d/a/d_a_am2.cpp b/src/d/actor/d_a_am2.cpp similarity index 100% rename from src/d/a/d_a_am2.cpp rename to src/d/actor/d_a_am2.cpp diff --git a/src/d/a/d_a_amiprop.cpp b/src/d/actor/d_a_amiprop.cpp similarity index 100% rename from src/d/a/d_a_amiprop.cpp rename to src/d/actor/d_a_amiprop.cpp diff --git a/src/d/a/d_a_andsw0.cpp b/src/d/actor/d_a_andsw0.cpp similarity index 100% rename from src/d/a/d_a_andsw0.cpp rename to src/d/actor/d_a_andsw0.cpp diff --git a/src/d/a/d_a_andsw2.cpp b/src/d/actor/d_a_andsw2.cpp similarity index 100% rename from src/d/a/d_a_andsw2.cpp rename to src/d/actor/d_a_andsw2.cpp diff --git a/src/d/a/d_a_arrow.cpp b/src/d/actor/d_a_arrow.cpp similarity index 100% rename from src/d/a/d_a_arrow.cpp rename to src/d/actor/d_a_arrow.cpp diff --git a/src/d/a/d_a_arrow_iceeff.cpp b/src/d/actor/d_a_arrow_iceeff.cpp similarity index 100% rename from src/d/a/d_a_arrow_iceeff.cpp rename to src/d/actor/d_a_arrow_iceeff.cpp diff --git a/src/d/a/d_a_arrow_lighteff.cpp b/src/d/actor/d_a_arrow_lighteff.cpp similarity index 100% rename from src/d/a/d_a_arrow_lighteff.cpp rename to src/d/actor/d_a_arrow_lighteff.cpp diff --git a/src/d/a/d_a_atdoor.cpp b/src/d/actor/d_a_atdoor.cpp similarity index 100% rename from src/d/a/d_a_atdoor.cpp rename to src/d/actor/d_a_atdoor.cpp diff --git a/src/d/a/d_a_att.cpp b/src/d/actor/d_a_att.cpp similarity index 100% rename from src/d/a/d_a_att.cpp rename to src/d/actor/d_a_att.cpp diff --git a/src/d/a/d_a_auction.cpp b/src/d/actor/d_a_auction.cpp similarity index 100% rename from src/d/a/d_a_auction.cpp rename to src/d/actor/d_a_auction.cpp diff --git a/src/d/a/d_a_bb.cpp b/src/d/actor/d_a_bb.cpp similarity index 100% rename from src/d/a/d_a_bb.cpp rename to src/d/actor/d_a_bb.cpp diff --git a/src/d/a/d_a_bdk.cpp b/src/d/actor/d_a_bdk.cpp similarity index 100% rename from src/d/a/d_a_bdk.cpp rename to src/d/actor/d_a_bdk.cpp diff --git a/src/d/a/d_a_bdkobj.cpp b/src/d/actor/d_a_bdkobj.cpp similarity index 100% rename from src/d/a/d_a_bdkobj.cpp rename to src/d/actor/d_a_bdkobj.cpp diff --git a/src/d/a/d_a_beam.cpp b/src/d/actor/d_a_beam.cpp similarity index 100% rename from src/d/a/d_a_beam.cpp rename to src/d/actor/d_a_beam.cpp diff --git a/src/d/a/d_a_bflower.cpp b/src/d/actor/d_a_bflower.cpp similarity index 100% rename from src/d/a/d_a_bflower.cpp rename to src/d/actor/d_a_bflower.cpp diff --git a/src/d/a/d_a_bg.cpp b/src/d/actor/d_a_bg.cpp similarity index 100% rename from src/d/a/d_a_bg.cpp rename to src/d/actor/d_a_bg.cpp diff --git a/src/d/a/d_a_bgn.cpp b/src/d/actor/d_a_bgn.cpp similarity index 100% rename from src/d/a/d_a_bgn.cpp rename to src/d/actor/d_a_bgn.cpp diff --git a/src/d/a/d_a_bgn2.cpp b/src/d/actor/d_a_bgn2.cpp similarity index 100% rename from src/d/a/d_a_bgn2.cpp rename to src/d/actor/d_a_bgn2.cpp diff --git a/src/d/a/d_a_bgn3.cpp b/src/d/actor/d_a_bgn3.cpp similarity index 100% rename from src/d/a/d_a_bgn3.cpp rename to src/d/actor/d_a_bgn3.cpp diff --git a/src/d/a/d_a_bigelf.cpp b/src/d/actor/d_a_bigelf.cpp similarity index 100% rename from src/d/a/d_a_bigelf.cpp rename to src/d/actor/d_a_bigelf.cpp diff --git a/src/d/a/d_a_bita.cpp b/src/d/actor/d_a_bita.cpp similarity index 100% rename from src/d/a/d_a_bita.cpp rename to src/d/actor/d_a_bita.cpp diff --git a/src/d/a/d_a_bk.cpp b/src/d/actor/d_a_bk.cpp similarity index 100% rename from src/d/a/d_a_bk.cpp rename to src/d/actor/d_a_bk.cpp diff --git a/src/d/a/d_a_bl.cpp b/src/d/actor/d_a_bl.cpp similarity index 100% rename from src/d/a/d_a_bl.cpp rename to src/d/actor/d_a_bl.cpp diff --git a/src/d/a/d_a_bmd.cpp b/src/d/actor/d_a_bmd.cpp similarity index 100% rename from src/d/a/d_a_bmd.cpp rename to src/d/actor/d_a_bmd.cpp diff --git a/src/d/a/d_a_bmdfoot.cpp b/src/d/actor/d_a_bmdfoot.cpp similarity index 100% rename from src/d/a/d_a_bmdfoot.cpp rename to src/d/actor/d_a_bmdfoot.cpp diff --git a/src/d/a/d_a_bmdhand.cpp b/src/d/actor/d_a_bmdhand.cpp similarity index 100% rename from src/d/a/d_a_bmdhand.cpp rename to src/d/actor/d_a_bmdhand.cpp diff --git a/src/d/a/d_a_bo.cpp b/src/d/actor/d_a_bo.cpp similarity index 100% rename from src/d/a/d_a_bo.cpp rename to src/d/actor/d_a_bo.cpp diff --git a/src/d/a/d_a_boko.cpp b/src/d/actor/d_a_boko.cpp similarity index 100% rename from src/d/a/d_a_boko.cpp rename to src/d/actor/d_a_boko.cpp diff --git a/src/d/a/d_a_boko_static.cpp b/src/d/actor/d_a_boko_static.cpp similarity index 100% rename from src/d/a/d_a_boko_static.cpp rename to src/d/actor/d_a_boko_static.cpp diff --git a/src/d/a/d_a_bomb.cpp b/src/d/actor/d_a_bomb.cpp similarity index 100% rename from src/d/a/d_a_bomb.cpp rename to src/d/actor/d_a_bomb.cpp diff --git a/src/d/a/d_a_bomb2.cpp b/src/d/actor/d_a_bomb2.cpp similarity index 100% rename from src/d/a/d_a_bomb2.cpp rename to src/d/actor/d_a_bomb2.cpp diff --git a/src/d/a/d_a_bomb_static.cpp b/src/d/actor/d_a_bomb_static.cpp similarity index 100% rename from src/d/a/d_a_bomb_static.cpp rename to src/d/actor/d_a_bomb_static.cpp diff --git a/src/d/a/d_a_boomerang.cpp b/src/d/actor/d_a_boomerang.cpp similarity index 100% rename from src/d/a/d_a_boomerang.cpp rename to src/d/actor/d_a_boomerang.cpp diff --git a/src/d/a/d_a_boss_item.cpp b/src/d/actor/d_a_boss_item.cpp similarity index 100% rename from src/d/a/d_a_boss_item.cpp rename to src/d/actor/d_a_boss_item.cpp diff --git a/src/d/a/d_a_bpw.cpp b/src/d/actor/d_a_bpw.cpp similarity index 100% rename from src/d/a/d_a_bpw.cpp rename to src/d/actor/d_a_bpw.cpp diff --git a/src/d/a/d_a_branch.cpp b/src/d/actor/d_a_branch.cpp similarity index 100% rename from src/d/a/d_a_branch.cpp rename to src/d/actor/d_a_branch.cpp diff --git a/src/d/a/d_a_branch_static.cpp b/src/d/actor/d_a_branch_static.cpp similarity index 100% rename from src/d/a/d_a_branch_static.cpp rename to src/d/actor/d_a_branch_static.cpp diff --git a/src/d/a/d_a_bridge.cpp b/src/d/actor/d_a_bridge.cpp similarity index 100% rename from src/d/a/d_a_bridge.cpp rename to src/d/actor/d_a_bridge.cpp diff --git a/src/d/a/d_a_bst.cpp b/src/d/actor/d_a_bst.cpp similarity index 100% rename from src/d/a/d_a_bst.cpp rename to src/d/actor/d_a_bst.cpp diff --git a/src/d/a/d_a_btd.cpp b/src/d/actor/d_a_btd.cpp similarity index 100% rename from src/d/a/d_a_btd.cpp rename to src/d/actor/d_a_btd.cpp diff --git a/src/d/a/d_a_bwd.cpp b/src/d/actor/d_a_bwd.cpp similarity index 100% rename from src/d/a/d_a_bwd.cpp rename to src/d/actor/d_a_bwd.cpp diff --git a/src/d/a/d_a_bwdg.cpp b/src/d/actor/d_a_bwdg.cpp similarity index 100% rename from src/d/a/d_a_bwdg.cpp rename to src/d/actor/d_a_bwdg.cpp diff --git a/src/d/a/d_a_bwds.cpp b/src/d/actor/d_a_bwds.cpp similarity index 100% rename from src/d/a/d_a_bwds.cpp rename to src/d/actor/d_a_bwds.cpp diff --git a/src/d/a/d_a_canon.cpp b/src/d/actor/d_a_canon.cpp similarity index 100% rename from src/d/a/d_a_canon.cpp rename to src/d/actor/d_a_canon.cpp diff --git a/src/d/a/d_a_cc.cpp b/src/d/actor/d_a_cc.cpp similarity index 100% rename from src/d/a/d_a_cc.cpp rename to src/d/actor/d_a_cc.cpp diff --git a/src/d/a/d_a_coming2.cpp b/src/d/actor/d_a_coming2.cpp similarity index 100% rename from src/d/a/d_a_coming2.cpp rename to src/d/actor/d_a_coming2.cpp diff --git a/src/d/a/d_a_coming3.cpp b/src/d/actor/d_a_coming3.cpp similarity index 100% rename from src/d/a/d_a_coming3.cpp rename to src/d/actor/d_a_coming3.cpp diff --git a/src/d/a/d_a_dai.cpp b/src/d/actor/d_a_dai.cpp similarity index 100% rename from src/d/a/d_a_dai.cpp rename to src/d/actor/d_a_dai.cpp diff --git a/src/d/a/d_a_dai_item.cpp b/src/d/actor/d_a_dai_item.cpp similarity index 100% rename from src/d/a/d_a_dai_item.cpp rename to src/d/actor/d_a_dai_item.cpp diff --git a/src/d/a/d_a_daiocta.cpp b/src/d/actor/d_a_daiocta.cpp similarity index 100% rename from src/d/a/d_a_daiocta.cpp rename to src/d/actor/d_a_daiocta.cpp diff --git a/src/d/a/d_a_daiocta_eye.cpp b/src/d/actor/d_a_daiocta_eye.cpp similarity index 100% rename from src/d/a/d_a_daiocta_eye.cpp rename to src/d/actor/d_a_daiocta_eye.cpp diff --git a/src/d/a/d_a_deku_item.cpp b/src/d/actor/d_a_deku_item.cpp similarity index 100% rename from src/d/a/d_a_deku_item.cpp rename to src/d/actor/d_a_deku_item.cpp diff --git a/src/d/a/d_a_demo00.cpp b/src/d/actor/d_a_demo00.cpp similarity index 100% rename from src/d/a/d_a_demo00.cpp rename to src/d/actor/d_a_demo00.cpp diff --git a/src/d/a/d_a_demo_dk.cpp b/src/d/actor/d_a_demo_dk.cpp similarity index 100% rename from src/d/a/d_a_demo_dk.cpp rename to src/d/actor/d_a_demo_dk.cpp diff --git a/src/d/a/d_a_demo_item.cpp b/src/d/actor/d_a_demo_item.cpp similarity index 100% rename from src/d/a/d_a_demo_item.cpp rename to src/d/actor/d_a_demo_item.cpp diff --git a/src/d/a/d_a_demo_kmm.cpp b/src/d/actor/d_a_demo_kmm.cpp similarity index 100% rename from src/d/a/d_a_demo_kmm.cpp rename to src/d/actor/d_a_demo_kmm.cpp diff --git a/src/d/a/d_a_disappear.cpp b/src/d/actor/d_a_disappear.cpp similarity index 100% rename from src/d/a/d_a_disappear.cpp rename to src/d/actor/d_a_disappear.cpp diff --git a/src/d/a/d_a_dk.cpp b/src/d/actor/d_a_dk.cpp similarity index 100% rename from src/d/a/d_a_dk.cpp rename to src/d/actor/d_a_dk.cpp diff --git a/src/d/a/d_a_door10.cpp b/src/d/actor/d_a_door10.cpp similarity index 100% rename from src/d/a/d_a_door10.cpp rename to src/d/actor/d_a_door10.cpp diff --git a/src/d/a/d_a_door12.cpp b/src/d/actor/d_a_door12.cpp similarity index 100% rename from src/d/a/d_a_door12.cpp rename to src/d/actor/d_a_door12.cpp diff --git a/src/d/a/d_a_dr.cpp b/src/d/actor/d_a_dr.cpp similarity index 100% rename from src/d/a/d_a_dr.cpp rename to src/d/actor/d_a_dr.cpp diff --git a/src/d/a/d_a_dr2.cpp b/src/d/actor/d_a_dr2.cpp similarity index 100% rename from src/d/a/d_a_dr2.cpp rename to src/d/actor/d_a_dr2.cpp diff --git a/src/d/a/d_a_dummy.cpp b/src/d/actor/d_a_dummy.cpp similarity index 100% rename from src/d/a/d_a_dummy.cpp rename to src/d/actor/d_a_dummy.cpp diff --git a/src/d/a/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp similarity index 100% rename from src/d/a/d_a_ep.cpp rename to src/d/actor/d_a_ep.cpp diff --git a/src/d/a/d_a_esa.cpp b/src/d/actor/d_a_esa.cpp similarity index 100% rename from src/d/a/d_a_esa.cpp rename to src/d/actor/d_a_esa.cpp diff --git a/src/d/a/d_a_fallrock.cpp b/src/d/actor/d_a_fallrock.cpp similarity index 100% rename from src/d/a/d_a_fallrock.cpp rename to src/d/actor/d_a_fallrock.cpp diff --git a/src/d/a/d_a_fallrock_tag.cpp b/src/d/actor/d_a_fallrock_tag.cpp similarity index 100% rename from src/d/a/d_a_fallrock_tag.cpp rename to src/d/actor/d_a_fallrock_tag.cpp diff --git a/src/d/a/d_a_fan.cpp b/src/d/actor/d_a_fan.cpp similarity index 100% rename from src/d/a/d_a_fan.cpp rename to src/d/actor/d_a_fan.cpp diff --git a/src/d/a/d_a_ff.cpp b/src/d/actor/d_a_ff.cpp similarity index 100% rename from src/d/a/d_a_ff.cpp rename to src/d/actor/d_a_ff.cpp diff --git a/src/d/a/d_a_fganon.cpp b/src/d/actor/d_a_fganon.cpp similarity index 100% rename from src/d/a/d_a_fganon.cpp rename to src/d/actor/d_a_fganon.cpp diff --git a/src/d/a/d_a_fgmahou.cpp b/src/d/actor/d_a_fgmahou.cpp similarity index 100% rename from src/d/a/d_a_fgmahou.cpp rename to src/d/actor/d_a_fgmahou.cpp diff --git a/src/d/a/d_a_fire.cpp b/src/d/actor/d_a_fire.cpp similarity index 100% rename from src/d/a/d_a_fire.cpp rename to src/d/actor/d_a_fire.cpp diff --git a/src/d/a/d_a_floor.cpp b/src/d/actor/d_a_floor.cpp similarity index 100% rename from src/d/a/d_a_floor.cpp rename to src/d/actor/d_a_floor.cpp diff --git a/src/d/a/d_a_fm.cpp b/src/d/actor/d_a_fm.cpp similarity index 100% rename from src/d/a/d_a_fm.cpp rename to src/d/actor/d_a_fm.cpp diff --git a/src/d/a/d_a_ghostship.cpp b/src/d/actor/d_a_ghostship.cpp similarity index 100% rename from src/d/a/d_a_ghostship.cpp rename to src/d/actor/d_a_ghostship.cpp diff --git a/src/d/a/d_a_gm.cpp b/src/d/actor/d_a_gm.cpp similarity index 100% rename from src/d/a/d_a_gm.cpp rename to src/d/actor/d_a_gm.cpp diff --git a/src/d/a/d_a_gnd.cpp b/src/d/actor/d_a_gnd.cpp similarity index 100% rename from src/d/a/d_a_gnd.cpp rename to src/d/actor/d_a_gnd.cpp diff --git a/src/d/a/d_a_goal_flag.cpp b/src/d/actor/d_a_goal_flag.cpp similarity index 100% rename from src/d/a/d_a_goal_flag.cpp rename to src/d/actor/d_a_goal_flag.cpp diff --git a/src/d/a/d_a_grass.cpp b/src/d/actor/d_a_grass.cpp similarity index 100% rename from src/d/a/d_a_grass.cpp rename to src/d/actor/d_a_grass.cpp diff --git a/src/d/a/d_a_grid.cpp b/src/d/actor/d_a_grid.cpp similarity index 100% rename from src/d/a/d_a_grid.cpp rename to src/d/actor/d_a_grid.cpp diff --git a/src/d/a/d_a_gy.cpp b/src/d/actor/d_a_gy.cpp similarity index 100% rename from src/d/a/d_a_gy.cpp rename to src/d/actor/d_a_gy.cpp diff --git a/src/d/a/d_a_gy_ctrl.cpp b/src/d/actor/d_a_gy_ctrl.cpp similarity index 100% rename from src/d/a/d_a_gy_ctrl.cpp rename to src/d/actor/d_a_gy_ctrl.cpp diff --git a/src/d/a/d_a_himo2.cpp b/src/d/actor/d_a_himo2.cpp similarity index 100% rename from src/d/a/d_a_himo2.cpp rename to src/d/actor/d_a_himo2.cpp diff --git a/src/d/a/d_a_himo3.cpp b/src/d/actor/d_a_himo3.cpp similarity index 100% rename from src/d/a/d_a_himo3.cpp rename to src/d/actor/d_a_himo3.cpp diff --git a/src/d/a/d_a_hitobj.cpp b/src/d/actor/d_a_hitobj.cpp similarity index 100% rename from src/d/a/d_a_hitobj.cpp rename to src/d/actor/d_a_hitobj.cpp diff --git a/src/d/a/d_a_hmlif.cpp b/src/d/actor/d_a_hmlif.cpp similarity index 100% rename from src/d/a/d_a_hmlif.cpp rename to src/d/actor/d_a_hmlif.cpp diff --git a/src/d/a/d_a_hookshot.cpp b/src/d/actor/d_a_hookshot.cpp similarity index 100% rename from src/d/a/d_a_hookshot.cpp rename to src/d/actor/d_a_hookshot.cpp diff --git a/src/d/a/d_a_hot_floor.cpp b/src/d/actor/d_a_hot_floor.cpp similarity index 100% rename from src/d/a/d_a_hot_floor.cpp rename to src/d/actor/d_a_hot_floor.cpp diff --git a/src/d/a/d_a_hys.cpp b/src/d/actor/d_a_hys.cpp similarity index 100% rename from src/d/a/d_a_hys.cpp rename to src/d/actor/d_a_hys.cpp diff --git a/src/d/a/d_a_ib.cpp b/src/d/actor/d_a_ib.cpp similarity index 100% rename from src/d/a/d_a_ib.cpp rename to src/d/actor/d_a_ib.cpp diff --git a/src/d/a/d_a_icelift.cpp b/src/d/actor/d_a_icelift.cpp similarity index 100% rename from src/d/a/d_a_icelift.cpp rename to src/d/actor/d_a_icelift.cpp diff --git a/src/d/a/d_a_ikari.cpp b/src/d/actor/d_a_ikari.cpp similarity index 100% rename from src/d/a/d_a_ikari.cpp rename to src/d/actor/d_a_ikari.cpp diff --git a/src/d/a/d_a_item.cpp b/src/d/actor/d_a_item.cpp similarity index 100% rename from src/d/a/d_a_item.cpp rename to src/d/actor/d_a_item.cpp diff --git a/src/d/a/d_a_item_static.cpp b/src/d/actor/d_a_item_static.cpp similarity index 100% rename from src/d/a/d_a_item_static.cpp rename to src/d/actor/d_a_item_static.cpp diff --git a/src/d/a/d_a_itembase.cpp b/src/d/actor/d_a_itembase.cpp similarity index 100% rename from src/d/a/d_a_itembase.cpp rename to src/d/actor/d_a_itembase.cpp diff --git a/src/d/a/d_a_itembase_static.cpp b/src/d/actor/d_a_itembase_static.cpp similarity index 100% rename from src/d/a/d_a_itembase_static.cpp rename to src/d/actor/d_a_itembase_static.cpp diff --git a/src/d/a/d_a_jbo.cpp b/src/d/actor/d_a_jbo.cpp similarity index 100% rename from src/d/a/d_a_jbo.cpp rename to src/d/actor/d_a_jbo.cpp diff --git a/src/d/a/d_a_kaji.cpp b/src/d/actor/d_a_kaji.cpp similarity index 100% rename from src/d/a/d_a_kaji.cpp rename to src/d/actor/d_a_kaji.cpp diff --git a/src/d/a/d_a_kamome.cpp b/src/d/actor/d_a_kamome.cpp similarity index 100% rename from src/d/a/d_a_kamome.cpp rename to src/d/actor/d_a_kamome.cpp diff --git a/src/d/a/d_a_kanban.cpp b/src/d/actor/d_a_kanban.cpp similarity index 100% rename from src/d/a/d_a_kanban.cpp rename to src/d/actor/d_a_kanban.cpp diff --git a/src/d/a/d_a_kantera.cpp b/src/d/actor/d_a_kantera.cpp similarity index 100% rename from src/d/a/d_a_kantera.cpp rename to src/d/actor/d_a_kantera.cpp diff --git a/src/d/a/d_a_kb.cpp b/src/d/actor/d_a_kb.cpp similarity index 100% rename from src/d/a/d_a_kb.cpp rename to src/d/actor/d_a_kb.cpp diff --git a/src/d/a/d_a_kddoor.cpp b/src/d/actor/d_a_kddoor.cpp similarity index 100% rename from src/d/a/d_a_kddoor.cpp rename to src/d/actor/d_a_kddoor.cpp diff --git a/src/d/a/d_a_ki.cpp b/src/d/actor/d_a_ki.cpp similarity index 100% rename from src/d/a/d_a_ki.cpp rename to src/d/actor/d_a_ki.cpp diff --git a/src/d/a/d_a_kita.cpp b/src/d/actor/d_a_kita.cpp similarity index 100% rename from src/d/a/d_a_kita.cpp rename to src/d/actor/d_a_kita.cpp diff --git a/src/d/a/d_a_klft.cpp b/src/d/actor/d_a_klft.cpp similarity index 100% rename from src/d/a/d_a_klft.cpp rename to src/d/actor/d_a_klft.cpp diff --git a/src/d/a/d_a_kmon.cpp b/src/d/actor/d_a_kmon.cpp similarity index 100% rename from src/d/a/d_a_kmon.cpp rename to src/d/actor/d_a_kmon.cpp diff --git a/src/d/a/d_a_kn.cpp b/src/d/actor/d_a_kn.cpp similarity index 100% rename from src/d/a/d_a_kn.cpp rename to src/d/actor/d_a_kn.cpp diff --git a/src/d/a/d_a_knob00.cpp b/src/d/actor/d_a_knob00.cpp similarity index 100% rename from src/d/a/d_a_knob00.cpp rename to src/d/actor/d_a_knob00.cpp diff --git a/src/d/a/d_a_kokiie.cpp b/src/d/actor/d_a_kokiie.cpp similarity index 100% rename from src/d/a/d_a_kokiie.cpp rename to src/d/actor/d_a_kokiie.cpp diff --git a/src/d/a/d_a_komore.cpp b/src/d/actor/d_a_komore.cpp similarity index 100% rename from src/d/a/d_a_komore.cpp rename to src/d/actor/d_a_komore.cpp diff --git a/src/d/a/d_a_ks.cpp b/src/d/actor/d_a_ks.cpp similarity index 100% rename from src/d/a/d_a_ks.cpp rename to src/d/actor/d_a_ks.cpp diff --git a/src/d/a/d_a_kt.cpp b/src/d/actor/d_a_kt.cpp similarity index 100% rename from src/d/a/d_a_kt.cpp rename to src/d/actor/d_a_kt.cpp diff --git a/src/d/a/d_a_kui.cpp b/src/d/actor/d_a_kui.cpp similarity index 100% rename from src/d/a/d_a_kui.cpp rename to src/d/actor/d_a_kui.cpp diff --git a/src/d/a/d_a_kytag00.cpp b/src/d/actor/d_a_kytag00.cpp similarity index 100% rename from src/d/a/d_a_kytag00.cpp rename to src/d/actor/d_a_kytag00.cpp diff --git a/src/d/a/d_a_kytag01.cpp b/src/d/actor/d_a_kytag01.cpp similarity index 100% rename from src/d/a/d_a_kytag01.cpp rename to src/d/actor/d_a_kytag01.cpp diff --git a/src/d/a/d_a_kytag02.cpp b/src/d/actor/d_a_kytag02.cpp similarity index 100% rename from src/d/a/d_a_kytag02.cpp rename to src/d/actor/d_a_kytag02.cpp diff --git a/src/d/a/d_a_kytag03.cpp b/src/d/actor/d_a_kytag03.cpp similarity index 100% rename from src/d/a/d_a_kytag03.cpp rename to src/d/actor/d_a_kytag03.cpp diff --git a/src/d/a/d_a_kytag04.cpp b/src/d/actor/d_a_kytag04.cpp similarity index 100% rename from src/d/a/d_a_kytag04.cpp rename to src/d/actor/d_a_kytag04.cpp diff --git a/src/d/a/d_a_kytag05.cpp b/src/d/actor/d_a_kytag05.cpp similarity index 100% rename from src/d/a/d_a_kytag05.cpp rename to src/d/actor/d_a_kytag05.cpp diff --git a/src/d/a/d_a_kytag06.cpp b/src/d/actor/d_a_kytag06.cpp similarity index 100% rename from src/d/a/d_a_kytag06.cpp rename to src/d/actor/d_a_kytag06.cpp diff --git a/src/d/a/d_a_kytag07.cpp b/src/d/actor/d_a_kytag07.cpp similarity index 100% rename from src/d/a/d_a_kytag07.cpp rename to src/d/actor/d_a_kytag07.cpp diff --git a/src/d/a/d_a_lamp.cpp b/src/d/actor/d_a_lamp.cpp similarity index 100% rename from src/d/a/d_a_lamp.cpp rename to src/d/actor/d_a_lamp.cpp diff --git a/src/d/a/d_a_lbridge.cpp b/src/d/actor/d_a_lbridge.cpp similarity index 100% rename from src/d/a/d_a_lbridge.cpp rename to src/d/actor/d_a_lbridge.cpp diff --git a/src/d/a/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp similarity index 100% rename from src/d/a/d_a_leaflift.cpp rename to src/d/actor/d_a_leaflift.cpp diff --git a/src/d/a/d_a_leaflift_static.cpp b/src/d/actor/d_a_leaflift_static.cpp similarity index 100% rename from src/d/a/d_a_leaflift_static.cpp rename to src/d/actor/d_a_leaflift_static.cpp diff --git a/src/d/a/d_a_lod_bg.cpp b/src/d/actor/d_a_lod_bg.cpp similarity index 100% rename from src/d/a/d_a_lod_bg.cpp rename to src/d/actor/d_a_lod_bg.cpp diff --git a/src/d/a/d_a_lstair.cpp b/src/d/actor/d_a_lstair.cpp similarity index 100% rename from src/d/a/d_a_lstair.cpp rename to src/d/actor/d_a_lstair.cpp diff --git a/src/d/a/d_a_lwood.cpp b/src/d/actor/d_a_lwood.cpp similarity index 100% rename from src/d/a/d_a_lwood.cpp rename to src/d/actor/d_a_lwood.cpp diff --git a/src/d/a/d_a_machine.cpp b/src/d/actor/d_a_machine.cpp similarity index 100% rename from src/d/a/d_a_machine.cpp rename to src/d/actor/d_a_machine.cpp diff --git a/src/d/a/d_a_magma.cpp b/src/d/actor/d_a_magma.cpp similarity index 100% rename from src/d/a/d_a_magma.cpp rename to src/d/actor/d_a_magma.cpp diff --git a/src/d/a/d_a_majuu_flag.cpp b/src/d/actor/d_a_majuu_flag.cpp similarity index 100% rename from src/d/a/d_a_majuu_flag.cpp rename to src/d/actor/d_a_majuu_flag.cpp diff --git a/src/d/a/d_a_mant.cpp b/src/d/actor/d_a_mant.cpp similarity index 100% rename from src/d/a/d_a_mant.cpp rename to src/d/actor/d_a_mant.cpp diff --git a/src/d/a/d_a_mbdoor.cpp b/src/d/actor/d_a_mbdoor.cpp similarity index 100% rename from src/d/a/d_a_mbdoor.cpp rename to src/d/actor/d_a_mbdoor.cpp diff --git a/src/d/a/d_a_mdoor.cpp b/src/d/actor/d_a_mdoor.cpp similarity index 100% rename from src/d/a/d_a_mdoor.cpp rename to src/d/actor/d_a_mdoor.cpp diff --git a/src/d/a/d_a_mflft.cpp b/src/d/actor/d_a_mflft.cpp similarity index 100% rename from src/d/a/d_a_mflft.cpp rename to src/d/actor/d_a_mflft.cpp diff --git a/src/d/a/d_a_mgameboard.cpp b/src/d/actor/d_a_mgameboard.cpp similarity index 100% rename from src/d/a/d_a_mgameboard.cpp rename to src/d/actor/d_a_mgameboard.cpp diff --git a/src/d/a/d_a_mgameboard_static.cpp b/src/d/actor/d_a_mgameboard_static.cpp similarity index 100% rename from src/d/a/d_a_mgameboard_static.cpp rename to src/d/actor/d_a_mgameboard_static.cpp diff --git a/src/d/a/d_a_mmusic.cpp b/src/d/actor/d_a_mmusic.cpp similarity index 100% rename from src/d/a/d_a_mmusic.cpp rename to src/d/actor/d_a_mmusic.cpp diff --git a/src/d/a/d_a_mo2.cpp b/src/d/actor/d_a_mo2.cpp similarity index 100% rename from src/d/a/d_a_mo2.cpp rename to src/d/actor/d_a_mo2.cpp diff --git a/src/d/a/d_a_movie_player.cpp b/src/d/actor/d_a_movie_player.cpp similarity index 100% rename from src/d/a/d_a_movie_player.cpp rename to src/d/actor/d_a_movie_player.cpp diff --git a/src/d/a/d_a_mozo.cpp b/src/d/actor/d_a_mozo.cpp similarity index 100% rename from src/d/a/d_a_mozo.cpp rename to src/d/actor/d_a_mozo.cpp diff --git a/src/d/a/d_a_msw.cpp b/src/d/actor/d_a_msw.cpp similarity index 100% rename from src/d/a/d_a_msw.cpp rename to src/d/actor/d_a_msw.cpp diff --git a/src/d/a/d_a_mt.cpp b/src/d/actor/d_a_mt.cpp similarity index 100% rename from src/d/a/d_a_mt.cpp rename to src/d/actor/d_a_mt.cpp diff --git a/src/d/a/d_a_mtoge.cpp b/src/d/actor/d_a_mtoge.cpp similarity index 100% rename from src/d/a/d_a_mtoge.cpp rename to src/d/actor/d_a_mtoge.cpp diff --git a/src/d/a/d_a_nh.cpp b/src/d/actor/d_a_nh.cpp similarity index 100% rename from src/d/a/d_a_nh.cpp rename to src/d/actor/d_a_nh.cpp diff --git a/src/d/a/d_a_npc_ac1.cpp b/src/d/actor/d_a_npc_ac1.cpp similarity index 100% rename from src/d/a/d_a_npc_ac1.cpp rename to src/d/actor/d_a_npc_ac1.cpp diff --git a/src/d/a/d_a_npc_ah.cpp b/src/d/actor/d_a_npc_ah.cpp similarity index 100% rename from src/d/a/d_a_npc_ah.cpp rename to src/d/actor/d_a_npc_ah.cpp diff --git a/src/d/a/d_a_npc_aj1.cpp b/src/d/actor/d_a_npc_aj1.cpp similarity index 100% rename from src/d/a/d_a_npc_aj1.cpp rename to src/d/actor/d_a_npc_aj1.cpp diff --git a/src/d/a/d_a_npc_auction.cpp b/src/d/actor/d_a_npc_auction.cpp similarity index 100% rename from src/d/a/d_a_npc_auction.cpp rename to src/d/actor/d_a_npc_auction.cpp diff --git a/src/d/a/d_a_npc_ba1.cpp b/src/d/actor/d_a_npc_ba1.cpp similarity index 100% rename from src/d/a/d_a_npc_ba1.cpp rename to src/d/actor/d_a_npc_ba1.cpp diff --git a/src/d/a/d_a_npc_bj1.cpp b/src/d/actor/d_a_npc_bj1.cpp similarity index 100% rename from src/d/a/d_a_npc_bj1.cpp rename to src/d/actor/d_a_npc_bj1.cpp diff --git a/src/d/a/d_a_npc_bm1.cpp b/src/d/actor/d_a_npc_bm1.cpp similarity index 100% rename from src/d/a/d_a_npc_bm1.cpp rename to src/d/actor/d_a_npc_bm1.cpp diff --git a/src/d/a/d_a_npc_bmcon1.cpp b/src/d/actor/d_a_npc_bmcon1.cpp similarity index 100% rename from src/d/a/d_a_npc_bmcon1.cpp rename to src/d/actor/d_a_npc_bmcon1.cpp diff --git a/src/d/a/d_a_npc_bms1.cpp b/src/d/actor/d_a_npc_bms1.cpp similarity index 100% rename from src/d/a/d_a_npc_bms1.cpp rename to src/d/actor/d_a_npc_bms1.cpp diff --git a/src/d/a/d_a_npc_bmsw.cpp b/src/d/actor/d_a_npc_bmsw.cpp similarity index 100% rename from src/d/a/d_a_npc_bmsw.cpp rename to src/d/actor/d_a_npc_bmsw.cpp diff --git a/src/d/a/d_a_npc_bs1.cpp b/src/d/actor/d_a_npc_bs1.cpp similarity index 100% rename from src/d/a/d_a_npc_bs1.cpp rename to src/d/actor/d_a_npc_bs1.cpp diff --git a/src/d/a/d_a_npc_btsw.cpp b/src/d/actor/d_a_npc_btsw.cpp similarity index 100% rename from src/d/a/d_a_npc_btsw.cpp rename to src/d/actor/d_a_npc_btsw.cpp diff --git a/src/d/a/d_a_npc_btsw2.cpp b/src/d/actor/d_a_npc_btsw2.cpp similarity index 100% rename from src/d/a/d_a_npc_btsw2.cpp rename to src/d/actor/d_a_npc_btsw2.cpp diff --git a/src/d/a/d_a_npc_cb1.cpp b/src/d/actor/d_a_npc_cb1.cpp similarity index 100% rename from src/d/a/d_a_npc_cb1.cpp rename to src/d/actor/d_a_npc_cb1.cpp diff --git a/src/d/a/d_a_npc_cb1_static.cpp b/src/d/actor/d_a_npc_cb1_static.cpp similarity index 100% rename from src/d/a/d_a_npc_cb1_static.cpp rename to src/d/actor/d_a_npc_cb1_static.cpp diff --git a/src/d/a/d_a_npc_co1.cpp b/src/d/actor/d_a_npc_co1.cpp similarity index 100% rename from src/d/a/d_a_npc_co1.cpp rename to src/d/actor/d_a_npc_co1.cpp diff --git a/src/d/a/d_a_npc_de1.cpp b/src/d/actor/d_a_npc_de1.cpp similarity index 100% rename from src/d/a/d_a_npc_de1.cpp rename to src/d/actor/d_a_npc_de1.cpp diff --git a/src/d/a/d_a_npc_ds1.cpp b/src/d/actor/d_a_npc_ds1.cpp similarity index 100% rename from src/d/a/d_a_npc_ds1.cpp rename to src/d/actor/d_a_npc_ds1.cpp diff --git a/src/d/a/d_a_npc_fa1.cpp b/src/d/actor/d_a_npc_fa1.cpp similarity index 100% rename from src/d/a/d_a_npc_fa1.cpp rename to src/d/actor/d_a_npc_fa1.cpp diff --git a/src/d/a/d_a_npc_gk1.cpp b/src/d/actor/d_a_npc_gk1.cpp similarity index 100% rename from src/d/a/d_a_npc_gk1.cpp rename to src/d/actor/d_a_npc_gk1.cpp diff --git a/src/d/a/d_a_npc_gp1.cpp b/src/d/actor/d_a_npc_gp1.cpp similarity index 100% rename from src/d/a/d_a_npc_gp1.cpp rename to src/d/actor/d_a_npc_gp1.cpp diff --git a/src/d/a/d_a_npc_hi1.cpp b/src/d/actor/d_a_npc_hi1.cpp similarity index 100% rename from src/d/a/d_a_npc_hi1.cpp rename to src/d/actor/d_a_npc_hi1.cpp diff --git a/src/d/a/d_a_npc_ho.cpp b/src/d/actor/d_a_npc_ho.cpp similarity index 100% rename from src/d/a/d_a_npc_ho.cpp rename to src/d/actor/d_a_npc_ho.cpp diff --git a/src/d/a/d_a_npc_hr.cpp b/src/d/actor/d_a_npc_hr.cpp similarity index 100% rename from src/d/a/d_a_npc_hr.cpp rename to src/d/actor/d_a_npc_hr.cpp diff --git a/src/d/a/d_a_npc_jb1.cpp b/src/d/actor/d_a_npc_jb1.cpp similarity index 100% rename from src/d/a/d_a_npc_jb1.cpp rename to src/d/actor/d_a_npc_jb1.cpp diff --git a/src/d/a/d_a_npc_ji1.cpp b/src/d/actor/d_a_npc_ji1.cpp similarity index 100% rename from src/d/a/d_a_npc_ji1.cpp rename to src/d/actor/d_a_npc_ji1.cpp diff --git a/src/d/a/d_a_npc_kamome.cpp b/src/d/actor/d_a_npc_kamome.cpp similarity index 100% rename from src/d/a/d_a_npc_kamome.cpp rename to src/d/actor/d_a_npc_kamome.cpp diff --git a/src/d/a/d_a_npc_kf1.cpp b/src/d/actor/d_a_npc_kf1.cpp similarity index 100% rename from src/d/a/d_a_npc_kf1.cpp rename to src/d/actor/d_a_npc_kf1.cpp diff --git a/src/d/a/d_a_npc_kg1.cpp b/src/d/actor/d_a_npc_kg1.cpp similarity index 100% rename from src/d/a/d_a_npc_kg1.cpp rename to src/d/actor/d_a_npc_kg1.cpp diff --git a/src/d/a/d_a_npc_kg2.cpp b/src/d/actor/d_a_npc_kg2.cpp similarity index 100% rename from src/d/a/d_a_npc_kg2.cpp rename to src/d/actor/d_a_npc_kg2.cpp diff --git a/src/d/a/d_a_npc_kk1.cpp b/src/d/actor/d_a_npc_kk1.cpp similarity index 100% rename from src/d/a/d_a_npc_kk1.cpp rename to src/d/actor/d_a_npc_kk1.cpp diff --git a/src/d/a/d_a_npc_km1.cpp b/src/d/actor/d_a_npc_km1.cpp similarity index 100% rename from src/d/a/d_a_npc_km1.cpp rename to src/d/actor/d_a_npc_km1.cpp diff --git a/src/d/a/d_a_npc_ko1.cpp b/src/d/actor/d_a_npc_ko1.cpp similarity index 100% rename from src/d/a/d_a_npc_ko1.cpp rename to src/d/actor/d_a_npc_ko1.cpp diff --git a/src/d/a/d_a_npc_kp1.cpp b/src/d/actor/d_a_npc_kp1.cpp similarity index 100% rename from src/d/a/d_a_npc_kp1.cpp rename to src/d/actor/d_a_npc_kp1.cpp diff --git a/src/d/a/d_a_npc_ls1.cpp b/src/d/actor/d_a_npc_ls1.cpp similarity index 100% rename from src/d/a/d_a_npc_ls1.cpp rename to src/d/actor/d_a_npc_ls1.cpp diff --git a/src/d/a/d_a_npc_md.cpp b/src/d/actor/d_a_npc_md.cpp similarity index 100% rename from src/d/a/d_a_npc_md.cpp rename to src/d/actor/d_a_npc_md.cpp diff --git a/src/d/a/d_a_npc_mk.cpp b/src/d/actor/d_a_npc_mk.cpp similarity index 100% rename from src/d/a/d_a_npc_mk.cpp rename to src/d/actor/d_a_npc_mk.cpp diff --git a/src/d/a/d_a_npc_mk_static.cpp b/src/d/actor/d_a_npc_mk_static.cpp similarity index 100% rename from src/d/a/d_a_npc_mk_static.cpp rename to src/d/actor/d_a_npc_mk_static.cpp diff --git a/src/d/a/d_a_npc_mn.cpp b/src/d/actor/d_a_npc_mn.cpp similarity index 100% rename from src/d/a/d_a_npc_mn.cpp rename to src/d/actor/d_a_npc_mn.cpp diff --git a/src/d/a/d_a_npc_mt.cpp b/src/d/actor/d_a_npc_mt.cpp similarity index 100% rename from src/d/a/d_a_npc_mt.cpp rename to src/d/actor/d_a_npc_mt.cpp diff --git a/src/d/a/d_a_npc_nz.cpp b/src/d/actor/d_a_npc_nz.cpp similarity index 100% rename from src/d/a/d_a_npc_nz.cpp rename to src/d/actor/d_a_npc_nz.cpp diff --git a/src/d/a/d_a_npc_ob1.cpp b/src/d/actor/d_a_npc_ob1.cpp similarity index 100% rename from src/d/a/d_a_npc_ob1.cpp rename to src/d/actor/d_a_npc_ob1.cpp diff --git a/src/d/a/d_a_npc_os.cpp b/src/d/actor/d_a_npc_os.cpp similarity index 100% rename from src/d/a/d_a_npc_os.cpp rename to src/d/actor/d_a_npc_os.cpp diff --git a/src/d/a/d_a_npc_p1.cpp b/src/d/actor/d_a_npc_p1.cpp similarity index 100% rename from src/d/a/d_a_npc_p1.cpp rename to src/d/actor/d_a_npc_p1.cpp diff --git a/src/d/a/d_a_npc_p2.cpp b/src/d/actor/d_a_npc_p2.cpp similarity index 100% rename from src/d/a/d_a_npc_p2.cpp rename to src/d/actor/d_a_npc_p2.cpp diff --git a/src/d/a/d_a_npc_people.cpp b/src/d/actor/d_a_npc_people.cpp similarity index 100% rename from src/d/a/d_a_npc_people.cpp rename to src/d/actor/d_a_npc_people.cpp diff --git a/src/d/a/d_a_npc_pf1.cpp b/src/d/actor/d_a_npc_pf1.cpp similarity index 100% rename from src/d/a/d_a_npc_pf1.cpp rename to src/d/actor/d_a_npc_pf1.cpp diff --git a/src/d/a/d_a_npc_photo.cpp b/src/d/actor/d_a_npc_photo.cpp similarity index 100% rename from src/d/a/d_a_npc_photo.cpp rename to src/d/actor/d_a_npc_photo.cpp diff --git a/src/d/a/d_a_npc_pm1.cpp b/src/d/actor/d_a_npc_pm1.cpp similarity index 100% rename from src/d/a/d_a_npc_pm1.cpp rename to src/d/actor/d_a_npc_pm1.cpp diff --git a/src/d/a/d_a_npc_roten.cpp b/src/d/actor/d_a_npc_roten.cpp similarity index 100% rename from src/d/a/d_a_npc_roten.cpp rename to src/d/actor/d_a_npc_roten.cpp diff --git a/src/d/a/d_a_npc_rsh1.cpp b/src/d/actor/d_a_npc_rsh1.cpp similarity index 100% rename from src/d/a/d_a_npc_rsh1.cpp rename to src/d/actor/d_a_npc_rsh1.cpp diff --git a/src/d/a/d_a_npc_sarace.cpp b/src/d/actor/d_a_npc_sarace.cpp similarity index 100% rename from src/d/a/d_a_npc_sarace.cpp rename to src/d/actor/d_a_npc_sarace.cpp diff --git a/src/d/a/d_a_npc_so.cpp b/src/d/actor/d_a_npc_so.cpp similarity index 100% rename from src/d/a/d_a_npc_so.cpp rename to src/d/actor/d_a_npc_so.cpp diff --git a/src/d/a/d_a_npc_sv.cpp b/src/d/actor/d_a_npc_sv.cpp similarity index 100% rename from src/d/a/d_a_npc_sv.cpp rename to src/d/actor/d_a_npc_sv.cpp diff --git a/src/d/a/d_a_npc_tc.cpp b/src/d/actor/d_a_npc_tc.cpp similarity index 100% rename from src/d/a/d_a_npc_tc.cpp rename to src/d/actor/d_a_npc_tc.cpp diff --git a/src/d/a/d_a_npc_tt.cpp b/src/d/actor/d_a_npc_tt.cpp similarity index 100% rename from src/d/a/d_a_npc_tt.cpp rename to src/d/actor/d_a_npc_tt.cpp diff --git a/src/d/a/d_a_npc_uk.cpp b/src/d/actor/d_a_npc_uk.cpp similarity index 100% rename from src/d/a/d_a_npc_uk.cpp rename to src/d/actor/d_a_npc_uk.cpp diff --git a/src/d/a/d_a_npc_ym1.cpp b/src/d/actor/d_a_npc_ym1.cpp similarity index 100% rename from src/d/a/d_a_npc_ym1.cpp rename to src/d/actor/d_a_npc_ym1.cpp diff --git a/src/d/a/d_a_npc_yw1.cpp b/src/d/actor/d_a_npc_yw1.cpp similarity index 100% rename from src/d/a/d_a_npc_yw1.cpp rename to src/d/actor/d_a_npc_yw1.cpp diff --git a/src/d/a/d_a_npc_zk1.cpp b/src/d/actor/d_a_npc_zk1.cpp similarity index 100% rename from src/d/a/d_a_npc_zk1.cpp rename to src/d/actor/d_a_npc_zk1.cpp diff --git a/src/d/a/d_a_npc_zl1.cpp b/src/d/actor/d_a_npc_zl1.cpp similarity index 100% rename from src/d/a/d_a_npc_zl1.cpp rename to src/d/actor/d_a_npc_zl1.cpp diff --git a/src/d/a/d_a_nz.cpp b/src/d/actor/d_a_nz.cpp similarity index 100% rename from src/d/a/d_a_nz.cpp rename to src/d/actor/d_a_nz.cpp diff --git a/src/d/a/d_a_nzg.cpp b/src/d/actor/d_a_nzg.cpp similarity index 100% rename from src/d/a/d_a_nzg.cpp rename to src/d/actor/d_a_nzg.cpp diff --git a/src/d/a/d_a_obj.cpp b/src/d/actor/d_a_obj.cpp similarity index 100% rename from src/d/a/d_a_obj.cpp rename to src/d/actor/d_a_obj.cpp diff --git a/src/d/a/d_a_obj_AjavW.cpp b/src/d/actor/d_a_obj_AjavW.cpp similarity index 100% rename from src/d/a/d_a_obj_AjavW.cpp rename to src/d/actor/d_a_obj_AjavW.cpp diff --git a/src/d/a/d_a_obj_Itnak.cpp b/src/d/actor/d_a_obj_Itnak.cpp similarity index 100% rename from src/d/a/d_a_obj_Itnak.cpp rename to src/d/actor/d_a_obj_Itnak.cpp diff --git a/src/d/a/d_a_obj_Vds.cpp b/src/d/actor/d_a_obj_Vds.cpp similarity index 100% rename from src/d/a/d_a_obj_Vds.cpp rename to src/d/actor/d_a_obj_Vds.cpp diff --git a/src/d/a/d_a_obj_Vteng.cpp b/src/d/actor/d_a_obj_Vteng.cpp similarity index 100% rename from src/d/a/d_a_obj_Vteng.cpp rename to src/d/actor/d_a_obj_Vteng.cpp diff --git a/src/d/a/d_a_obj_YLzou.cpp b/src/d/actor/d_a_obj_YLzou.cpp similarity index 100% rename from src/d/a/d_a_obj_YLzou.cpp rename to src/d/actor/d_a_obj_YLzou.cpp diff --git a/src/d/a/d_a_obj_Yboil.cpp b/src/d/actor/d_a_obj_Yboil.cpp similarity index 100% rename from src/d/a/d_a_obj_Yboil.cpp rename to src/d/actor/d_a_obj_Yboil.cpp diff --git a/src/d/a/d_a_obj_Ygush00.cpp b/src/d/actor/d_a_obj_Ygush00.cpp similarity index 100% rename from src/d/a/d_a_obj_Ygush00.cpp rename to src/d/actor/d_a_obj_Ygush00.cpp diff --git a/src/d/a/d_a_obj_adnno.cpp b/src/d/actor/d_a_obj_adnno.cpp similarity index 100% rename from src/d/a/d_a_obj_adnno.cpp rename to src/d/actor/d_a_obj_adnno.cpp diff --git a/src/d/a/d_a_obj_ajav.cpp b/src/d/actor/d_a_obj_ajav.cpp similarity index 100% rename from src/d/a/d_a_obj_ajav.cpp rename to src/d/actor/d_a_obj_ajav.cpp diff --git a/src/d/a/d_a_obj_akabe.cpp b/src/d/actor/d_a_obj_akabe.cpp similarity index 100% rename from src/d/a/d_a_obj_akabe.cpp rename to src/d/actor/d_a_obj_akabe.cpp diff --git a/src/d/a/d_a_obj_apzl.cpp b/src/d/actor/d_a_obj_apzl.cpp similarity index 100% rename from src/d/a/d_a_obj_apzl.cpp rename to src/d/actor/d_a_obj_apzl.cpp diff --git a/src/d/a/d_a_obj_ashut.cpp b/src/d/actor/d_a_obj_ashut.cpp similarity index 100% rename from src/d/a/d_a_obj_ashut.cpp rename to src/d/actor/d_a_obj_ashut.cpp diff --git a/src/d/a/d_a_obj_auzu.cpp b/src/d/actor/d_a_obj_auzu.cpp similarity index 100% rename from src/d/a/d_a_obj_auzu.cpp rename to src/d/actor/d_a_obj_auzu.cpp diff --git a/src/d/a/d_a_obj_aygr.cpp b/src/d/actor/d_a_obj_aygr.cpp similarity index 100% rename from src/d/a/d_a_obj_aygr.cpp rename to src/d/actor/d_a_obj_aygr.cpp diff --git a/src/d/a/d_a_obj_balancelift.cpp b/src/d/actor/d_a_obj_balancelift.cpp similarity index 100% rename from src/d/a/d_a_obj_balancelift.cpp rename to src/d/actor/d_a_obj_balancelift.cpp diff --git a/src/d/a/d_a_obj_barrel.cpp b/src/d/actor/d_a_obj_barrel.cpp similarity index 100% rename from src/d/a/d_a_obj_barrel.cpp rename to src/d/actor/d_a_obj_barrel.cpp diff --git a/src/d/a/d_a_obj_barrel2.cpp b/src/d/actor/d_a_obj_barrel2.cpp similarity index 100% rename from src/d/a/d_a_obj_barrel2.cpp rename to src/d/actor/d_a_obj_barrel2.cpp diff --git a/src/d/a/d_a_obj_barrier.cpp b/src/d/actor/d_a_obj_barrier.cpp similarity index 100% rename from src/d/a/d_a_obj_barrier.cpp rename to src/d/actor/d_a_obj_barrier.cpp diff --git a/src/d/a/d_a_obj_bemos.cpp b/src/d/actor/d_a_obj_bemos.cpp similarity index 100% rename from src/d/a/d_a_obj_bemos.cpp rename to src/d/actor/d_a_obj_bemos.cpp diff --git a/src/d/a/d_a_obj_bscurtain.cpp b/src/d/actor/d_a_obj_bscurtain.cpp similarity index 100% rename from src/d/a/d_a_obj_bscurtain.cpp rename to src/d/actor/d_a_obj_bscurtain.cpp diff --git a/src/d/a/d_a_obj_buoyflag.cpp b/src/d/actor/d_a_obj_buoyflag.cpp similarity index 100% rename from src/d/a/d_a_obj_buoyflag.cpp rename to src/d/actor/d_a_obj_buoyflag.cpp diff --git a/src/d/a/d_a_obj_buoyrace.cpp b/src/d/actor/d_a_obj_buoyrace.cpp similarity index 100% rename from src/d/a/d_a_obj_buoyrace.cpp rename to src/d/actor/d_a_obj_buoyrace.cpp diff --git a/src/d/a/d_a_obj_cafelmp.cpp b/src/d/actor/d_a_obj_cafelmp.cpp similarity index 100% rename from src/d/a/d_a_obj_cafelmp.cpp rename to src/d/actor/d_a_obj_cafelmp.cpp diff --git a/src/d/a/d_a_obj_canon.cpp b/src/d/actor/d_a_obj_canon.cpp similarity index 100% rename from src/d/a/d_a_obj_canon.cpp rename to src/d/actor/d_a_obj_canon.cpp diff --git a/src/d/a/d_a_obj_coming.cpp b/src/d/actor/d_a_obj_coming.cpp similarity index 100% rename from src/d/a/d_a_obj_coming.cpp rename to src/d/actor/d_a_obj_coming.cpp diff --git a/src/d/a/d_a_obj_correct.cpp b/src/d/actor/d_a_obj_correct.cpp similarity index 100% rename from src/d/a/d_a_obj_correct.cpp rename to src/d/actor/d_a_obj_correct.cpp diff --git a/src/d/a/d_a_obj_demo_barrel.cpp b/src/d/actor/d_a_obj_demo_barrel.cpp similarity index 100% rename from src/d/a/d_a_obj_demo_barrel.cpp rename to src/d/actor/d_a_obj_demo_barrel.cpp diff --git a/src/d/a/d_a_obj_dmgroom.cpp b/src/d/actor/d_a_obj_dmgroom.cpp similarity index 100% rename from src/d/a/d_a_obj_dmgroom.cpp rename to src/d/actor/d_a_obj_dmgroom.cpp diff --git a/src/d/a/d_a_obj_doguu.cpp b/src/d/actor/d_a_obj_doguu.cpp similarity index 100% rename from src/d/a/d_a_obj_doguu.cpp rename to src/d/actor/d_a_obj_doguu.cpp diff --git a/src/d/a/d_a_obj_doguu_demo.cpp b/src/d/actor/d_a_obj_doguu_demo.cpp similarity index 100% rename from src/d/a/d_a_obj_doguu_demo.cpp rename to src/d/actor/d_a_obj_doguu_demo.cpp diff --git a/src/d/a/d_a_obj_dragonhead.cpp b/src/d/actor/d_a_obj_dragonhead.cpp similarity index 100% rename from src/d/a/d_a_obj_dragonhead.cpp rename to src/d/actor/d_a_obj_dragonhead.cpp diff --git a/src/d/a/d_a_obj_drift.cpp b/src/d/actor/d_a_obj_drift.cpp similarity index 100% rename from src/d/a/d_a_obj_drift.cpp rename to src/d/actor/d_a_obj_drift.cpp diff --git a/src/d/a/d_a_obj_eayogn.cpp b/src/d/actor/d_a_obj_eayogn.cpp similarity index 100% rename from src/d/a/d_a_obj_eayogn.cpp rename to src/d/actor/d_a_obj_eayogn.cpp diff --git a/src/d/a/d_a_obj_ebomzo.cpp b/src/d/actor/d_a_obj_ebomzo.cpp similarity index 100% rename from src/d/a/d_a_obj_ebomzo.cpp rename to src/d/actor/d_a_obj_ebomzo.cpp diff --git a/src/d/a/d_a_obj_eff.cpp b/src/d/actor/d_a_obj_eff.cpp similarity index 100% rename from src/d/a/d_a_obj_eff.cpp rename to src/d/actor/d_a_obj_eff.cpp diff --git a/src/d/a/d_a_obj_ekskz.cpp b/src/d/actor/d_a_obj_ekskz.cpp similarity index 100% rename from src/d/a/d_a_obj_ekskz.cpp rename to src/d/actor/d_a_obj_ekskz.cpp diff --git a/src/d/a/d_a_obj_eskban.cpp b/src/d/actor/d_a_obj_eskban.cpp similarity index 100% rename from src/d/a/d_a_obj_eskban.cpp rename to src/d/actor/d_a_obj_eskban.cpp diff --git a/src/d/a/d_a_obj_ferris.cpp b/src/d/actor/d_a_obj_ferris.cpp similarity index 100% rename from src/d/a/d_a_obj_ferris.cpp rename to src/d/actor/d_a_obj_ferris.cpp diff --git a/src/d/a/d_a_obj_figure.cpp b/src/d/actor/d_a_obj_figure.cpp similarity index 100% rename from src/d/a/d_a_obj_figure.cpp rename to src/d/actor/d_a_obj_figure.cpp diff --git a/src/d/a/d_a_obj_firewall.cpp b/src/d/actor/d_a_obj_firewall.cpp similarity index 100% rename from src/d/a/d_a_obj_firewall.cpp rename to src/d/actor/d_a_obj_firewall.cpp diff --git a/src/d/a/d_a_obj_flame.cpp b/src/d/actor/d_a_obj_flame.cpp similarity index 100% rename from src/d/a/d_a_obj_flame.cpp rename to src/d/actor/d_a_obj_flame.cpp diff --git a/src/d/a/d_a_obj_ftree.cpp b/src/d/actor/d_a_obj_ftree.cpp similarity index 100% rename from src/d/a/d_a_obj_ftree.cpp rename to src/d/actor/d_a_obj_ftree.cpp diff --git a/src/d/a/d_a_obj_ganonbed.cpp b/src/d/actor/d_a_obj_ganonbed.cpp similarity index 100% rename from src/d/a/d_a_obj_ganonbed.cpp rename to src/d/actor/d_a_obj_ganonbed.cpp diff --git a/src/d/a/d_a_obj_gaship.cpp b/src/d/actor/d_a_obj_gaship.cpp similarity index 100% rename from src/d/a/d_a_obj_gaship.cpp rename to src/d/actor/d_a_obj_gaship.cpp diff --git a/src/d/a/d_a_obj_gaship2.cpp b/src/d/actor/d_a_obj_gaship2.cpp similarity index 100% rename from src/d/a/d_a_obj_gaship2.cpp rename to src/d/actor/d_a_obj_gaship2.cpp diff --git a/src/d/a/d_a_obj_gnnbtltaki.cpp b/src/d/actor/d_a_obj_gnnbtltaki.cpp similarity index 100% rename from src/d/a/d_a_obj_gnnbtltaki.cpp rename to src/d/actor/d_a_obj_gnnbtltaki.cpp diff --git a/src/d/a/d_a_obj_gnndemotakie.cpp b/src/d/actor/d_a_obj_gnndemotakie.cpp similarity index 100% rename from src/d/a/d_a_obj_gnndemotakie.cpp rename to src/d/actor/d_a_obj_gnndemotakie.cpp diff --git a/src/d/a/d_a_obj_gnndemotakis.cpp b/src/d/actor/d_a_obj_gnndemotakis.cpp similarity index 100% rename from src/d/a/d_a_obj_gnndemotakis.cpp rename to src/d/actor/d_a_obj_gnndemotakis.cpp diff --git a/src/d/a/d_a_obj_gong.cpp b/src/d/actor/d_a_obj_gong.cpp similarity index 100% rename from src/d/a/d_a_obj_gong.cpp rename to src/d/actor/d_a_obj_gong.cpp diff --git a/src/d/a/d_a_obj_gryw00.cpp b/src/d/actor/d_a_obj_gryw00.cpp similarity index 100% rename from src/d/a/d_a_obj_gryw00.cpp rename to src/d/actor/d_a_obj_gryw00.cpp diff --git a/src/d/a/d_a_obj_gtaki.cpp b/src/d/actor/d_a_obj_gtaki.cpp similarity index 100% rename from src/d/a/d_a_obj_gtaki.cpp rename to src/d/actor/d_a_obj_gtaki.cpp diff --git a/src/d/a/d_a_obj_hami2.cpp b/src/d/actor/d_a_obj_hami2.cpp similarity index 100% rename from src/d/a/d_a_obj_hami2.cpp rename to src/d/actor/d_a_obj_hami2.cpp diff --git a/src/d/a/d_a_obj_hami3.cpp b/src/d/actor/d_a_obj_hami3.cpp similarity index 100% rename from src/d/a/d_a_obj_hami3.cpp rename to src/d/actor/d_a_obj_hami3.cpp diff --git a/src/d/a/d_a_obj_hami4.cpp b/src/d/actor/d_a_obj_hami4.cpp similarity index 100% rename from src/d/a/d_a_obj_hami4.cpp rename to src/d/actor/d_a_obj_hami4.cpp diff --git a/src/d/a/d_a_obj_hat.cpp b/src/d/actor/d_a_obj_hat.cpp similarity index 100% rename from src/d/a/d_a_obj_hat.cpp rename to src/d/actor/d_a_obj_hat.cpp diff --git a/src/d/a/d_a_obj_hbrf1.cpp b/src/d/actor/d_a_obj_hbrf1.cpp similarity index 100% rename from src/d/a/d_a_obj_hbrf1.cpp rename to src/d/actor/d_a_obj_hbrf1.cpp diff --git a/src/d/a/d_a_obj_hcbh.cpp b/src/d/actor/d_a_obj_hcbh.cpp similarity index 100% rename from src/d/a/d_a_obj_hcbh.cpp rename to src/d/actor/d_a_obj_hcbh.cpp diff --git a/src/d/a/d_a_obj_hfuck1.cpp b/src/d/actor/d_a_obj_hfuck1.cpp similarity index 100% rename from src/d/a/d_a_obj_hfuck1.cpp rename to src/d/actor/d_a_obj_hfuck1.cpp diff --git a/src/d/a/d_a_obj_hha.cpp b/src/d/actor/d_a_obj_hha.cpp similarity index 100% rename from src/d/a/d_a_obj_hha.cpp rename to src/d/actor/d_a_obj_hha.cpp diff --git a/src/d/a/d_a_obj_hlift.cpp b/src/d/actor/d_a_obj_hlift.cpp similarity index 100% rename from src/d/a/d_a_obj_hlift.cpp rename to src/d/actor/d_a_obj_hlift.cpp diff --git a/src/d/a/d_a_obj_hole.cpp b/src/d/actor/d_a_obj_hole.cpp similarity index 100% rename from src/d/a/d_a_obj_hole.cpp rename to src/d/actor/d_a_obj_hole.cpp diff --git a/src/d/a/d_a_obj_homen.cpp b/src/d/actor/d_a_obj_homen.cpp similarity index 100% rename from src/d/a/d_a_obj_homen.cpp rename to src/d/actor/d_a_obj_homen.cpp diff --git a/src/d/a/d_a_obj_homensmoke.cpp b/src/d/actor/d_a_obj_homensmoke.cpp similarity index 100% rename from src/d/a/d_a_obj_homensmoke.cpp rename to src/d/actor/d_a_obj_homensmoke.cpp diff --git a/src/d/a/d_a_obj_hsehi1.cpp b/src/d/actor/d_a_obj_hsehi1.cpp similarity index 100% rename from src/d/a/d_a_obj_hsehi1.cpp rename to src/d/actor/d_a_obj_hsehi1.cpp diff --git a/src/d/a/d_a_obj_htetu1.cpp b/src/d/actor/d_a_obj_htetu1.cpp similarity index 100% rename from src/d/a/d_a_obj_htetu1.cpp rename to src/d/actor/d_a_obj_htetu1.cpp diff --git a/src/d/a/d_a_obj_ice.cpp b/src/d/actor/d_a_obj_ice.cpp similarity index 100% rename from src/d/a/d_a_obj_ice.cpp rename to src/d/actor/d_a_obj_ice.cpp diff --git a/src/d/a/d_a_obj_iceisland.cpp b/src/d/actor/d_a_obj_iceisland.cpp similarity index 100% rename from src/d/a/d_a_obj_iceisland.cpp rename to src/d/actor/d_a_obj_iceisland.cpp diff --git a/src/d/a/d_a_obj_ikada.cpp b/src/d/actor/d_a_obj_ikada.cpp similarity index 100% rename from src/d/a/d_a_obj_ikada.cpp rename to src/d/actor/d_a_obj_ikada.cpp diff --git a/src/d/a/d_a_obj_jump.cpp b/src/d/actor/d_a_obj_jump.cpp similarity index 100% rename from src/d/a/d_a_obj_jump.cpp rename to src/d/actor/d_a_obj_jump.cpp diff --git a/src/d/a/d_a_obj_kanat.cpp b/src/d/actor/d_a_obj_kanat.cpp similarity index 100% rename from src/d/a/d_a_obj_kanat.cpp rename to src/d/actor/d_a_obj_kanat.cpp diff --git a/src/d/a/d_a_obj_kanoke.cpp b/src/d/actor/d_a_obj_kanoke.cpp similarity index 100% rename from src/d/a/d_a_obj_kanoke.cpp rename to src/d/actor/d_a_obj_kanoke.cpp diff --git a/src/d/a/d_a_obj_ladder.cpp b/src/d/actor/d_a_obj_ladder.cpp similarity index 100% rename from src/d/a/d_a_obj_ladder.cpp rename to src/d/actor/d_a_obj_ladder.cpp diff --git a/src/d/a/d_a_obj_leaves.cpp b/src/d/actor/d_a_obj_leaves.cpp similarity index 100% rename from src/d/a/d_a_obj_leaves.cpp rename to src/d/actor/d_a_obj_leaves.cpp diff --git a/src/d/a/d_a_obj_light.cpp b/src/d/actor/d_a_obj_light.cpp similarity index 100% rename from src/d/a/d_a_obj_light.cpp rename to src/d/actor/d_a_obj_light.cpp diff --git a/src/d/a/d_a_obj_lpalm.cpp b/src/d/actor/d_a_obj_lpalm.cpp similarity index 100% rename from src/d/a/d_a_obj_lpalm.cpp rename to src/d/actor/d_a_obj_lpalm.cpp diff --git a/src/d/a/d_a_obj_magmarock.cpp b/src/d/actor/d_a_obj_magmarock.cpp similarity index 100% rename from src/d/a/d_a_obj_magmarock.cpp rename to src/d/actor/d_a_obj_magmarock.cpp diff --git a/src/d/a/d_a_obj_majyuu_door.cpp b/src/d/actor/d_a_obj_majyuu_door.cpp similarity index 100% rename from src/d/a/d_a_obj_majyuu_door.cpp rename to src/d/actor/d_a_obj_majyuu_door.cpp diff --git a/src/d/a/d_a_obj_mkie.cpp b/src/d/actor/d_a_obj_mkie.cpp similarity index 100% rename from src/d/a/d_a_obj_mkie.cpp rename to src/d/actor/d_a_obj_mkie.cpp diff --git a/src/d/a/d_a_obj_mkiek.cpp b/src/d/actor/d_a_obj_mkiek.cpp similarity index 100% rename from src/d/a/d_a_obj_mkiek.cpp rename to src/d/actor/d_a_obj_mkiek.cpp diff --git a/src/d/a/d_a_obj_mknjd.cpp b/src/d/actor/d_a_obj_mknjd.cpp similarity index 100% rename from src/d/a/d_a_obj_mknjd.cpp rename to src/d/actor/d_a_obj_mknjd.cpp diff --git a/src/d/a/d_a_obj_mmrr.cpp b/src/d/actor/d_a_obj_mmrr.cpp similarity index 100% rename from src/d/a/d_a_obj_mmrr.cpp rename to src/d/actor/d_a_obj_mmrr.cpp diff --git a/src/d/a/d_a_obj_monument.cpp b/src/d/actor/d_a_obj_monument.cpp similarity index 100% rename from src/d/a/d_a_obj_monument.cpp rename to src/d/actor/d_a_obj_monument.cpp diff --git a/src/d/a/d_a_obj_movebox.cpp b/src/d/actor/d_a_obj_movebox.cpp similarity index 100% rename from src/d/a/d_a_obj_movebox.cpp rename to src/d/actor/d_a_obj_movebox.cpp diff --git a/src/d/a/d_a_obj_msdan.cpp b/src/d/actor/d_a_obj_msdan.cpp similarity index 100% rename from src/d/a/d_a_obj_msdan.cpp rename to src/d/actor/d_a_obj_msdan.cpp diff --git a/src/d/a/d_a_obj_msdan2.cpp b/src/d/actor/d_a_obj_msdan2.cpp similarity index 100% rename from src/d/a/d_a_obj_msdan2.cpp rename to src/d/actor/d_a_obj_msdan2.cpp diff --git a/src/d/a/d_a_obj_msdan_sub.cpp b/src/d/actor/d_a_obj_msdan_sub.cpp similarity index 100% rename from src/d/a/d_a_obj_msdan_sub.cpp rename to src/d/actor/d_a_obj_msdan_sub.cpp diff --git a/src/d/a/d_a_obj_msdan_sub2.cpp b/src/d/actor/d_a_obj_msdan_sub2.cpp similarity index 100% rename from src/d/a/d_a_obj_msdan_sub2.cpp rename to src/d/actor/d_a_obj_msdan_sub2.cpp diff --git a/src/d/a/d_a_obj_mshokki.cpp b/src/d/actor/d_a_obj_mshokki.cpp similarity index 100% rename from src/d/a/d_a_obj_mshokki.cpp rename to src/d/actor/d_a_obj_mshokki.cpp diff --git a/src/d/a/d_a_obj_mtest.cpp b/src/d/actor/d_a_obj_mtest.cpp similarity index 100% rename from src/d/a/d_a_obj_mtest.cpp rename to src/d/actor/d_a_obj_mtest.cpp diff --git a/src/d/a/d_a_obj_nest.cpp b/src/d/actor/d_a_obj_nest.cpp similarity index 100% rename from src/d/a/d_a_obj_nest.cpp rename to src/d/actor/d_a_obj_nest.cpp diff --git a/src/d/a/d_a_obj_ohatch.cpp b/src/d/actor/d_a_obj_ohatch.cpp similarity index 100% rename from src/d/a/d_a_obj_ohatch.cpp rename to src/d/actor/d_a_obj_ohatch.cpp diff --git a/src/d/a/d_a_obj_ojtree.cpp b/src/d/actor/d_a_obj_ojtree.cpp similarity index 100% rename from src/d/a/d_a_obj_ojtree.cpp rename to src/d/actor/d_a_obj_ojtree.cpp diff --git a/src/d/a/d_a_obj_ospbox.cpp b/src/d/actor/d_a_obj_ospbox.cpp similarity index 100% rename from src/d/a/d_a_obj_ospbox.cpp rename to src/d/actor/d_a_obj_ospbox.cpp diff --git a/src/d/a/d_a_obj_otble.cpp b/src/d/actor/d_a_obj_otble.cpp similarity index 100% rename from src/d/a/d_a_obj_otble.cpp rename to src/d/actor/d_a_obj_otble.cpp diff --git a/src/d/a/d_a_obj_paper.cpp b/src/d/actor/d_a_obj_paper.cpp similarity index 100% rename from src/d/a/d_a_obj_paper.cpp rename to src/d/actor/d_a_obj_paper.cpp diff --git a/src/d/a/d_a_obj_pbco.cpp b/src/d/actor/d_a_obj_pbco.cpp similarity index 100% rename from src/d/a/d_a_obj_pbco.cpp rename to src/d/actor/d_a_obj_pbco.cpp diff --git a/src/d/a/d_a_obj_pbka.cpp b/src/d/actor/d_a_obj_pbka.cpp similarity index 100% rename from src/d/a/d_a_obj_pbka.cpp rename to src/d/actor/d_a_obj_pbka.cpp diff --git a/src/d/a/d_a_obj_pfall.cpp b/src/d/actor/d_a_obj_pfall.cpp similarity index 100% rename from src/d/a/d_a_obj_pfall.cpp rename to src/d/actor/d_a_obj_pfall.cpp diff --git a/src/d/a/d_a_obj_pirateship.cpp b/src/d/actor/d_a_obj_pirateship.cpp similarity index 100% rename from src/d/a/d_a_obj_pirateship.cpp rename to src/d/actor/d_a_obj_pirateship.cpp diff --git a/src/d/a/d_a_obj_plant.cpp b/src/d/actor/d_a_obj_plant.cpp similarity index 100% rename from src/d/a/d_a_obj_plant.cpp rename to src/d/actor/d_a_obj_plant.cpp diff --git a/src/d/a/d_a_obj_quake.cpp b/src/d/actor/d_a_obj_quake.cpp similarity index 100% rename from src/d/a/d_a_obj_quake.cpp rename to src/d/actor/d_a_obj_quake.cpp diff --git a/src/d/a/d_a_obj_rcloud.cpp b/src/d/actor/d_a_obj_rcloud.cpp similarity index 100% rename from src/d/a/d_a_obj_rcloud.cpp rename to src/d/actor/d_a_obj_rcloud.cpp diff --git a/src/d/a/d_a_obj_rflw.cpp b/src/d/actor/d_a_obj_rflw.cpp similarity index 100% rename from src/d/a/d_a_obj_rflw.cpp rename to src/d/actor/d_a_obj_rflw.cpp diff --git a/src/d/a/d_a_obj_rforce.cpp b/src/d/actor/d_a_obj_rforce.cpp similarity index 100% rename from src/d/a/d_a_obj_rforce.cpp rename to src/d/actor/d_a_obj_rforce.cpp diff --git a/src/d/a/d_a_obj_roten.cpp b/src/d/actor/d_a_obj_roten.cpp similarity index 100% rename from src/d/a/d_a_obj_roten.cpp rename to src/d/actor/d_a_obj_roten.cpp diff --git a/src/d/a/d_a_obj_search.cpp b/src/d/actor/d_a_obj_search.cpp similarity index 100% rename from src/d/a/d_a_obj_search.cpp rename to src/d/actor/d_a_obj_search.cpp diff --git a/src/d/a/d_a_obj_shelf.cpp b/src/d/actor/d_a_obj_shelf.cpp similarity index 100% rename from src/d/a/d_a_obj_shelf.cpp rename to src/d/actor/d_a_obj_shelf.cpp diff --git a/src/d/a/d_a_obj_shmrgrd.cpp b/src/d/actor/d_a_obj_shmrgrd.cpp similarity index 100% rename from src/d/a/d_a_obj_shmrgrd.cpp rename to src/d/actor/d_a_obj_shmrgrd.cpp diff --git a/src/d/a/d_a_obj_smplbg.cpp b/src/d/actor/d_a_obj_smplbg.cpp similarity index 100% rename from src/d/a/d_a_obj_smplbg.cpp rename to src/d/actor/d_a_obj_smplbg.cpp diff --git a/src/d/a/d_a_obj_stair.cpp b/src/d/actor/d_a_obj_stair.cpp similarity index 100% rename from src/d/a/d_a_obj_stair.cpp rename to src/d/actor/d_a_obj_stair.cpp diff --git a/src/d/a/d_a_obj_swflat.cpp b/src/d/actor/d_a_obj_swflat.cpp similarity index 100% rename from src/d/a/d_a_obj_swflat.cpp rename to src/d/actor/d_a_obj_swflat.cpp diff --git a/src/d/a/d_a_obj_swhammer.cpp b/src/d/actor/d_a_obj_swhammer.cpp similarity index 100% rename from src/d/a/d_a_obj_swhammer.cpp rename to src/d/actor/d_a_obj_swhammer.cpp diff --git a/src/d/a/d_a_obj_swheavy.cpp b/src/d/actor/d_a_obj_swheavy.cpp similarity index 100% rename from src/d/a/d_a_obj_swheavy.cpp rename to src/d/actor/d_a_obj_swheavy.cpp diff --git a/src/d/a/d_a_obj_swlight.cpp b/src/d/actor/d_a_obj_swlight.cpp similarity index 100% rename from src/d/a/d_a_obj_swlight.cpp rename to src/d/actor/d_a_obj_swlight.cpp diff --git a/src/d/a/d_a_obj_swpush.cpp b/src/d/actor/d_a_obj_swpush.cpp similarity index 100% rename from src/d/a/d_a_obj_swpush.cpp rename to src/d/actor/d_a_obj_swpush.cpp diff --git a/src/d/a/d_a_obj_table.cpp b/src/d/actor/d_a_obj_table.cpp similarity index 100% rename from src/d/a/d_a_obj_table.cpp rename to src/d/actor/d_a_obj_table.cpp diff --git a/src/d/a/d_a_obj_tapestry.cpp b/src/d/actor/d_a_obj_tapestry.cpp similarity index 100% rename from src/d/a/d_a_obj_tapestry.cpp rename to src/d/actor/d_a_obj_tapestry.cpp diff --git a/src/d/a/d_a_obj_tenmado.cpp b/src/d/actor/d_a_obj_tenmado.cpp similarity index 100% rename from src/d/a/d_a_obj_tenmado.cpp rename to src/d/actor/d_a_obj_tenmado.cpp diff --git a/src/d/a/d_a_obj_tide.cpp b/src/d/actor/d_a_obj_tide.cpp similarity index 100% rename from src/d/a/d_a_obj_tide.cpp rename to src/d/actor/d_a_obj_tide.cpp diff --git a/src/d/a/d_a_obj_timer.cpp b/src/d/actor/d_a_obj_timer.cpp similarity index 100% rename from src/d/a/d_a_obj_timer.cpp rename to src/d/actor/d_a_obj_timer.cpp diff --git a/src/d/a/d_a_obj_tntrap.cpp b/src/d/actor/d_a_obj_tntrap.cpp similarity index 100% rename from src/d/a/d_a_obj_tntrap.cpp rename to src/d/actor/d_a_obj_tntrap.cpp diff --git a/src/d/a/d_a_obj_toripost.cpp b/src/d/actor/d_a_obj_toripost.cpp similarity index 100% rename from src/d/a/d_a_obj_toripost.cpp rename to src/d/actor/d_a_obj_toripost.cpp diff --git a/src/d/a/d_a_obj_tousekiki.cpp b/src/d/actor/d_a_obj_tousekiki.cpp similarity index 100% rename from src/d/a/d_a_obj_tousekiki.cpp rename to src/d/actor/d_a_obj_tousekiki.cpp diff --git a/src/d/a/d_a_obj_tower.cpp b/src/d/actor/d_a_obj_tower.cpp similarity index 100% rename from src/d/a/d_a_obj_tower.cpp rename to src/d/actor/d_a_obj_tower.cpp diff --git a/src/d/a/d_a_obj_trap.cpp b/src/d/actor/d_a_obj_trap.cpp similarity index 100% rename from src/d/a/d_a_obj_trap.cpp rename to src/d/actor/d_a_obj_trap.cpp diff --git a/src/d/a/d_a_obj_tribox.cpp b/src/d/actor/d_a_obj_tribox.cpp similarity index 100% rename from src/d/a/d_a_obj_tribox.cpp rename to src/d/actor/d_a_obj_tribox.cpp diff --git a/src/d/a/d_a_obj_tribox_static.cpp b/src/d/actor/d_a_obj_tribox_static.cpp similarity index 100% rename from src/d/a/d_a_obj_tribox_static.cpp rename to src/d/actor/d_a_obj_tribox_static.cpp diff --git a/src/d/a/d_a_obj_try.cpp b/src/d/actor/d_a_obj_try.cpp similarity index 100% rename from src/d/a/d_a_obj_try.cpp rename to src/d/actor/d_a_obj_try.cpp diff --git a/src/d/a/d_a_obj_usovmc.cpp b/src/d/actor/d_a_obj_usovmc.cpp similarity index 100% rename from src/d/a/d_a_obj_usovmc.cpp rename to src/d/actor/d_a_obj_usovmc.cpp diff --git a/src/d/a/d_a_obj_vfan.cpp b/src/d/actor/d_a_obj_vfan.cpp similarity index 100% rename from src/d/a/d_a_obj_vfan.cpp rename to src/d/actor/d_a_obj_vfan.cpp diff --git a/src/d/a/d_a_obj_vgnfd.cpp b/src/d/actor/d_a_obj_vgnfd.cpp similarity index 100% rename from src/d/a/d_a_obj_vgnfd.cpp rename to src/d/actor/d_a_obj_vgnfd.cpp diff --git a/src/d/a/d_a_obj_vmc.cpp b/src/d/actor/d_a_obj_vmc.cpp similarity index 100% rename from src/d/a/d_a_obj_vmc.cpp rename to src/d/actor/d_a_obj_vmc.cpp diff --git a/src/d/a/d_a_obj_vmsdz.cpp b/src/d/actor/d_a_obj_vmsdz.cpp similarity index 100% rename from src/d/a/d_a_obj_vmsdz.cpp rename to src/d/actor/d_a_obj_vmsdz.cpp diff --git a/src/d/a/d_a_obj_vmsms.cpp b/src/d/actor/d_a_obj_vmsms.cpp similarity index 100% rename from src/d/a/d_a_obj_vmsms.cpp rename to src/d/actor/d_a_obj_vmsms.cpp diff --git a/src/d/a/d_a_obj_volcano.cpp b/src/d/actor/d_a_obj_volcano.cpp similarity index 100% rename from src/d/a/d_a_obj_volcano.cpp rename to src/d/actor/d_a_obj_volcano.cpp diff --git a/src/d/a/d_a_obj_vtil.cpp b/src/d/actor/d_a_obj_vtil.cpp similarity index 100% rename from src/d/a/d_a_obj_vtil.cpp rename to src/d/actor/d_a_obj_vtil.cpp diff --git a/src/d/a/d_a_obj_vyasi.cpp b/src/d/actor/d_a_obj_vyasi.cpp similarity index 100% rename from src/d/a/d_a_obj_vyasi.cpp rename to src/d/actor/d_a_obj_vyasi.cpp diff --git a/src/d/a/d_a_obj_warpt.cpp b/src/d/actor/d_a_obj_warpt.cpp similarity index 100% rename from src/d/a/d_a_obj_warpt.cpp rename to src/d/actor/d_a_obj_warpt.cpp diff --git a/src/d/a/d_a_obj_wood.cpp b/src/d/actor/d_a_obj_wood.cpp similarity index 100% rename from src/d/a/d_a_obj_wood.cpp rename to src/d/actor/d_a_obj_wood.cpp diff --git a/src/d/a/d_a_obj_xfuta.cpp b/src/d/actor/d_a_obj_xfuta.cpp similarity index 100% rename from src/d/a/d_a_obj_xfuta.cpp rename to src/d/actor/d_a_obj_xfuta.cpp diff --git a/src/d/a/d_a_obj_zouK.cpp b/src/d/actor/d_a_obj_zouK.cpp similarity index 100% rename from src/d/a/d_a_obj_zouK.cpp rename to src/d/actor/d_a_obj_zouK.cpp diff --git a/src/d/a/d_a_oq.cpp b/src/d/actor/d_a_oq.cpp similarity index 100% rename from src/d/a/d_a_oq.cpp rename to src/d/actor/d_a_oq.cpp diff --git a/src/d/a/d_a_oship.cpp b/src/d/actor/d_a_oship.cpp similarity index 100% rename from src/d/a/d_a_oship.cpp rename to src/d/actor/d_a_oship.cpp diff --git a/src/d/a/d_a_pedestal.cpp b/src/d/actor/d_a_pedestal.cpp similarity index 100% rename from src/d/a/d_a_pedestal.cpp rename to src/d/actor/d_a_pedestal.cpp diff --git a/src/d/a/d_a_ph.cpp b/src/d/actor/d_a_ph.cpp similarity index 100% rename from src/d/a/d_a_ph.cpp rename to src/d/actor/d_a_ph.cpp diff --git a/src/d/a/d_a_pirate_flag.cpp b/src/d/actor/d_a_pirate_flag.cpp similarity index 100% rename from src/d/a/d_a_pirate_flag.cpp rename to src/d/actor/d_a_pirate_flag.cpp diff --git a/src/d/a/d_a_player.cpp b/src/d/actor/d_a_player.cpp similarity index 100% rename from src/d/a/d_a_player.cpp rename to src/d/actor/d_a_player.cpp diff --git a/src/d/a/d_a_player_main.cpp b/src/d/actor/d_a_player_main.cpp similarity index 100% rename from src/d/a/d_a_player_main.cpp rename to src/d/actor/d_a_player_main.cpp diff --git a/src/d/a/d_a_player_npc.cpp b/src/d/actor/d_a_player_npc.cpp similarity index 100% rename from src/d/a/d_a_player_npc.cpp rename to src/d/actor/d_a_player_npc.cpp diff --git a/src/d/a/d_a_pt.cpp b/src/d/actor/d_a_pt.cpp similarity index 100% rename from src/d/a/d_a_pt.cpp rename to src/d/actor/d_a_pt.cpp diff --git a/src/d/a/d_a_pw.cpp b/src/d/actor/d_a_pw.cpp similarity index 100% rename from src/d/a/d_a_pw.cpp rename to src/d/actor/d_a_pw.cpp diff --git a/src/d/a/d_a_pz.cpp b/src/d/actor/d_a_pz.cpp similarity index 100% rename from src/d/a/d_a_pz.cpp rename to src/d/actor/d_a_pz.cpp diff --git a/src/d/a/d_a_race_item.cpp b/src/d/actor/d_a_race_item.cpp similarity index 100% rename from src/d/a/d_a_race_item.cpp rename to src/d/actor/d_a_race_item.cpp diff --git a/src/d/a/d_a_race_item_static.cpp b/src/d/actor/d_a_race_item_static.cpp similarity index 100% rename from src/d/a/d_a_race_item_static.cpp rename to src/d/actor/d_a_race_item_static.cpp diff --git a/src/d/a/d_a_rd.cpp b/src/d/actor/d_a_rd.cpp similarity index 100% rename from src/d/a/d_a_rd.cpp rename to src/d/actor/d_a_rd.cpp diff --git a/src/d/a/d_a_rectangle.cpp b/src/d/actor/d_a_rectangle.cpp similarity index 100% rename from src/d/a/d_a_rectangle.cpp rename to src/d/actor/d_a_rectangle.cpp diff --git a/src/d/a/d_a_sail.cpp b/src/d/actor/d_a_sail.cpp similarity index 100% rename from src/d/a/d_a_sail.cpp rename to src/d/actor/d_a_sail.cpp diff --git a/src/d/a/d_a_saku.cpp b/src/d/actor/d_a_saku.cpp similarity index 100% rename from src/d/a/d_a_saku.cpp rename to src/d/actor/d_a_saku.cpp diff --git a/src/d/a/d_a_salvage.cpp b/src/d/actor/d_a_salvage.cpp similarity index 100% rename from src/d/a/d_a_salvage.cpp rename to src/d/actor/d_a_salvage.cpp diff --git a/src/d/a/d_a_salvage_tbox.cpp b/src/d/actor/d_a_salvage_tbox.cpp similarity index 100% rename from src/d/a/d_a_salvage_tbox.cpp rename to src/d/actor/d_a_salvage_tbox.cpp diff --git a/src/d/a/d_a_sbox.cpp b/src/d/actor/d_a_sbox.cpp similarity index 100% rename from src/d/a/d_a_sbox.cpp rename to src/d/actor/d_a_sbox.cpp diff --git a/src/d/a/d_a_scene_change.cpp b/src/d/actor/d_a_scene_change.cpp similarity index 100% rename from src/d/a/d_a_scene_change.cpp rename to src/d/actor/d_a_scene_change.cpp diff --git a/src/d/a/d_a_sea.cpp b/src/d/actor/d_a_sea.cpp similarity index 100% rename from src/d/a/d_a_sea.cpp rename to src/d/actor/d_a_sea.cpp diff --git a/src/d/a/d_a_seatag.cpp b/src/d/actor/d_a_seatag.cpp similarity index 100% rename from src/d/a/d_a_seatag.cpp rename to src/d/actor/d_a_seatag.cpp diff --git a/src/d/a/d_a_shand.cpp b/src/d/actor/d_a_shand.cpp similarity index 100% rename from src/d/a/d_a_shand.cpp rename to src/d/actor/d_a_shand.cpp diff --git a/src/d/a/d_a_ship.cpp b/src/d/actor/d_a_ship.cpp similarity index 100% rename from src/d/a/d_a_ship.cpp rename to src/d/actor/d_a_ship.cpp diff --git a/src/d/a/d_a_ship_static.cpp b/src/d/actor/d_a_ship_static.cpp similarity index 100% rename from src/d/a/d_a_ship_static.cpp rename to src/d/actor/d_a_ship_static.cpp diff --git a/src/d/a/d_a_shop_item.cpp b/src/d/actor/d_a_shop_item.cpp similarity index 100% rename from src/d/a/d_a_shop_item.cpp rename to src/d/actor/d_a_shop_item.cpp diff --git a/src/d/a/d_a_shop_item_static.cpp b/src/d/actor/d_a_shop_item_static.cpp similarity index 100% rename from src/d/a/d_a_shop_item_static.cpp rename to src/d/actor/d_a_shop_item_static.cpp diff --git a/src/d/a/d_a_shutter.cpp b/src/d/actor/d_a_shutter.cpp similarity index 100% rename from src/d/a/d_a_shutter.cpp rename to src/d/actor/d_a_shutter.cpp diff --git a/src/d/a/d_a_shutter2.cpp b/src/d/actor/d_a_shutter2.cpp similarity index 100% rename from src/d/a/d_a_shutter2.cpp rename to src/d/actor/d_a_shutter2.cpp diff --git a/src/d/a/d_a_sie_flag.cpp b/src/d/actor/d_a_sie_flag.cpp similarity index 100% rename from src/d/a/d_a_sie_flag.cpp rename to src/d/actor/d_a_sie_flag.cpp diff --git a/src/d/a/d_a_sitem.cpp b/src/d/actor/d_a_sitem.cpp similarity index 100% rename from src/d/a/d_a_sitem.cpp rename to src/d/actor/d_a_sitem.cpp diff --git a/src/d/a/d_a_sk.cpp b/src/d/actor/d_a_sk.cpp similarity index 100% rename from src/d/a/d_a_sk.cpp rename to src/d/actor/d_a_sk.cpp diff --git a/src/d/a/d_a_sk2.cpp b/src/d/actor/d_a_sk2.cpp similarity index 100% rename from src/d/a/d_a_sk2.cpp rename to src/d/actor/d_a_sk2.cpp diff --git a/src/d/a/d_a_spc_item01.cpp b/src/d/actor/d_a_spc_item01.cpp similarity index 100% rename from src/d/a/d_a_spc_item01.cpp rename to src/d/actor/d_a_spc_item01.cpp diff --git a/src/d/a/d_a_spotbox.cpp b/src/d/actor/d_a_spotbox.cpp similarity index 100% rename from src/d/a/d_a_spotbox.cpp rename to src/d/actor/d_a_spotbox.cpp diff --git a/src/d/a/d_a_ss.cpp b/src/d/actor/d_a_ss.cpp similarity index 100% rename from src/d/a/d_a_ss.cpp rename to src/d/actor/d_a_ss.cpp diff --git a/src/d/a/d_a_ssk.cpp b/src/d/actor/d_a_ssk.cpp similarity index 100% rename from src/d/a/d_a_ssk.cpp rename to src/d/actor/d_a_ssk.cpp diff --git a/src/d/a/d_a_sss.cpp b/src/d/actor/d_a_sss.cpp similarity index 100% rename from src/d/a/d_a_sss.cpp rename to src/d/actor/d_a_sss.cpp diff --git a/src/d/a/d_a_st.cpp b/src/d/actor/d_a_st.cpp similarity index 100% rename from src/d/a/d_a_st.cpp rename to src/d/actor/d_a_st.cpp diff --git a/src/d/a/d_a_steam_tag.cpp b/src/d/actor/d_a_steam_tag.cpp similarity index 100% rename from src/d/a/d_a_steam_tag.cpp rename to src/d/actor/d_a_steam_tag.cpp diff --git a/src/d/a/d_a_stone.cpp b/src/d/actor/d_a_stone.cpp similarity index 100% rename from src/d/a/d_a_stone.cpp rename to src/d/actor/d_a_stone.cpp diff --git a/src/d/a/d_a_stone2.cpp b/src/d/actor/d_a_stone2.cpp similarity index 100% rename from src/d/a/d_a_stone2.cpp rename to src/d/actor/d_a_stone2.cpp diff --git a/src/d/a/d_a_swattack.cpp b/src/d/actor/d_a_swattack.cpp similarity index 100% rename from src/d/a/d_a_swattack.cpp rename to src/d/actor/d_a_swattack.cpp diff --git a/src/d/a/d_a_swc00.cpp b/src/d/actor/d_a_swc00.cpp similarity index 100% rename from src/d/a/d_a_swc00.cpp rename to src/d/actor/d_a_swc00.cpp diff --git a/src/d/a/d_a_swhit0.cpp b/src/d/actor/d_a_swhit0.cpp similarity index 100% rename from src/d/a/d_a_swhit0.cpp rename to src/d/actor/d_a_swhit0.cpp diff --git a/src/d/a/d_a_switem.cpp b/src/d/actor/d_a_switem.cpp similarity index 100% rename from src/d/a/d_a_switem.cpp rename to src/d/actor/d_a_switem.cpp diff --git a/src/d/a/d_a_swpropeller.cpp b/src/d/actor/d_a_swpropeller.cpp similarity index 100% rename from src/d/a/d_a_swpropeller.cpp rename to src/d/actor/d_a_swpropeller.cpp diff --git a/src/d/a/d_a_swtact.cpp b/src/d/actor/d_a_swtact.cpp similarity index 100% rename from src/d/a/d_a_swtact.cpp rename to src/d/actor/d_a_swtact.cpp diff --git a/src/d/a/d_a_swtdoor.cpp b/src/d/actor/d_a_swtdoor.cpp similarity index 100% rename from src/d/a/d_a_swtdoor.cpp rename to src/d/actor/d_a_swtdoor.cpp diff --git a/src/d/a/d_a_syan.cpp b/src/d/actor/d_a_syan.cpp similarity index 100% rename from src/d/a/d_a_syan.cpp rename to src/d/actor/d_a_syan.cpp diff --git a/src/d/a/d_a_tag_attention.cpp b/src/d/actor/d_a_tag_attention.cpp similarity index 100% rename from src/d/a/d_a_tag_attention.cpp rename to src/d/actor/d_a_tag_attention.cpp diff --git a/src/d/a/d_a_tag_ba1.cpp b/src/d/actor/d_a_tag_ba1.cpp similarity index 100% rename from src/d/a/d_a_tag_ba1.cpp rename to src/d/actor/d_a_tag_ba1.cpp diff --git a/src/d/a/d_a_tag_etc.cpp b/src/d/actor/d_a_tag_etc.cpp similarity index 100% rename from src/d/a/d_a_tag_etc.cpp rename to src/d/actor/d_a_tag_etc.cpp diff --git a/src/d/a/d_a_tag_event.cpp b/src/d/actor/d_a_tag_event.cpp similarity index 100% rename from src/d/a/d_a_tag_event.cpp rename to src/d/actor/d_a_tag_event.cpp diff --git a/src/d/a/d_a_tag_evsw.cpp b/src/d/actor/d_a_tag_evsw.cpp similarity index 100% rename from src/d/a/d_a_tag_evsw.cpp rename to src/d/actor/d_a_tag_evsw.cpp diff --git a/src/d/a/d_a_tag_ghostship.cpp b/src/d/actor/d_a_tag_ghostship.cpp similarity index 100% rename from src/d/a/d_a_tag_ghostship.cpp rename to src/d/actor/d_a_tag_ghostship.cpp diff --git a/src/d/a/d_a_tag_hint.cpp b/src/d/actor/d_a_tag_hint.cpp similarity index 100% rename from src/d/a/d_a_tag_hint.cpp rename to src/d/actor/d_a_tag_hint.cpp diff --git a/src/d/a/d_a_tag_island.cpp b/src/d/actor/d_a_tag_island.cpp similarity index 100% rename from src/d/a/d_a_tag_island.cpp rename to src/d/actor/d_a_tag_island.cpp diff --git a/src/d/a/d_a_tag_kb_item.cpp b/src/d/actor/d_a_tag_kb_item.cpp similarity index 100% rename from src/d/a/d_a_tag_kb_item.cpp rename to src/d/actor/d_a_tag_kb_item.cpp diff --git a/src/d/a/d_a_tag_kf1.cpp b/src/d/actor/d_a_tag_kf1.cpp similarity index 100% rename from src/d/a/d_a_tag_kf1.cpp rename to src/d/actor/d_a_tag_kf1.cpp diff --git a/src/d/a/d_a_tag_kk1.cpp b/src/d/actor/d_a_tag_kk1.cpp similarity index 100% rename from src/d/a/d_a_tag_kk1.cpp rename to src/d/actor/d_a_tag_kk1.cpp diff --git a/src/d/a/d_a_tag_light.cpp b/src/d/actor/d_a_tag_light.cpp similarity index 100% rename from src/d/a/d_a_tag_light.cpp rename to src/d/actor/d_a_tag_light.cpp diff --git a/src/d/a/d_a_tag_md_cb.cpp b/src/d/actor/d_a_tag_md_cb.cpp similarity index 100% rename from src/d/a/d_a_tag_md_cb.cpp rename to src/d/actor/d_a_tag_md_cb.cpp diff --git a/src/d/a/d_a_tag_mk.cpp b/src/d/actor/d_a_tag_mk.cpp similarity index 100% rename from src/d/a/d_a_tag_mk.cpp rename to src/d/actor/d_a_tag_mk.cpp diff --git a/src/d/a/d_a_tag_msg.cpp b/src/d/actor/d_a_tag_msg.cpp similarity index 100% rename from src/d/a/d_a_tag_msg.cpp rename to src/d/actor/d_a_tag_msg.cpp diff --git a/src/d/a/d_a_tag_photo.cpp b/src/d/actor/d_a_tag_photo.cpp similarity index 100% rename from src/d/a/d_a_tag_photo.cpp rename to src/d/actor/d_a_tag_photo.cpp diff --git a/src/d/a/d_a_tag_ret.cpp b/src/d/actor/d_a_tag_ret.cpp similarity index 100% rename from src/d/a/d_a_tag_ret.cpp rename to src/d/actor/d_a_tag_ret.cpp diff --git a/src/d/a/d_a_tag_so.cpp b/src/d/actor/d_a_tag_so.cpp similarity index 100% rename from src/d/a/d_a_tag_so.cpp rename to src/d/actor/d_a_tag_so.cpp diff --git a/src/d/a/d_a_tag_volcano.cpp b/src/d/actor/d_a_tag_volcano.cpp similarity index 100% rename from src/d/a/d_a_tag_volcano.cpp rename to src/d/actor/d_a_tag_volcano.cpp diff --git a/src/d/a/d_a_tag_waterlevel.cpp b/src/d/actor/d_a_tag_waterlevel.cpp similarity index 100% rename from src/d/a/d_a_tag_waterlevel.cpp rename to src/d/actor/d_a_tag_waterlevel.cpp diff --git a/src/d/a/d_a_tama.cpp b/src/d/actor/d_a_tama.cpp similarity index 100% rename from src/d/a/d_a_tama.cpp rename to src/d/actor/d_a_tama.cpp diff --git a/src/d/a/d_a_tbox.cpp b/src/d/actor/d_a_tbox.cpp similarity index 100% rename from src/d/a/d_a_tbox.cpp rename to src/d/actor/d_a_tbox.cpp diff --git a/src/d/a/d_a_title.cpp b/src/d/actor/d_a_title.cpp similarity index 100% rename from src/d/a/d_a_title.cpp rename to src/d/actor/d_a_title.cpp diff --git a/src/d/a/d_a_tn.cpp b/src/d/actor/d_a_tn.cpp similarity index 100% rename from src/d/a/d_a_tn.cpp rename to src/d/actor/d_a_tn.cpp diff --git a/src/d/a/d_a_toge.cpp b/src/d/actor/d_a_toge.cpp similarity index 100% rename from src/d/a/d_a_toge.cpp rename to src/d/actor/d_a_toge.cpp diff --git a/src/d/a/d_a_tori_flag.cpp b/src/d/actor/d_a_tori_flag.cpp similarity index 100% rename from src/d/a/d_a_tori_flag.cpp rename to src/d/actor/d_a_tori_flag.cpp diff --git a/src/d/a/d_a_tornado.cpp b/src/d/actor/d_a_tornado.cpp similarity index 100% rename from src/d/a/d_a_tornado.cpp rename to src/d/actor/d_a_tornado.cpp diff --git a/src/d/a/d_a_tpota.cpp b/src/d/actor/d_a_tpota.cpp similarity index 100% rename from src/d/a/d_a_tpota.cpp rename to src/d/actor/d_a_tpota.cpp diff --git a/src/d/a/d_a_tsubo.cpp b/src/d/actor/d_a_tsubo.cpp similarity index 100% rename from src/d/a/d_a_tsubo.cpp rename to src/d/actor/d_a_tsubo.cpp diff --git a/src/d/a/d_a_vrbox.cpp b/src/d/actor/d_a_vrbox.cpp similarity index 100% rename from src/d/a/d_a_vrbox.cpp rename to src/d/actor/d_a_vrbox.cpp diff --git a/src/d/a/d_a_vrbox2.cpp b/src/d/actor/d_a_vrbox2.cpp similarity index 100% rename from src/d/a/d_a_vrbox2.cpp rename to src/d/actor/d_a_vrbox2.cpp diff --git a/src/d/a/d_a_wall.cpp b/src/d/actor/d_a_wall.cpp similarity index 100% rename from src/d/a/d_a_wall.cpp rename to src/d/actor/d_a_wall.cpp diff --git a/src/d/a/d_a_warpdm20.cpp b/src/d/actor/d_a_warpdm20.cpp similarity index 100% rename from src/d/a/d_a_warpdm20.cpp rename to src/d/actor/d_a_warpdm20.cpp diff --git a/src/d/a/d_a_warpf.cpp b/src/d/actor/d_a_warpf.cpp similarity index 100% rename from src/d/a/d_a_warpf.cpp rename to src/d/actor/d_a_warpf.cpp diff --git a/src/d/a/d_a_warpfout.cpp b/src/d/actor/d_a_warpfout.cpp similarity index 100% rename from src/d/a/d_a_warpfout.cpp rename to src/d/actor/d_a_warpfout.cpp diff --git a/src/d/a/d_a_warpgn.cpp b/src/d/actor/d_a_warpgn.cpp similarity index 100% rename from src/d/a/d_a_warpgn.cpp rename to src/d/actor/d_a_warpgn.cpp diff --git a/src/d/a/d_a_warphr.cpp b/src/d/actor/d_a_warphr.cpp similarity index 100% rename from src/d/a/d_a_warphr.cpp rename to src/d/actor/d_a_warphr.cpp diff --git a/src/d/a/d_a_warpls.cpp b/src/d/actor/d_a_warpls.cpp similarity index 100% rename from src/d/a/d_a_warpls.cpp rename to src/d/actor/d_a_warpls.cpp diff --git a/src/d/a/d_a_warpmj.cpp b/src/d/actor/d_a_warpmj.cpp similarity index 100% rename from src/d/a/d_a_warpmj.cpp rename to src/d/actor/d_a_warpmj.cpp diff --git a/src/d/a/d_a_waterfall.cpp b/src/d/actor/d_a_waterfall.cpp similarity index 100% rename from src/d/a/d_a_waterfall.cpp rename to src/d/actor/d_a_waterfall.cpp diff --git a/src/d/a/d_a_wbird.cpp b/src/d/actor/d_a_wbird.cpp similarity index 100% rename from src/d/a/d_a_wbird.cpp rename to src/d/actor/d_a_wbird.cpp diff --git a/src/d/a/d_a_wind_tag.cpp b/src/d/actor/d_a_wind_tag.cpp similarity index 100% rename from src/d/a/d_a_wind_tag.cpp rename to src/d/actor/d_a_wind_tag.cpp diff --git a/src/d/a/d_a_windmill.cpp b/src/d/actor/d_a_windmill.cpp similarity index 100% rename from src/d/a/d_a_windmill.cpp rename to src/d/actor/d_a_windmill.cpp diff --git a/src/d/a/d_a_wz.cpp b/src/d/actor/d_a_wz.cpp similarity index 100% rename from src/d/a/d_a_wz.cpp rename to src/d/actor/d_a_wz.cpp diff --git a/src/d/a/d_a_ygcwp.cpp b/src/d/actor/d_a_ygcwp.cpp similarity index 100% rename from src/d/a/d_a_ygcwp.cpp rename to src/d/actor/d_a_ygcwp.cpp diff --git a/src/d/a/d_a_ykgr.cpp b/src/d/actor/d_a_ykgr.cpp similarity index 100% rename from src/d/a/d_a_ykgr.cpp rename to src/d/actor/d_a_ykgr.cpp diff --git a/src/d/a/d_a_yougan.cpp b/src/d/actor/d_a_yougan.cpp similarity index 100% rename from src/d/a/d_a_yougan.cpp rename to src/d/actor/d_a_yougan.cpp diff --git a/src/d/bg/d_bg_s.cpp b/src/d/d_bg_s.cpp similarity index 100% rename from src/d/bg/d_bg_s.cpp rename to src/d/d_bg_s.cpp diff --git a/src/d/bg/d_bg_s_acch.cpp b/src/d/d_bg_s_acch.cpp similarity index 100% rename from src/d/bg/d_bg_s_acch.cpp rename to src/d/d_bg_s_acch.cpp diff --git a/src/d/bg/d_bg_s_func.cpp b/src/d/d_bg_s_func.cpp similarity index 100% rename from src/d/bg/d_bg_s_func.cpp rename to src/d/d_bg_s_func.cpp diff --git a/src/d/bg/d_bg_s_lin_chk.cpp b/src/d/d_bg_s_lin_chk.cpp similarity index 100% rename from src/d/bg/d_bg_s_lin_chk.cpp rename to src/d/d_bg_s_lin_chk.cpp diff --git a/src/d/bg/d_bg_s_movebg_actor.cpp b/src/d/d_bg_s_movebg_actor.cpp similarity index 100% rename from src/d/bg/d_bg_s_movebg_actor.cpp rename to src/d/d_bg_s_movebg_actor.cpp diff --git a/src/d/bg/d_bg_s_spl_grp_chk.cpp b/src/d/d_bg_s_spl_grp_chk.cpp similarity index 100% rename from src/d/bg/d_bg_s_spl_grp_chk.cpp rename to src/d/d_bg_s_spl_grp_chk.cpp diff --git a/src/d/bg/d_bg_s_wtr_chk.cpp b/src/d/d_bg_s_wtr_chk.cpp similarity index 100% rename from src/d/bg/d_bg_s_wtr_chk.cpp rename to src/d/d_bg_s_wtr_chk.cpp diff --git a/src/d/bg/d_bg_w.cpp b/src/d/d_bg_w.cpp similarity index 100% rename from src/d/bg/d_bg_w.cpp rename to src/d/d_bg_w.cpp diff --git a/src/d/bg/d_bg_w_deform.cpp b/src/d/d_bg_w_deform.cpp similarity index 100% rename from src/d/bg/d_bg_w_deform.cpp rename to src/d/d_bg_w_deform.cpp diff --git a/src/d/bg/d_bg_w_hf.cpp b/src/d/d_bg_w_hf.cpp similarity index 100% rename from src/d/bg/d_bg_w_hf.cpp rename to src/d/d_bg_w_hf.cpp diff --git a/src/d/bg/d_bg_w_sv.cpp b/src/d/d_bg_w_sv.cpp similarity index 100% rename from src/d/bg/d_bg_w_sv.cpp rename to src/d/d_bg_w_sv.cpp diff --git a/src/d/cc/d_cc_d.cpp b/src/d/d_cc_d.cpp similarity index 100% rename from src/d/cc/d_cc_d.cpp rename to src/d/d_cc_d.cpp diff --git a/src/d/cc/d_cc_mass_s.cpp b/src/d/d_cc_mass_s.cpp similarity index 100% rename from src/d/cc/d_cc_mass_s.cpp rename to src/d/d_cc_mass_s.cpp diff --git a/src/d/cc/d_cc_s.cpp b/src/d/d_cc_s.cpp similarity index 100% rename from src/d/cc/d_cc_s.cpp rename to src/d/d_cc_s.cpp diff --git a/src/d/cc/d_cc_uty.cpp b/src/d/d_cc_uty.cpp similarity index 100% rename from src/d/cc/d_cc_uty.cpp rename to src/d/d_cc_uty.cpp diff --git a/src/d/com/d_com_inf_game.cpp b/src/d/d_com_inf_game.cpp similarity index 100% rename from src/d/com/d_com_inf_game.cpp rename to src/d/d_com_inf_game.cpp diff --git a/src/d/com/d_com_lib_game.cpp b/src/d/d_com_lib_game.cpp similarity index 100% rename from src/d/com/d_com_lib_game.cpp rename to src/d/d_com_lib_game.cpp diff --git a/src/d/com/d_com_static.cpp b/src/d/d_com_static.cpp similarity index 100% rename from src/d/com/d_com_static.cpp rename to src/d/d_com_static.cpp diff --git a/src/d/event/d_event_data.cpp b/src/d/d_event_data.cpp similarity index 100% rename from src/d/event/d_event_data.cpp rename to src/d/d_event_data.cpp diff --git a/src/d/event/d_event_manager.cpp b/src/d/d_event_manager.cpp similarity index 100% rename from src/d/event/d_event_manager.cpp rename to src/d/d_event_manager.cpp diff --git a/src/d/file/d_file_error.cpp b/src/d/d_file_error.cpp similarity index 100% rename from src/d/file/d_file_error.cpp rename to src/d/d_file_error.cpp diff --git a/src/d/file/d_file_select.cpp b/src/d/d_file_select.cpp similarity index 100% rename from src/d/file/d_file_select.cpp rename to src/d/d_file_select.cpp diff --git a/src/d/kankyo/d_kankyo.cpp b/src/d/d_kankyo.cpp similarity index 100% rename from src/d/kankyo/d_kankyo.cpp rename to src/d/d_kankyo.cpp diff --git a/src/d/kankyo/d_kankyo_data.cpp b/src/d/d_kankyo_data.cpp similarity index 100% rename from src/d/kankyo/d_kankyo_data.cpp rename to src/d/d_kankyo_data.cpp diff --git a/src/d/kankyo/d_kankyo_demo.cpp b/src/d/d_kankyo_demo.cpp similarity index 100% rename from src/d/kankyo/d_kankyo_demo.cpp rename to src/d/d_kankyo_demo.cpp diff --git a/src/d/kankyo/d_kankyo_rain.cpp b/src/d/d_kankyo_rain.cpp similarity index 100% rename from src/d/kankyo/d_kankyo_rain.cpp rename to src/d/d_kankyo_rain.cpp diff --git a/src/d/kankyo/d_kankyo_wether.cpp b/src/d/d_kankyo_wether.cpp similarity index 100% rename from src/d/kankyo/d_kankyo_wether.cpp rename to src/d/d_kankyo_wether.cpp diff --git a/src/d/map/d_map.cpp b/src/d/d_map.cpp similarity index 100% rename from src/d/map/d_map.cpp rename to src/d/d_map.cpp diff --git a/src/d/menu/d_menu_cloth.cpp b/src/d/d_menu_cloth.cpp similarity index 100% rename from src/d/menu/d_menu_cloth.cpp rename to src/d/d_menu_cloth.cpp diff --git a/src/d/menu/d_menu_collect.cpp b/src/d/d_menu_collect.cpp similarity index 100% rename from src/d/menu/d_menu_collect.cpp rename to src/d/d_menu_collect.cpp diff --git a/src/d/menu/d_menu_dmap.cpp b/src/d/d_menu_dmap.cpp similarity index 100% rename from src/d/menu/d_menu_dmap.cpp rename to src/d/d_menu_dmap.cpp diff --git a/src/d/menu/d_menu_fmap.cpp b/src/d/d_menu_fmap.cpp similarity index 100% rename from src/d/menu/d_menu_fmap.cpp rename to src/d/d_menu_fmap.cpp diff --git a/src/d/menu/d_menu_fmap2.cpp b/src/d/d_menu_fmap2.cpp similarity index 100% rename from src/d/menu/d_menu_fmap2.cpp rename to src/d/d_menu_fmap2.cpp diff --git a/src/d/menu/d_menu_item.cpp b/src/d/d_menu_item.cpp similarity index 100% rename from src/d/menu/d_menu_item.cpp rename to src/d/d_menu_item.cpp diff --git a/src/d/menu/d_menu_option.cpp b/src/d/d_menu_option.cpp similarity index 100% rename from src/d/menu/d_menu_option.cpp rename to src/d/d_menu_option.cpp diff --git a/src/d/menu/d_menu_save.cpp b/src/d/d_menu_save.cpp similarity index 100% rename from src/d/menu/d_menu_save.cpp rename to src/d/d_menu_save.cpp diff --git a/src/d/menu/d_menu_window.cpp b/src/d/d_menu_window.cpp similarity index 100% rename from src/d/menu/d_menu_window.cpp rename to src/d/d_menu_window.cpp diff --git a/src/d/message/d_message.cpp b/src/d/d_message.cpp similarity index 100% rename from src/d/message/d_message.cpp rename to src/d/d_message.cpp diff --git a/src/d/message/d_message_paper.cpp b/src/d/d_message_paper.cpp similarity index 100% rename from src/d/message/d_message_paper.cpp rename to src/d/d_message_paper.cpp diff --git a/src/d/minigame/d_minigame_starter.cpp b/src/d/d_minigame_starter.cpp similarity index 100% rename from src/d/minigame/d_minigame_starter.cpp rename to src/d/d_minigame_starter.cpp diff --git a/src/d/minigame/d_minigame_terminater.cpp b/src/d/d_minigame_terminater.cpp similarity index 100% rename from src/d/minigame/d_minigame_terminater.cpp rename to src/d/d_minigame_terminater.cpp diff --git a/src/d/ovlp/d_ovlp_fade.cpp b/src/d/d_ovlp_fade.cpp similarity index 100% rename from src/d/ovlp/d_ovlp_fade.cpp rename to src/d/d_ovlp_fade.cpp diff --git a/src/d/ovlp/d_ovlp_fade2.cpp b/src/d/d_ovlp_fade2.cpp similarity index 100% rename from src/d/ovlp/d_ovlp_fade2.cpp rename to src/d/d_ovlp_fade2.cpp diff --git a/src/d/ovlp/d_ovlp_fade3.cpp b/src/d/d_ovlp_fade3.cpp similarity index 100% rename from src/d/ovlp/d_ovlp_fade3.cpp rename to src/d/d_ovlp_fade3.cpp diff --git a/src/d/ovlp/d_ovlp_fade4.cpp b/src/d/d_ovlp_fade4.cpp similarity index 100% rename from src/d/ovlp/d_ovlp_fade4.cpp rename to src/d/d_ovlp_fade4.cpp diff --git a/src/d/particle/d_particle.cpp b/src/d/d_particle.cpp similarity index 100% rename from src/d/particle/d_particle.cpp rename to src/d/d_particle.cpp diff --git a/src/d/particle/d_particle_name.cpp b/src/d/d_particle_name.cpp similarity index 100% rename from src/d/particle/d_particle_name.cpp rename to src/d/d_particle_name.cpp diff --git a/src/d/s/d_s_actor_data_mng.cpp b/src/d/d_s_actor_data_mng.cpp similarity index 100% rename from src/d/s/d_s_actor_data_mng.cpp rename to src/d/d_s_actor_data_mng.cpp diff --git a/src/d/s/d_s_logo.cpp b/src/d/d_s_logo.cpp similarity index 100% rename from src/d/s/d_s_logo.cpp rename to src/d/d_s_logo.cpp diff --git a/src/d/s/d_s_menu.cpp b/src/d/d_s_menu.cpp similarity index 100% rename from src/d/s/d_s_menu.cpp rename to src/d/d_s_menu.cpp diff --git a/src/d/s/d_s_name.cpp b/src/d/d_s_name.cpp similarity index 100% rename from src/d/s/d_s_name.cpp rename to src/d/d_s_name.cpp diff --git a/src/d/s/d_s_open.cpp b/src/d/d_s_open.cpp similarity index 100% rename from src/d/s/d_s_open.cpp rename to src/d/d_s_open.cpp diff --git a/src/d/s/d_s_open_sub.cpp b/src/d/d_s_open_sub.cpp similarity index 100% rename from src/d/s/d_s_open_sub.cpp rename to src/d/d_s_open_sub.cpp diff --git a/src/d/s/d_s_play.cpp b/src/d/d_s_play.cpp similarity index 100% rename from src/d/s/d_s_play.cpp rename to src/d/d_s_play.cpp diff --git a/src/d/s/d_s_room.cpp b/src/d/d_s_room.cpp similarity index 100% rename from src/d/s/d_s_room.cpp rename to src/d/d_s_room.cpp diff --git a/src/d/s/d_s_title.cpp b/src/d/d_s_title.cpp similarity index 100% rename from src/d/s/d_s_title.cpp rename to src/d/d_s_title.cpp diff --git a/src/d/save/d_save.cpp b/src/d/d_save.cpp similarity index 100% rename from src/d/save/d_save.cpp rename to src/d/d_save.cpp diff --git a/src/d/save/d_save_init.cpp b/src/d/d_save_init.cpp similarity index 100% rename from src/d/save/d_save_init.cpp rename to src/d/d_save_init.cpp From c85d24dd70271d471eada3537f4e4f3680943b78 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 9 Sep 2023 18:10:12 -0700 Subject: [PATCH 4/4] more match work --- configure.py | 5 + include/d/d_com_lib_game.h | 8 + include/d/d_particle_name.h | 11 + include/d/d_procname.h | 509 +++++++++++++++++++++++++++++++++ include/d/d_s_play.h | 19 ++ include/f_op/f_op_camera.h | 17 ++ include/f_op/f_op_camera_mng.h | 76 +++++ include/f_op/f_op_kankyo.h | 24 ++ include/f_op/f_op_kankyo_mng.h | 27 ++ include/f_op/f_op_msg.h | 25 ++ include/f_op/f_op_msg_mng.h | 67 +++++ include/f_pc/f_pc_leaf.h | 2 +- include/f_pc/f_pc_manager.h | 2 +- src/d/d_com_lib_game.cpp | 20 +- src/d/d_particle_name.cpp | 21 +- src/d/d_s_title.cpp | 54 +++- src/f_op/f_op_camera_mng.cpp | 16 +- src/f_op/f_op_draw_iter.cpp | 38 ++- src/f_op/f_op_kankyo.cpp | 2 +- src/f_op/f_op_kankyo_mng.cpp | 89 ++++-- src/f_op/f_op_msg.cpp | 78 ++++- 21 files changed, 1049 insertions(+), 61 deletions(-) create mode 100644 include/d/d_com_lib_game.h create mode 100644 include/d/d_particle_name.h create mode 100644 include/d/d_procname.h create mode 100644 include/d/d_s_play.h create mode 100644 include/f_op/f_op_camera.h create mode 100644 include/f_op/f_op_camera_mng.h create mode 100644 include/f_op/f_op_kankyo.h create mode 100644 include/f_op/f_op_kankyo_mng.h create mode 100644 include/f_op/f_op_msg.h create mode 100644 include/f_op/f_op_msg_mng.h diff --git a/configure.py b/configure.py index b5e0bac..57ce8f2 100644 --- a/configure.py +++ b/configure.py @@ -224,6 +224,8 @@ LIBS = [ Matching ("f_op/f_op_scene_tag.cpp"), Matching ("f_op/f_op_view.cpp"), NonMatching("f_op/f_op_kankyo.cpp"), + Matching ("f_op/f_op_msg.cpp"), + NonMatching("f_op/f_op_kankyo_mng.cpp"), NonMatching("f_op/f_op_msg_mng.cpp"), NonMatching("f_op/f_op_draw_iter.cpp"), Matching ("f_op/f_op_draw_tag.cpp"), @@ -264,6 +266,9 @@ LIBS = [ NonMatching("m_Do/m_Do_controller_pad.cpp"), # dolzel + NonMatching("d/d_com_lib_game.cpp"), + Matching ("d/d_particle_name.cpp"), + NonMatching("d/d_s_title.cpp"), ], }, ] diff --git a/include/d/d_com_lib_game.h b/include/d/d_com_lib_game.h new file mode 100644 index 0000000..baf163b --- /dev/null +++ b/include/d/d_com_lib_game.h @@ -0,0 +1,8 @@ +#ifndef D_COM_LIB_GAME +#define D_COM_LIB_GAME + +#include "SSystem/SComponent/c_phase.h" + +int dComLbG_PhaseHandler(request_of_phase_process_class*, request_of_phase_process_fn*, void*); + +#endif /* D_COM_LIB_GAME */ diff --git a/include/d/d_particle_name.h b/include/d/d_particle_name.h new file mode 100644 index 0000000..36d0e61 --- /dev/null +++ b/include/d/d_particle_name.h @@ -0,0 +1,11 @@ +#ifndef D_PARTICLE_NAME +#define D_PARTICLE_NAME + +#include "dolphin/types.h" + +namespace dPa_name { + u16 j_o_id[]; + u16 s_o_id[]; +} + +#endif /* D_PARTICLE_NAME */ diff --git a/include/d/d_procname.h b/include/d/d_procname.h new file mode 100644 index 0000000..a6bb37d --- /dev/null +++ b/include/d/d_procname.h @@ -0,0 +1,509 @@ +#ifndef D_PROCNAME_H +#define D_PROCNAME_H + +enum { + PROC_OVERLAP0 = 0x0000, + PROC_OVERLAP1 = 0x0001, + PROC_OVERLAP6 = 0x0002, + PROC_OVERLAP7 = 0x0003, + PROC_OVERLAP8 = 0x0004, + PROC_LOGO_SCENE = 0x0005, + PROC_MENU_SCENE = 0x0006, + PROC_PLAY_SCENE = 0x0007, + PROC_OPENING_SCENE = 0x0008, + PROC_OPENING2_SCENE = 0x0009, + PROC_TITLE_SCENE = 0x000A, + PROC_ENDING_SCENE = 0x000B, + PROC_NAME_SCENE = 0x000C, + PROC_NAMEEX_SCENE = 0x000D, + PROC_OPEN_SCENE = 0x000E, + PROC_OPEN2_SCENE = 0x000F, + PROC_OVERLAP2 = 0x0010, + PROC_OVERLAP3 = 0x0011, + PROC_OVERLAP4 = 0x0012, + PROC_OVERLAP5 = 0x0013, + PROC_ROOM_SCENE = 0x0014, + PROC_KANKYO = 0x0015, + PROC_ALLDIE = 0x0016, + PROC_ENVSE = 0x0017, + PROC_WIND_ARROW = 0x0018, + PROC_WPOT_WATER = 0x0019, + PROC_LEVEL_SE = 0x001A, + PROC_THROWSTONE = 0x001B, + PROC_TAG_EVSW = 0x001C, + PROC_Obj_Swpush = 0x001D, + PROC_Obj_Swheavy = 0x001E, + PROC_Obj_Swflat = 0x001F, + PROC_Obj_Swlight = 0x0020, + PROC_Obj_Swhammer = 0x0021, + PROC_Obj_Quake = 0x0022, + PROC_Obj_Drift = 0x0023, + PROC_Tag_Volcano = 0x0024, + PROC_TAG_SO = 0x0025, + PROC_Obj_Pbco = 0x0026, + PROC_SEATAG = 0x0027, + PROC_SEA = 0x0028, + PROC_Obj_Tide = 0x0029, + PROC_Hmlif = 0x002A, + PROC_SCENECHG = 0x002B, + PROC_Obj_Magmarock = 0x002C, + PROC_Obj_Movebox = 0x002D, + PROC_Obj_Tribox = 0x002E, + PROC_Obj_Shelf = 0x002F, + PROC_Obj_Hlift = 0x0030, + PROC_Obj_Hami2 = 0x0031, + PROC_Obj_Hami3 = 0x0032, + PROC_Obj_Hami4 = 0x0033, + PROC_Obj_Hbrf1 = 0x0034, + PROC_Obj_Volcano = 0x0035, + PROC_Obj_Vmc = 0x0036, + PROC_Obj_Usovmc = 0x0037, + PROC_Obj_Vfan = 0x0038, + PROC_Obj_Iceisland = 0x0039, + PROC_Obj_Dragonhead = 0x003A, + PROC_Obj_Pirateship = 0x003B, + PROC_Obj_Tousekiki = 0x003C, + PROC_Tag_Ret = 0x003D, + PROC_Kaji = 0x003E, + PROC_Canon = 0x003F, + PROC_MGBOARD = 0x0040, + PROC_OBJ_CANON = 0x0041, + PROC_OBJ_OTBLE = 0x0042, + PROC_OBJ_WARPT = 0x0043, + PROC_OBJ_SEARCH = 0x0044, + PROC_OBJ_TORIPOST = 0x0045, + PROC_OBJ_IKADA = 0x0046, + PROC_OBJ_MJDOOR = 0x0047, + PROC_OBJ_PFALL = 0x0048, + PROC_OBJ_HOLE = 0x0049, + PROC_Obj_Stair = 0x004A, + PROC_Obj_Lpalm = 0x004B, + PROC_Obj_Mtest = 0x004C, + PROC_Obj_Mkie = 0x004D, + PROC_Obj_Mkiek = 0x004E, + PROC_Obj_MknjD = 0x004F, + PROC_Obj_Msdan = 0x0050, + PROC_Obj_MsdanSub = 0x0051, + PROC_Obj_Msdan2 = 0x0052, + PROC_Obj_MsdanSub2 = 0x0053, + PROC_Obj_Nest = 0x0054, + PROC_Obj_Ojtree = 0x0055, + PROC_Obj_Ospbox = 0x0056, + PROC_Obj_Ladder = 0x0057, + PROC_Obj_Smplbg = 0x0058, + PROC_Obj_Akabe = 0x0059, + PROC_Obj_Ashut = 0x005A, + PROC_BRIDGE = 0x005B, + PROC_MSW = 0x005C, + PROC_MFLFT = 0x005D, + PROC_KLFT = 0x005E, + PROC_ICE_LIFT = 0x005F, + PROC_AMI_PROP = 0x0060, + PROC_PEDESTAL = 0x0061, + PROC_FLOOR = 0x0062, + PROC_KITA = 0x0063, + PROC_KOKIIE = 0x0064, + PROC_SHAND = 0x0065, + PROC_BITA = 0x0066, + PROC_SK = 0x0067, + PROC_SK2 = 0x0068, + PROC_SSK = 0x0069, + PROC_WARPFLOWER = 0x006A, + PROC_WARPFOUT = 0x006B, + PROC_WARPLIGHT = 0x006C, + PROC_WARPHYRULE = 0x006D, + PROC_WARPDEMO20 = 0x006E, + PROC_WARPGANON = 0x006F, + PROC_WARPMAJYUU = 0x0070, + PROC_Balancelift = 0x0071, + PROC_SHUTTER = 0x0072, + PROC_SHUTTER2 = 0x0073, + PROC_WINDMILL = 0x0074, + PROC_MBDOOR = 0x0075, + PROC_NPC_DE1 = 0x0076, + PROC_NPC_NZ = 0x0077, + PROC_NPC_SO = 0x0078, + PROC_FM = 0x0079, + PROC_LEAF_LIFT = 0x007A, + PROC_Obj_Roten = 0x007B, + PROC_TOGE = 0x007C, + PROC_Obj_Ferris = 0x007D, + PROC_Obj_Xfuta = 0x007E, + PROC_Obj_Gaship = 0x007F, + PROC_Obj_Rforce = 0x0080, + PROC_Obj_Gaship2 = 0x0081, + PROC_Obj_Light = 0x0082, + PROC_Obj_Homen = 0x0083, + PROC_Obj_Homensmk = 0x0084, + PROC_Obj_Ftree = 0x0085, + PROC_Obj_Vds = 0x0086, + PROC_Obj_Vyasi = 0x0087, + PROC_Obj_Ajav = 0x0088, + PROC_Obj_Trap = 0x0089, + PROC_Obj_Hha = 0x008A, + PROC_Obj_Htetu1 = 0x008B, + PROC_Obj_Gnntakis = 0x008C, + PROC_Obj_Gnntakie = 0x008D, + PROC_Obj_Gnnbtaki = 0x008E, + PROC_Obj_Rcloud = 0x008F, + PROC_Obj_Gryw00 = 0x0090, + PROC_Obj_AjavW = 0x0091, + PROC_Obj_Leaves = 0x0092, + PROC_Obj_YLzou = 0x0093, + PROC_Obj_Gbed = 0x0094, + PROC_Obj_Vteng = 0x0095, + PROC_Obj_Hfuck1 = 0x0096, + PROC_Obj_Ohatch = 0x0097, + PROC_Obj_Hcbh = 0x0098, + PROC_Obj_Ygush00 = 0x0099, + PROC_Obj_Bscurtain = 0x009A, + PROC_Obj_Shmrgrd = 0x009B, + PROC_Obj_Eayogn = 0x009C, + PROC_Obj_Vmsms = 0x009D, + PROC_Obj_Vmsdz = 0x009E, + PROC_Ygcwp = 0x009F, + PROC_Obj_Vgnfd = 0x00A0, + PROC_Obj_Kanoke = 0x00A1, + PROC_Obj_Eskban = 0x00A2, + PROC_Obj_Ekskz = 0x00A3, + PROC_Obj_Ebomzo = 0x00A4, + PROC_Obj_Kanat = 0x00A5, + PROC_Obj_Aygr = 0x00A6, + PROC_SHIP = 0x00A7, + PROC_Obj_Jump = 0x00A8, + PROC_PLAYER = 0x00A9, + PROC_HOOKSHOT = 0x00AA, + PROC_NPC_MK = 0x00AB, + PROC_GRID = 0x00AC, + PROC_SAIL = 0x00AD, + PROC_PIRATE_FLAG = 0x00AE, + PROC_MAJUU_FLAG = 0x00AF, + PROC_Tori_Flag = 0x00B0, + PROC_Sie_Flag = 0x00B1, + PROC_SYAN = 0x00B2, + PROC_AYUSH = 0x00B3, + PROC_OSHIP = 0x00B4, + PROC_RECTANGLE = 0x00B5, + PROC_BB = 0x00B6, + PROC_KANBAN = 0x00B7, + PROC_HITOBJ = 0x00B8, + PROC_KT = 0x00B9, + PROC_EP = 0x00BA, + PROC_LAMP = 0x00BB, + PROC_FF = 0x00BC, + PROC_MO2 = 0x00BD, + PROC_BK = 0x00BE, + PROC_ST = 0x00BF, + PROC_TN = 0x00C0, + PROC_MANT = 0x00C1, + PROC_KANTERA = 0x00C2, + PROC_KAMOME = 0x00C3, + PROC_NPC_KAM = 0x00C4, + PROC_WBIRD = 0x00C5, + PROC_DEMO_KMM = 0x00C6, + PROC_NZ = 0x00C7, + PROC_NZG = 0x00C8, + PROC_KN = 0x00C9, + PROC_DEMO_DK = 0x00CA, + PROC_AM = 0x00CB, + PROC_AM2 = 0x00CC, + PROC_GM = 0x00CD, + PROC_KS = 0x00CE, + PROC_CC = 0x00CF, + PROC_BL = 0x00D0, + PROC_WZ = 0x00D1, + PROC_PH = 0x00D2, + PROC_PZ = 0x00D3, + PROC_BPW = 0x00D4, + PROC_PW = 0x00D5, + PROC_JBO = 0x00D6, + PROC_BO = 0x00D7, + PROC_KI = 0x00D8, + PROC_MT = 0x00D9, + PROC_BWD = 0x00DA, + PROC_BWDS = 0x00DB, + PROC_BWDG = 0x00DC, + PROC_KB = 0x00DD, + PROC_ESA = 0x00DE, + PROC_DR = 0x00DF, + PROC_DR2 = 0x00E0, + PROC_RD = 0x00E1, + PROC_DAIOCTA = 0x00E2, + PROC_DAIOCTA_EYE = 0x00E3, + PROC_OQ = 0x00E4, + PROC_GY = 0x00E5, + PROC_GY_CTRL = 0x00E6, + PROC_GY_CTRLB = 0x00E7, + PROC_Hot_Floor = 0x00E8, + PROC_Beam = 0x00E9, + PROC_Bemos = 0x00EA, + PROC_BTD = 0x00EB, + PROC_BMD = 0x00EC, + PROC_BMDHAND = 0x00ED, + PROC_BMDFOOT = 0x00EE, + PROC_DK = 0x00EF, + PROC_BDK = 0x00F0, + PROC_BDKOBJ = 0x00F1, + PROC_BST = 0x00F2, + PROC_FGANON = 0x00F3, + PROC_FGMAHOU = 0x00F4, + PROC_BGN = 0x00F5, + PROC_BGN2 = 0x00F6, + PROC_BGN3 = 0x00F7, + PROC_GND = 0x00F8, + PROC_PT = 0x00F9, + PROC_SWTDOOR = 0x00FA, + PROC_MOZO = 0x00FB, + PROC_KUI = 0x00FC, + PROC_SS = 0x00FD, + PROC_SSS = 0x00FE, + PROC_SITEM = 0x00FF, + PROC_MACHINE = 0x0100, + PROC_ITEM = 0x0101, + PROC_BOSSITEM = 0x0102, + PROC_Demo_Item = 0x0103, + PROC_RACEITEM = 0x0104, + PROC_ShopItem = 0x0105, + PROC_DEKU_ITEM = 0x0106, + PROC_SPC_ITEM01 = 0x0107, + PROC_Obj_Paper = 0x0108, + PROC_Obj_Demo_Barrel = 0x0109, + PROC_Obj_Dmgroom = 0x010A, + PROC_Obj_Doguu = 0x010B, + PROC_Obj_Wood = 0x010C, + PROC_Obj_Flame = 0x010D, + PROC_Obj_Buoyrace = 0x010E, + PROC_Obj_Coming = 0x010F, + PROC_Coming2 = 0x0110, + PROC_Coming3 = 0x0111, + PROC_Obj_Mmrr = 0x0112, + PROC_Obj_Pbka = 0x0113, + PROC_Obj_Plant = 0x0114, + PROC_Obj_Gtaki = 0x0115, + PROC_Obj_Yboil = 0x0116, + PROC_Obj_Rflw = 0x0117, + PROC_Obj_Table = 0x0118, + PROC_Obj_Tenmado = 0x0119, + PROC_Obj_Cafelmp = 0x011A, + PROC_Obj_Apzl = 0x011B, + PROC_Obj_Adnno = 0x011C, + PROC_Obj_Auzu = 0x011D, + PROC_Obj_Gong = 0x011E, + PROC_Obj_Barrier = 0x011F, + PROC_Obj_Firewall = 0x0120, + PROC_Obj_TnTrap = 0x0121, + PROC_Obj_Monument = 0x0122, + PROC_Obj_Tapestry = 0x0123, + PROC_Obj_HSH = 0x0124, + PROC_Goal_Flag = 0x0125, + PROC_TBOX = 0x0126, + PROC_SBOX = 0x0127, + PROC_BOMB = 0x0128, + PROC_Bomb2 = 0x0129, + PROC_BOMB_FLOWER = 0x012A, + PROC_ACORN_LEAF = 0x012B, + PROC_SWC00 = 0x012C, + PROC_FAN = 0x012D, + PROC_DOOR10 = 0x012E, + PROC_DOOR12 = 0x012F, + PROC_ATDOOR = 0x0130, + PROC_MDOOR = 0x0131, + PROC_KDDOOR = 0x0132, + PROC_KNOB00 = 0x0133, + PROC_MTOGE = 0x0134, + PROC_ANDSW0 = 0x0135, + PROC_ANDSW2 = 0x0136, + PROC_DAI = 0x0137, + PROC_SW_ATTACK = 0x0138, + PROC_SW_ITEM = 0x0139, + PROC_SW_TACT = 0x013A, + PROC_NH = 0x013B, + PROC_NPC_OS = 0x013C, + PROC_NPC_YM1 = 0x013D, + PROC_NPC_YM2 = 0x013E, + PROC_NPC_YW1 = 0x013F, + PROC_NPC_JI1 = 0x0140, + PROC_NPC_KO1 = 0x0141, + PROC_NPC_KO2 = 0x0142, + PROC_NPC_LS1 = 0x0143, + PROC_NPC_P1 = 0x0144, + PROC_NPC_P2 = 0x0145, + PROC_NPC_SARACE = 0x0146, + PROC_NPC_TC = 0x0147, + PROC_NPC_BM1 = 0x0148, + PROC_NPC_BM2 = 0x0149, + PROC_NPC_BM3 = 0x014A, + PROC_NPC_BM4 = 0x014B, + PROC_NPC_BM5 = 0x014C, + PROC_NPC_OB1 = 0x014D, + PROC_NPC_AJ1 = 0x014E, + PROC_NPC_KM1 = 0x014F, + PROC_NPC_CB1 = 0x0150, + PROC_NPC_BA1 = 0x0151, + PROC_NPC_BJ1 = 0x0152, + PROC_NPC_BJ2 = 0x0153, + PROC_NPC_BJ3 = 0x0154, + PROC_NPC_BJ4 = 0x0155, + PROC_NPC_BJ5 = 0x0156, + PROC_NPC_BJ6 = 0x0157, + PROC_NPC_BJ7 = 0x0158, + PROC_NPC_BJ8 = 0x0159, + PROC_NPC_BJ9 = 0x015A, + PROC_NPC_BS1 = 0x015B, + PROC_NPC_BMCON1 = 0x015C, + PROC_NPC_BMS1 = 0x015D, + PROC_NPC_BMSW = 0x015E, + PROC_NPC_BTSW = 0x015F, + PROC_NPC_BTSW2 = 0x0160, + PROC_NPC_DS1 = 0x0161, + PROC_NPC_RSH1 = 0x0162, + PROC_NPC_KK1 = 0x0163, + PROC_NPC_PM1 = 0x0164, + PROC_NPC_KP1 = 0x0165, + PROC_NPC_PF1 = 0x0166, + PROC_NPC_GP1 = 0x0167, + PROC_NPC_JB1 = 0x0168, + PROC_NPC_KF1 = 0x0169, + PROC_NPC_FA1 = 0x016A, + PROC_NPC_AUCTION = 0x016B, + PROC_NPC_KG1 = 0x016C, + PROC_NPC_KG2 = 0x016D, + PROC_NPC_TT = 0x016E, + PROC_NPC_HR = 0x016F, + PROC_NPC_HO = 0x0170, + PROC_NPC_MD = 0x0171, + PROC_NPC_UK = 0x0172, + PROC_BIGELF = 0x0173, + PROC_NPC_CO1 = 0x0174, + PROC_NPC_ZK1 = 0x0175, + PROC_NPC_ROTEN = 0x0176, + PROC_NPC_PEOPLE = 0x0177, + PROC_NPC_GK1 = 0x0178, + PROC_NPC_PHOTO = 0x0179, + PROC_NPC_AC1 = 0x017A, + PROC_NPC_HI1 = 0x017B, + PROC_NPC_SV = 0x017C, + PROC_NPC_MT = 0x017D, + PROC_NPC_MN = 0x017E, + PROC_NPC_AH = 0x017F, + PROC_AUCTION = 0x0180, + PROC_KYTAG00 = 0x0181, + PROC_KYTAG01 = 0x0182, + PROC_KYTAG02 = 0x0183, + PROC_KYTAG03 = 0x0184, + PROC_KYTAG04 = 0x0185, + PROC_KYTAG05 = 0x0186, + PROC_KYTAG06 = 0x0187, + PROC_KYTAG07 = 0x0188, + PROC_WindTag = 0x0189, + PROC_YOUGAN = 0x018A, + PROC_Mmusic = 0x018B, + PROC_Komore = 0x018C, + PROC_Tpota = 0x018D, + PROC_Obj_Itnak = 0x018E, + PROC_Obj_Zouk = 0x018F, + PROC_Ykgr = 0x0190, + PROC_SAKU = 0x0191, + PROC_Iball = 0x0192, + PROC_DISAPPEAR = 0x0193, + PROC_Salvage = 0x0194, + PROC_SALVAGE_TBOX = 0x0195, + PROC_Kmon = 0x0196, + PROC_OBJ_FIGURE = 0x0197, + PROC_OBJ_HAT = 0x0198, + PROC_DEMO00 = 0x0199, + PROC_Lwood = 0x019A, + PROC_Dummy = 0x019B, + PROC_TAG_EVENT = 0x019C, + PROC_TAG_HINT = 0x019D, + PROC_TAG_MSG = 0x019E, + PROC_TAG_ETC = 0x019F, + PROC_TAG_ISLAND = 0x01A0, + PROC_TAG_KF1 = 0x01A1, + PROC_TAG_KK1 = 0x01A2, + PROC_TAG_PHOTO = 0x01A3, + PROC_TAG_KB_ITEM = 0x01A4, + PROC_TAG_MK = 0x01A5, + PROC_TAG_MDCB = 0x01A6, + PROC_TAG_BA1 = 0x01A7, + PROC_TagRock = 0x01A8, + PROC_FallRock = 0x01A9, + PROC_SteamTag = 0x01AA, + PROC_Fire = 0x01AB, + PROC_BRANCH = 0x01AC, + PROC_NPC_ZL1 = 0x01AD, + PROC_WATERFALL = 0x01AE, + PROC_LIGHTBRIDGE = 0x01AF, + PROC_LIGHTSTAIR = 0x01B0, + PROC_WALL = 0x01B1, + PROC_SW_PROPELLER = 0x01B2, + PROC_IKARI = 0x01B3, + PROC_BOOMERANG = 0x01B4, + PROC_AGB = 0x01B5, + PROC_AGBSW0 = 0x01B6, + PROC_MAGMA = 0x01B7, + PROC_GRASS = 0x01B8, + PROC_KY_THUNDER = 0x01B9, + PROC_VRBOX = 0x01BA, + PROC_VRBOX2 = 0x01BB, + PROC_BG = 0x01BC, + PROC_Obj_Tower = 0x01BD, + PROC_Obj_DoguuD = 0x01BE, + PROC_SPOTBOX = 0x01BF, + PROC_TORNADO = 0x01C0, + PROC_TITLE = 0x01C1, + PROC_MP = 0x01C2, + PROC_LODBG = 0x01C3, + PROC_HIMO2 = 0x01C4, + PROC_HIMO3 = 0x01C5, + PROC_ATT = 0x01C6, + PROC_WPILLAR = 0x01C7, + PROC_Hys = 0x01C8, + PROC_SWHIT0 = 0x01C9, + PROC_TAG_GSHIP = 0x01CA, + PROC_TSUBO = 0x01CB, + PROC_STONE = 0x01CC, + PROC_Stone2 = 0x01CD, + PROC_Obj_Barrel = 0x01CE, + PROC_Obj_Barrel2 = 0x01CF, + PROC_Obj_Try = 0x01D0, + PROC_Obj_Vtil = 0x01D1, + PROC_Obj_Ice = 0x01D2, + PROC_Obj_Mshokki = 0x01D3, + PROC_STANDITEM = 0x01D4, + PROC_BOKO = 0x01D5, + PROC_TAMA = 0x01D6, + PROC_Obj_Buoyflag = 0x01D7, + PROC_Obj_Correct = 0x01D8, + PROC_Obj_Eff = 0x01D9, + PROC_WATER_MARK = 0x01DA, + PROC_Tag_Light = 0x01DB, + PROC_Tag_Attention = 0x01DC, + PROC_Tag_Waterlevel = 0x01DD, + PROC_ARROW = 0x01DE, + PROC_ARROW_ICEEFF = 0x01DF, + PROC_ARROW_LIGHTEFF = 0x01E0, + PROC_Obj_Timer = 0x01E1, + PROC_CAMERA = 0x01E2, + PROC_CAMERA2 = 0x01E3, + PROC_KYEFF = 0x01E4, + PROC_KYEFF2 = 0x01E5, + PROC_MESG = 0x01E6, + PROC_MSG = 0x01E7, + PROC_MSG2 = 0x01E8, + PROC_MSG3 = 0x01E9, + PROC_MENUWINDOW = 0x01EA, + PROC_Menu_Cloth = 0x01EB, + PROC_TIMER = 0x01EC, + PROC_AUCTION_SCREEN = 0x01ED, + PROC_PLACE_NAME = 0x01EE, + PROC_MINIGAME_STARTER = 0x01EF, + PROC_MINIGAME_TERMINATER = 0x01F0, + PROC_METER = 0x01F1, + PROC_OPERATE_WIND = 0x01F2, + PROC_SCP = 0x01F3, + PROC_PB = 0x01F4, + PROC_GAMEOVER = 0x01F5, +}; + +#endif /* D_PROCNAME_H */ diff --git a/include/d/d_s_play.h b/include/d/d_s_play.h new file mode 100644 index 0000000..cb4884f --- /dev/null +++ b/include/d/d_s_play.h @@ -0,0 +1,19 @@ +#ifndef D_S_PLAY +#define D_S_PLAY + +#include "f_op/f_op_scene.h" + +class dScnPly_ply_c : public scene_class { +public: + s8 calcPauseTimer(); + bool resetGame(); + void offReset(); + + static bool isPause() { return pauseTimer == 0; } + static void setPauseTimer(s8 time) { pauseTimer = time; } + + static s8 pauseTimer; + static s8 nextPauseTimer; +}; + +#endif /* D_S_PLAY */ diff --git a/include/f_op/f_op_camera.h b/include/f_op/f_op_camera.h new file mode 100644 index 0000000..9ae93e4 --- /dev/null +++ b/include/f_op/f_op_camera.h @@ -0,0 +1,17 @@ +#ifndef F_F_OP_CAMERA_H_ +#define F_F_OP_CAMERA_H_ + +#include "f_op/f_op_view.h" + +class camera_class; + +struct camera_process_profile_definition { + /* 0x00 */ view_process_profile_definition mBase; + /* 0x3C */ leafdraw_method_class* mSubMtd; // Subclass methods +}; + +static s32 fopCam_Draw(camera_class* param_1); +static int fopCam_Execute(camera_class* pCamera); +int fopCam_IsDelete(camera_class* pCamera); + +#endif diff --git a/include/f_op/f_op_camera_mng.h b/include/f_op/f_op_camera_mng.h new file mode 100644 index 0000000..e07c521 --- /dev/null +++ b/include/f_op/f_op_camera_mng.h @@ -0,0 +1,76 @@ +#ifndef F_F_OP_CAMERA_MNG_H_ +#define F_F_OP_CAMERA_MNG_H_ + +#include "SSystem/SComponent/c_phase.h" +#include "SSystem/SComponent/c_sxyz.h" +#include "dolphin/types.h" +#include "f_op/f_op_view.h" + +struct dCamera_c { + u8 m_[0x800]; +}; + +typedef struct leafdraw_method_class leafdraw_method_class; + +class camera_process_class : public view_class { +public: + /* 0x210 */ create_tag_class mCreateTag; + /* 0x224 */ leafdraw_method_class* mpMtd; + /* 0x228 */ u8 field_0x228[4]; + /* 0x22C */ s8 mPrm1; + /* 0x22D */ s8 mPrm2; + /* 0x22E */ s8 mPrm3; + /* 0x22F */ s8 field_0x22f; + /* 0x230 */ csXyz mAngle; + /* 0x238 */ int field_0x238; +}; + +class camera_class : public camera_process_class { +public: + /* 0x23C */ int field_0x23c; + /* 0x240 */ request_of_phase_process_class mPhaseReq; + /* 0x248 */ dCamera_c mCamera; +}; + +/* void fopCamM_SetNear(camera_class* cam, f32 near) { + cam->mNear = near; +} + +void fopCamM_SetFar(camera_class* cam, f32 far) { + cam->mFar = far; +} + +void fopCamM_SetFovy(camera_class* cam, f32 fovy) { + cam->mFovy = fovy; +} + +void fopCamM_SetAspect(camera_class* cam, f32 aspect) { + cam->mAspect = aspect; +} + +void fopCamM_SetEye(camera_class* cam, f32 x, f32 y, f32 z) { + cam->field_0xd8.mEye.set(x, y, z); +} + +void fopCamM_SetCenter(camera_class* cam, f32 x, f32 y, f32 z) { + cam->field_0xd8.mCenter.set(x, y, z); +} + +void fopCamM_SetBank(camera_class* cam, s16 bank) { + cam->mBank = bank; +} */ + +inline s16 fopCamM_GetAngleY(camera_class* i_camera) { + return i_camera->mAngle.y; +} + +inline f32 fopCamM_GetFovy(camera_class* i_camera) { + return i_camera->mFovy; +} + +u32 fopCamM_Create(int i_cameraIdx, s16 pProcName, void* param_3); +void fopCamM_Management(void); +u32 fopCamM_GetParam(camera_class* pCamera); +void fopCamM_Init(void); + +#endif diff --git a/include/f_op/f_op_kankyo.h b/include/f_op/f_op_kankyo.h new file mode 100644 index 0000000..b903542 --- /dev/null +++ b/include/f_op/f_op_kankyo.h @@ -0,0 +1,24 @@ +#ifndef F_OP_F_OP_KANKYO_H +#define F_OP_F_OP_KANKYO_H + +#include "SSystem/SComponent/c_xyz.h" +#include "f_pc/f_pc_leaf.h" + +class kankyo_class : public leafdraw_class { +public: + /* 0xC0 */ int mBsType; + /* 0xC4 */ create_tag_class mDwTg; + /* 0xD8 */ leafdraw_method_class* mSubMtd; + /* 0xDC */ cXyz mPos; + /* 0xE8 */ cXyz mScale; + /* 0xF4 */ u32 mParam; +}; + +struct kankyo_process_profile_definition { + /* 0x00 */ leaf_process_profile_definition base; + /* 0x24 */ leafdraw_method_class* mSubMtd; +}; // Size: 0x28 + +extern leafdraw_method_class g_fopKy_Method; + +#endif /* F_OP_F_OP_KANKYO_H */ diff --git a/include/f_op/f_op_kankyo_mng.h b/include/f_op/f_op_kankyo_mng.h new file mode 100644 index 0000000..d875eb8 --- /dev/null +++ b/include/f_op/f_op_kankyo_mng.h @@ -0,0 +1,27 @@ +#ifndef F_F_OP_KANKYO_MNG_H_ +#define F_F_OP_KANKYO_MNG_H_ + +#include "SSystem/SComponent/c_xyz.h" +#include "f_pc/f_pc_manager.h" + +struct fopKyM_prm_class { + /* 0x00 */ cXyz mPos; + /* 0x0C */ cXyz mScale; + /* 0x18 */ int mParam; +}; // Size: 0x1C + +typedef int (*fopKyM_CreateFunc)(void*); + +static fopKyM_prm_class* fopKyM_CreateAppend(void); +static fopKyM_prm_class* createAppend(int param_1, cXyz* param_2, cXyz* param_3); +void fopKyM_Delete(void* param_1); +static int fopKyM_Create(s16 param_1, fopKyM_CreateFunc param_2, void* param_3); +base_process_class* fopKyM_fastCreate(s16 param_0, int param_1, cXyz* param_2, cXyz* param_3, + fopKyM_CreateFunc); +int fopKyM_createWpillar(cXyz const* i_pos, f32 scale, int i_param); + +inline void* fopKyM_GetAppend(void* param_0) { + return fpcM_GetAppend(param_0); +} + +#endif \ No newline at end of file diff --git a/include/f_op/f_op_msg.h b/include/f_op/f_op_msg.h new file mode 100644 index 0000000..f792aaa --- /dev/null +++ b/include/f_op/f_op_msg.h @@ -0,0 +1,25 @@ +#ifndef F_OP_F_OP_MSG_H +#define F_OP_F_OP_MSG_H + +#include "SSystem/SComponent/c_xyz.h" +#include "f_pc/f_pc_leaf.h" + +class fopAc_ac_c; + +class msg_class : public leafdraw_class { +public: + /* 0xC0 */ int mMsgType; + /* 0xC4 */ create_tag_class mDwTg; + /* 0xD8 */ leafdraw_method_class* mSubMtd; + /* 0xDC */ fopAc_ac_c* mpActor; + /* 0xE0 */ cXyz mPos; + /* 0xEC */ u32 mMsgID; + /* 0xF0 */ u32 field_0xf0; + /* 0xF4 */ u32 field_0xf4; + /* 0xF8 */ u16 mMode; + /* 0xFA */ u8 mSelectedChoiceIdx; +}; // Size: 0xFC + +extern leafdraw_method_class g_fopMsg_Method; + +#endif /* F_OP_F_OP_MSG_H */ diff --git a/include/f_op/f_op_msg_mng.h b/include/f_op/f_op_msg_mng.h new file mode 100644 index 0000000..8f981ce --- /dev/null +++ b/include/f_op/f_op_msg_mng.h @@ -0,0 +1,67 @@ +#ifndef F_F_OP_MSG_MNG_H_ +#define F_F_OP_MSG_MNG_H_ + +#include "SSystem/SComponent/c_xyz.h" +#include "f_pc/f_pc_leaf.h" + +class JKRExpHeap; +class JKRHeap; +class fopAc_ac_c; +class msg_class; + +struct msg_process_profile_definition { + /* 0x00 */ leaf_process_profile_definition mBase; + /* 0x24 */ leafdraw_method_class* mSubMtd; // Subclass methods +}; + +struct fopMsg_prm_class { + /* 0x00 */ fopAc_ac_c* mpActor; + /* 0x04 */ cXyz mPos; + /* 0x10 */ u32 mMsgID; + /* 0x14 */ u32 field_0x14; + /* 0x18 */ int field_0x18; +}; // Size: 0x1C + +struct fopMsg_prm_timer { + /* 0x00 */ int field_0x0; + /* 0x04 */ cXyz field_0x4; + /* 0x10 */ int field_0x10; + /* 0x14 */ int field_0x14; + /* 0x18 */ u32 field_0x18; + /* 0x1C */ int field_0x1c; + /* 0x20 */ u32 field_0x20; + /* 0x24 */ u8 field_0x24; + /* 0x25 */ u8 field_0x25; + /* 0x28 */ f32 field_0x28; + /* 0x2C */ f32 field_0x2c; + /* 0x30 */ f32 field_0x30; + /* 0x34 */ f32 field_0x34; +}; // Size: 0x38 + +typedef int (*fopMsgCreateFunc)(void*); + +JKRExpHeap* fopMsgM_createExpHeap(u32, JKRHeap*); +u32 fopMsgM_Create(s16, fopMsgCreateFunc, void*); +s32 fopMsgM_create(s16 param_0, fopAc_ac_c* param_1, cXyz* param_2, u32* param_3, u32* param_4, + fopMsgCreateFunc createFunc); +void fopMsgM_Delete(void* process); +fopMsg_prm_class* fopMsgM_GetAppend(void* msg); +void fopMsgM_setMessageID(unsigned int); +void fopMsgM_destroyExpHeap(JKRExpHeap*); +f32 fopMsgM_valueIncrease(int param_0, int param_1, u8 param_2); +s32 fopMsgM_setStageLayer(void*); +int fopMsgM_messageSet(u32 i_msgIdx, fopAc_ac_c* i_actorP, u32 param_2); +int fopMsgM_messageSet(u32 param_0, u32 param_1); +int fopMsgM_messageSetDemo(u32 param_0); +msg_class* fopMsgM_SearchByID(unsigned int param_0); +char* fopMsgM_messageGet(char* msg, u32 string_id); +s32 fop_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, f32 param_5, + f32 param_6, f32 param_7, f32 param_8, fopMsgCreateFunc createFunc); +inline s32 fopMsgM_Timer_create(s16 param_0, u8 param_1, u32 param_2, u8 param_3, u8 param_4, + f32 param_5, f32 param_6, f32 param_7, f32 param_8, + fopMsgCreateFunc createFunc) { + return fop_Timer_create(param_0, param_1, param_2, param_3, param_4, param_5, param_6, param_7, + param_8, createFunc); +} + +#endif diff --git a/include/f_pc/f_pc_leaf.h b/include/f_pc/f_pc_leaf.h index 7bb93b8..d2664fd 100644 --- a/include/f_pc/f_pc_leaf.h +++ b/include/f_pc/f_pc_leaf.h @@ -26,7 +26,7 @@ typedef struct leaf_process_profile_definition { /* 0x20 */ s16 mPriority; // mDrawPriority } leaf_process_profile_definition; -s16 fpcLf_GetPriority(const leafdraw_class* pLeaf); +s16 fpcLf_GetPriority(leafdraw_class* pLeaf); s32 fpcLf_DrawMethod(leafdraw_method_class* pMthd, void* pUserData); s32 fpcLf_Draw(leafdraw_class* pMthd); s32 fpcLf_Execute(leafdraw_class* pLeaf); diff --git a/include/f_pc/f_pc_manager.h b/include/f_pc/f_pc_manager.h index 00e2932..28d3f6c 100644 --- a/include/f_pc/f_pc_manager.h +++ b/include/f_pc/f_pc_manager.h @@ -39,7 +39,7 @@ inline int fpcM_Create(s16 procName, FastCreateReqFunc createFunc, void* process } inline s16 fpcM_DrawPriority(const void* param_0) { - return fpcLf_GetPriority((const leafdraw_class*)param_0); + return fpcLf_GetPriority((leafdraw_class*)param_0); } inline s32 fpcM_ChangeLayerID(void* proc, int layerID) { diff --git a/src/d/d_com_lib_game.cpp b/src/d/d_com_lib_game.cpp index 3bfa52b..1e29136 100644 --- a/src/d/d_com_lib_game.cpp +++ b/src/d/d_com_lib_game.cpp @@ -3,11 +3,21 @@ // Translation Unit: d_com_lib_game.cpp // -#include "d_com_lib_game.h" -#include "dolphin/types.h" +#include "d/d_com_lib_game.h" +#include "SSystem/SComponent/c_phase.h" /* 800565CC-8005662C .text dComLbG_PhaseHandler__FP30request_of_phase_process_classPPFPv_iPv */ -void dComLbG_PhaseHandler(request_of_phase_process_class*, int (**)(void*), void*) { - /* Nonmatching */ -} +int dComLbG_PhaseHandler(request_of_phase_process_class* i_phaseReq, cPhs__Handler* i_handler, + void* i_data) { + int phase = cPhs_Handler(i_phaseReq, i_handler, i_data); + switch (phase) { + case cPhs_NEXT_e: + phase = dComLbG_PhaseHandler(i_phaseReq, i_handler, i_data); + break; + case cPhs_LOADING_e: + case cPhs_UNK3_e: + break; + } + return phase; +} diff --git a/src/d/d_particle_name.cpp b/src/d/d_particle_name.cpp index 56cbc1c..7fb43ce 100644 --- a/src/d/d_particle_name.cpp +++ b/src/d/d_particle_name.cpp @@ -3,6 +3,23 @@ // Translation Unit: d_particle_name.cpp // -#include "d_particle_name.h" -#include "dolphin/types.h" +#include "d/d_particle_name.h" +namespace dPa_name { + u16 j_o_id[] = { + 0x0000, 0x0001, 0x0002, 0x0003, + 0x03DA, 0x03DB, 0x03DC, 0x4004, + }; + + u16 s_o_id[] = { + 0x8058, 0x8059, 0x805A, 0x805B, + 0x805C, 0x8221, 0x8222, 0x8060, + 0x8061, 0x8062, 0x8063, 0x8064, + 0x8065, 0x8066, 0x8067, 0x8068, + 0x8069, 0x81D5, 0x8240, 0x8241, + 0x8306, 0x8407, 0x8408, 0x8409, + 0x8443, 0x840A, 0x840B, 0x840C, + 0x840D, 0x840E, 0x840F, 0xA410, + 0xA06A, 0xC06B, + }; +} diff --git a/src/d/d_s_title.cpp b/src/d/d_s_title.cpp index 0a6be50..430b3f1 100644 --- a/src/d/d_s_title.cpp +++ b/src/d/d_s_title.cpp @@ -3,12 +3,23 @@ // Translation Unit: d_s_title.cpp // -#include "d_s_title.h" +#include "f_op/f_op_scene.h" +#include "f_pc/f_pc_leaf.h" +#include "f_pc/f_pc_manager.h" +#include "f_op/f_op_draw_iter.h" +#include "d/d_procname.h" #include "dolphin/types.h" +struct title_of_scene_class : public scene_class { +public: + u32 pad[0x98]; +}; + /* 802372F4-80237344 .text dScnTitle_Draw__FP20title_of_scene_class */ -void dScnTitle_Draw(title_of_scene_class*) { - /* Nonmatching */ +s32 dScnTitle_Draw(title_of_scene_class*) { + for (create_tag_class* pTag = fopDwIt_Begin(); pTag != NULL; pTag = fopDwIt_Next(pTag)) + fpcM_Draw(pTag->mpTagData); + return 1; } /* 80237344-802374C8 .text dScnTitle_Execute__FP20title_of_scene_class */ @@ -17,13 +28,13 @@ void dScnTitle_Execute(title_of_scene_class*) { } /* 802374C8-802374D0 .text dScnTitle_IsDelete__FP20title_of_scene_class */ -void dScnTitle_IsDelete(title_of_scene_class*) { - /* Nonmatching */ +s32 dScnTitle_IsDelete(title_of_scene_class*) { + return 1; } /* 802374D0-802374D8 .text dScnTitle_Delete__FP20title_of_scene_class */ -void dScnTitle_Delete(title_of_scene_class*) { - /* Nonmatching */ +s32 dScnTitle_Delete(title_of_scene_class*) { + return 1; } /* 802374D8-80237568 .text dScnTitle_Create__FP11scene_class */ @@ -31,3 +42,32 @@ void dScnTitle_Create(scene_class*) { /* Nonmatching */ } +static leafdraw_method_class l_dScnTitle_Method = { + (process_method_func)dScnTitle_Create, + (process_method_func)dScnTitle_Delete, + (process_method_func)dScnTitle_Execute, + (process_method_func)dScnTitle_IsDelete, + (process_method_func)dScnTitle_Draw, +}; + +extern scene_process_profile_definition g_profile_TITLE_SCENE = { + 0, 1, -3, + PROC_TITLE_SCENE, + &g_fpcNd_Method.mBase, + sizeof(title_of_scene_class), + 0, + 0, + &g_fopScn_Method.mBase, + &l_dScnTitle_Method.mBase, +}; + +extern scene_process_profile_definition g_profile_ENDING_SCENE = { + 0, 1, -3, + PROC_ENDING_SCENE, + &g_fpcNd_Method.mBase, + sizeof(title_of_scene_class), + 0, + 0, + &g_fopScn_Method.mBase, + &l_dScnTitle_Method.mBase, +}; diff --git a/src/f_op/f_op_camera_mng.cpp b/src/f_op/f_op_camera_mng.cpp index abc081f..f5361e1 100644 --- a/src/f_op/f_op_camera_mng.cpp +++ b/src/f_op/f_op_camera_mng.cpp @@ -4,24 +4,26 @@ // #include "f_op/f_op_camera_mng.h" -#include "dolphin/types.h" +#include "f_pc/f_pc_layer.h" +#include "f_pc/f_pc_stdcreate_req.h" + +static u32 l_fopCamM_id[4]; /* 80029468-80029470 .text fopCamM_GetParam__FP12camera_class */ -void fopCamM_GetParam(camera_class*) { - /* Nonmatching */ +u32 fopCamM_GetParam(camera_class* i_this) { + return i_this->mBase.mParameters; } /* 80029470-800294D4 .text fopCamM_Create__FisPv */ -void fopCamM_Create(int, short, void*) { - /* Nonmatching */ +u32 fopCamM_Create(int i_cameraIdx, s16 i_procName, void* param_3) { + l_fopCamM_id[i_cameraIdx] = fpcSCtRq_Request(fpcLy_CurrentLayer(), i_procName, 0, 0, param_3); + return l_fopCamM_id[i_cameraIdx]; } /* 800294D4-800294D8 .text fopCamM_Management__Fv */ void fopCamM_Management() { - /* Nonmatching */ } /* 800294D8-800294DC .text fopCamM_Init__Fv */ void fopCamM_Init() { - /* Nonmatching */ } diff --git a/src/f_op/f_op_draw_iter.cpp b/src/f_op/f_op_draw_iter.cpp index 81f7bfa..8f227b0 100644 --- a/src/f_op/f_op_draw_iter.cpp +++ b/src/f_op/f_op_draw_iter.cpp @@ -4,19 +4,43 @@ // #include "f_op/f_op_draw_iter.h" -#include "dolphin/types.h" +#include "SSystem/SComponent/c_list.h" +#include "SSystem/SComponent/c_tag.h" +#include "f_op/f_op_draw_tag.h" + +static s32 l_fopDwTg_id; /* 8003C640-8003C684 .text fopDwIt_GetTag__Fv */ -void fopDwIt_GetTag() { - /* Nonmatching */ +create_tag_class* fopDwIt_GetTag() { + while (l_fopDwTg_id + 1 < g_fopDwTg_Queue.mNumLists) { + l_fopDwTg_id++; + + create_tag_class* tag = (create_tag_class*)g_fopDwTg_Queue.mpLists[l_fopDwTg_id].mpHead; + if (tag != NULL) + return tag; + } + + return NULL; } /* 8003C684-8003C6C0 .text fopDwIt_Begin__Fv */ -void fopDwIt_Begin() { - /* Nonmatching */ +create_tag_class* fopDwIt_Begin() { + create_tag_class* createTagClass = (create_tag_class*)g_fopDwTg_Queue.mpLists->mpHead; + l_fopDwTg_id = 0; + + if (createTagClass) { + return createTagClass; + } + + return createTagClass = fopDwIt_GetTag(); } /* 8003C6C0-8003C6EC .text fopDwIt_Next__FP16create_tag_class */ -void fopDwIt_Next(create_tag_class*) { - /* Nonmatching */ +create_tag_class* fopDwIt_Next(create_tag_class *i_createTag) { + create_tag_class* createTagClass = (create_tag_class*)i_createTag->mpNode.mpNextNode; + if (!createTagClass) { + createTagClass = fopDwIt_GetTag(); + } + + return createTagClass; } diff --git a/src/f_op/f_op_kankyo.cpp b/src/f_op/f_op_kankyo.cpp index f9f22e0..1686d73 100644 --- a/src/f_op/f_op_kankyo.cpp +++ b/src/f_op/f_op_kankyo.cpp @@ -3,7 +3,7 @@ // Translation Unit: f_op_kankyo.cpp // -#include "f_op/f_op_kankyo.h" +#include "f_op_kankyo.h" #include "dolphin/types.h" /* 8002A454-8002A4A4 .text fopKy_Draw__FPv */ diff --git a/src/f_op/f_op_kankyo_mng.cpp b/src/f_op/f_op_kankyo_mng.cpp index 160309d..02ce895 100644 --- a/src/f_op/f_op_kankyo_mng.cpp +++ b/src/f_op/f_op_kankyo_mng.cpp @@ -4,49 +4,100 @@ // #include "f_op/f_op_kankyo_mng.h" -#include "dolphin/types.h" +#include "f_op/f_op_kankyo.h" +#include "f_pc/f_pc_executor.h" +#include "d/d_procname.h" +#include "SSystem/SComponent/c_malloc.h" +#include "SSystem/SComponent/c_lib.h" /* 8002A860-8002A880 .text fopKyM_SearchByID__FUi */ -void fopKyM_SearchByID(unsigned int) { - /* Nonmatching */ +kankyo_class* fopKyM_SearchByID(unsigned int id) { + return (kankyo_class*) fpcEx_SearchByID(id); } /* 8002A880-8002A8D8 .text fopKyM_CreateAppend__Fv */ -void fopKyM_CreateAppend() { - /* Nonmatching */ +static fopKyM_prm_class* fopKyM_CreateAppend() { + fopKyM_prm_class* params = + static_cast(cMl::memalignB(-4, sizeof(fopKyM_prm_class))); + + if (params != NULL) { + cLib_memSet(params, 0, sizeof(fopKyM_prm_class)); + params->mScale.set(1.0f, 1.0f, 1.0f); + } + return params; } /* 8002A8D8-8002A968 .text createAppend__FiP4cXyzP4cXyz */ -void createAppend(int, cXyz*, cXyz*) { - /* Nonmatching */ +static fopKyM_prm_class* createAppend(int i_param, cXyz* i_pos, cXyz* i_scale) { + fopKyM_prm_class* prm = fopKyM_CreateAppend(); + if (prm == NULL) + return NULL; + + if (i_pos != NULL) + prm->mPos = *i_pos; + if (i_scale != NULL) + prm->mScale = *i_scale; + prm->mParam = i_param; + return prm; } /* 8002A968-8002A988 .text fopKyM_Delete__FPv */ -void fopKyM_Delete(void*) { - /* Nonmatching */ +void fopKyM_Delete(void* i_process) { + fpcM_Delete(i_process); } /* 8002A988-8002A9D8 .text fopKyM_Create__FsPFPv_iPv */ -void fopKyM_Create(short, int (*)(void*), void*) { - /* Nonmatching */ +static int fopKyM_Create(s16 i_procName, fopKyM_CreateFunc i_createFunc, void* i_process) { + return fpcM_Create(i_procName, i_createFunc, i_process); } /* 8002A9D8-8002AA38 .text fopKyM_create__FsiP4cXyzP4cXyzPFPv_i */ -void fopKyM_create(short, int, cXyz*, cXyz*, int (*)(void*)) { - /* Nonmatching */ +int fopKyM_create(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, + fopKyM_CreateFunc i_createFunc) { + fopKyM_prm_class* params = createAppend(i_param, i_pos, i_scale); + + if (params == NULL) { + return -1; + } + + return fopKyM_Create(i_procName, i_createFunc, params); } /* 8002AA38-8002AA9C .text fopKyM_fastCreate__FsiP4cXyzP4cXyzPFPv_i */ -void fopKyM_fastCreate(short, int, cXyz*, cXyz*, int (*)(void*)) { - /* Nonmatching */ +base_process_class* fopKyM_fastCreate(s16 i_procName, int i_param, cXyz* i_pos, cXyz* i_scale, + fopKyM_CreateFunc i_createFunc) { + fopKyM_prm_class* params = createAppend(i_param, i_pos, i_scale); + + if (params == NULL) { + return NULL; + } + + return fpcM_FastCreate(i_procName, i_createFunc, NULL, params); } /* 8002AA9C-8002AB40 .text fopKyM_createWpillar__FPC4cXyzffi */ -void fopKyM_createWpillar(const cXyz*, float, float, int) { - /* Nonmatching */ +int fopKyM_createWpillar(cXyz const* i_pos, f32 scaleXZ, f32 scaleY, int i_param) { + fopKyM_prm_class* params = fopKyM_CreateAppend(); + + if (params == NULL) { + return -1; + } + + params->mPos = *i_pos; + params->mScale.x = scaleXZ; + params->mScale.y = scaleY; + params->mScale.z = scaleXZ; + params->mParam = i_param; + + return fopKyM_Create(PROC_WPILLAR, NULL, params); } /* 8002AB40-8002ABB4 .text fopKyM_createMpillar__FPC4cXyzf */ -void fopKyM_createMpillar(const cXyz*, float) { - /* Nonmatching */ +int fopKyM_createMpillar(cXyz const* i_pos, f32 i_size) { + cXyz scale; + scale.x = i_size; + scale.y = i_size; + scale.z = i_size; + // dComIfGp_particle_set(0x80d5, i_pos, NULL, &scale); + return -1; } diff --git a/src/f_op/f_op_msg.cpp b/src/f_op/f_op_msg.cpp index db81e99..36a80b7 100644 --- a/src/f_op/f_op_msg.cpp +++ b/src/f_op/f_op_msg.cpp @@ -4,29 +4,85 @@ // #include "f_op/f_op_msg.h" -#include "dolphin/types.h" +#include "f_op/f_op_draw_tag.h" +#include "f_pc/f_pc_manager.h" +#include "f_op/f_op_msg_mng.h" +#include "d/d_s_play.h" /* 8002A688-8002A6B0 .text fopMsg_Draw__FPv */ -void fopMsg_Draw(void*) { - /* Nonmatching */ +static int fopMsg_Draw(void* i_this) { + msg_class* _this = static_cast(i_this); + return fpcLf_DrawMethod(_this->mSubMtd, i_this); } /* 8002A6B0-8002A6E8 .text fopMsg_Execute__FPv */ -void fopMsg_Execute(void*) { - /* Nonmatching */ +static int fopMsg_Execute(void* i_this) { + msg_class* _this = static_cast(i_this); + + int stat = 1; + if (dScnPly_ply_c::isPause()) { + stat = fpcMtd_Execute(&_this->mSubMtd->mBase, i_this); + } + + return stat; } /* 8002A6E8-8002A73C .text fopMsg_IsDelete__FPv */ -void fopMsg_IsDelete(void*) { - /* Nonmatching */ +static int fopMsg_IsDelete(void* i_this) { + msg_class* _this = static_cast(i_this); + + int stat = fpcMtd_IsDelete(&_this->mSubMtd->mBase, i_this); + if (stat == 1) { + fopDwTg_DrawQTo(&_this->mDwTg); + } + + return stat; } /* 8002A73C-8002A788 .text fopMsg_Delete__FPv */ -void fopMsg_Delete(void*) { - /* Nonmatching */ +static int fopMsg_Delete(void* i_this) { + msg_class* _this = static_cast(i_this); + + int stat = fpcMtd_Delete(&_this->mSubMtd->mBase, i_this); + fopDwTg_DrawQTo(&_this->mDwTg); + + return stat; } +static int fopMsg_MSG_TYPE; + /* 8002A788-8002A860 .text fopMsg_Create__FPv */ -void fopMsg_Create(void*) { - /* Nonmatching */ +int fopMsg_Create(void* i_this) { + msg_class* _this = (msg_class*)i_this; + + if (fpcM_IsFirstCreating(_this)) { + msg_process_profile_definition* profile = (msg_process_profile_definition*)fpcM_GetProfile(i_this); + _this->mMsgType = fpcBs_MakeOfType(&fopMsg_MSG_TYPE); + _this->mSubMtd = profile->mSubMtd; + fopDwTg_Init(&_this->mDwTg, _this); + fopMsg_prm_class* prm = fopMsgM_GetAppend(_this); + if (prm != NULL) { + _this->mpActor = prm->mpActor; + _this->mPos = prm->mPos; + _this->mMsgID = prm->mMsgID; + _this->field_0xf0 = prm->field_0x14; + _this->field_0xf4 = prm->field_0x18; + } + } + + int status = fpcMtd_Create(&_this->mSubMtd->mBase, _this); + if (status == cPhs_COMPLEATE_e) { + s32 priority = fpcLf_GetPriority(_this); + fopDwTg_ToDrawQ(&_this->mDwTg, priority); + } + + return status; } + +leafdraw_method_class g_fopMsg_Method = { + (process_method_func)fopMsg_Create, + (process_method_func)fopMsg_Delete, + (process_method_func)fopMsg_Execute, + (process_method_func)fopMsg_IsDelete, + (process_method_func)fopMsg_Draw, +};