diff options
| author | Jasper St. Pierre <jstpierre@mecheye.net> | 2021-05-10 08:54:07 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-10 11:54:07 -0400 |
| commit | 462d71cbef02ef119fc2aa480b98cfeedde46441 (patch) | |
| tree | 923ed9f6f939c3e4b64dba0070e1539d05910089 /libs | |
| parent | 9799fadfe84344fa3ea78835365570d832a476c7 (diff) | |
Makefile fixes / JUTNameTab (#129)
* Makefile: Fix issues with iconv causing it to break under devkitPro / msys
The version of iconv included in devkitPro does not have a -o option,
so replace it with normal shell redirection. Also, SHIFT-JIS does not
have a mapping for ~, so output the Windows CP932 variant instead,
which does. See:
https://en.wikipedia.org/wiki/Tilde#Unicode_and_Shift_JIS_encoding_of_wave_dash
https://en.wikipedia.org/wiki/Code_page_932_(Microsoft_Windows)#Single-byte_character_differences
* Update diff configuration
-Bbinary doesn't seem to work with my copy of
bjdump (it says it can't decode unknown architecture)
Cheese things by using expected/ instead of having
the user place things manually.
* JUTNameTab
* J3DPacket / J3DDrawBuffer
* format
Co-authored-by: lepelog <lepelog@users.noreply.github.com>
Diffstat (limited to 'libs')
48 files changed, 199 insertions, 364 deletions
diff --git a/libs/JSystem/J2DGraph/Makefile b/libs/JSystem/J2DGraph/Makefile index 1b6e401949..2cf91e51b3 100644 --- a/libs/JSystem/J2DGraph/Makefile +++ b/libs/JSystem/J2DGraph/Makefile @@ -58,6 +58,6 @@ $(BUILD_DIR)/libJ2DGraph.a: $(LIBJ2DGRAPH_A_O_FILES) $(BUILD_DIR)/libs/JSystem/J2DGraph/%.o: libs/JSystem/J2DGraph/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJ2DGRAPH_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/J3DGraphAnimator/Makefile b/libs/JSystem/J3DGraphAnimator/Makefile index ed2142d0ea..febf03726b 100644 --- a/libs/JSystem/J3DGraphAnimator/Makefile +++ b/libs/JSystem/J3DGraphAnimator/Makefile @@ -44,6 +44,6 @@ $(BUILD_DIR)/libJ3DGraphAnimator.a: $(LIBJ3DGRAPHANIMATOR_A_O_FILES) $(BUILD_DIR)/libs/JSystem/J3DGraphAnimator/%.o: libs/JSystem/J3DGraphAnimator/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJ3DGRAPHANIMATOR_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp index e6077324eb..bd429fb830 100644 --- a/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp +++ b/libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp @@ -4,44 +4,11 @@ // #include "JSystem/J3DGraphBase/J3DDrawBuffer.h" +#include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" #include "dolphin/types.h" -// -// Types: -// - -struct J3DShapePacket {}; - -struct J3DPacket { - /* 80312758 */ void addChildPacket(J3DPacket*); -}; - -struct J3DMatPacket { - /* 80312A04 */ void addShapePacket(J3DShapePacket*); - /* 80312A74 */ void isSame(J3DMatPacket*) const; -}; - -struct J3DDrawBuffer { - /* 80324F08 */ void initialize(); - /* 80324F70 */ void allocBuffer(u32); - /* 80325008 */ ~J3DDrawBuffer(); - /* 80325068 */ void frameInit(); - /* 8032509C */ void entryMatSort(J3DMatPacket*); - /* 803251E4 */ void entryMatAnmSort(J3DMatPacket*); - /* 8032529C */ void entryZSort(J3DMatPacket*); - /* 803253B4 */ void entryModelSort(J3DMatPacket*); - /* 80325404 */ void entryInvalidSort(J3DMatPacket*); - /* 80325458 */ void entryNonSort(J3DMatPacket*); - /* 8032548C */ void entryImm(J3DPacket*, u16); - /* 803254AC */ void draw() const; - /* 80325500 */ void drawHead() const; - /* 80325578 */ void drawTail() const; - - static u8 sortFuncTable[72]; - static u8 drawFuncTable[24]; - static u8 entryNum[4 + 4 /* padding */]; -}; +#include "JSystem/J3DGraphBase/J3DPacket.h" // // Forward References: @@ -98,35 +65,51 @@ SECTION_SDATA2 static f32 lit_782 = 10000.0f; /* 80456408-80456410 004A08 0008+00 2/2 0/0 0/0 .sdata2 @784 */ SECTION_SDATA2 static f64 lit_784 = 4503599627370496.0 /* cast u32 to float */; -/* 80324F08-80324F70 31F848 0068+00 0/0 1/1 0/0 .text initialize__13J3DDrawBufferFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDrawBuffer::initialize() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DDrawBuffer/initialize__13J3DDrawBufferFv.s" +void J3DDrawBuffer::calcZRatio() { + mZRatio = (mZFar - mZNear) / (f32)mBufSize; } -#pragma pop -/* 80324F70-80325008 31F8B0 0098+00 0/0 1/1 0/0 .text allocBuffer__13J3DDrawBufferFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDrawBuffer::allocBuffer(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DDrawBuffer/allocBuffer__13J3DDrawBufferFUl.s" +void J3DDrawBuffer::initialize() { + mDrawType = 0; + mSortType = 0; + mZNear = lit_781; + mZFar = lit_782; + mpZMtx = NULL; + mpCallBackPacket = NULL; + mBufSize = 0x20; + calcZRatio(); } -#pragma pop -/* 80325008-80325068 31F948 0060+00 0/0 2/2 0/0 .text __dt__13J3DDrawBufferFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm J3DDrawBuffer::~J3DDrawBuffer() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DDrawBuffer/__dt__13J3DDrawBufferFv.s" +J3DError J3DDrawBuffer::allocBuffer(u32 bufSize) { + mpBuf = new (0x20) J3DPacket*[bufSize]; + if (mpBuf == NULL) + return kJ3DError_Alloc; + + mBufSize = bufSize; + frameInit(); + calcZRatio(); + return kJ3DError_Success; } -#pragma pop + +J3DDrawBuffer::~J3DDrawBuffer() { + frameInit(); + + delete[] mpBuf; + mpBuf = NULL; +} + +#if NON_MATCHING + +/* 80325068-8032509C 31F9A8 0034+00 2/2 1/1 0/0 .text frameInit__13J3DDrawBufferFv */ +void J3DDrawBuffer::frameInit() { + // can't make mwcc not generate "mtctr" for this loop + for (int i = 0; i < mBufSize; i++) + mpBuf[i] = NULL; + + mpCallBackPacket = NULL; +} + +#else /* 80325068-8032509C 31F9A8 0034+00 2/2 1/1 0/0 .text frameInit__13J3DDrawBufferFv */ #pragma push @@ -138,6 +121,8 @@ asm void J3DDrawBuffer::frameInit() { } #pragma pop +#endif + /* 8032509C-803251E4 31F9DC 0148+00 2/1 0/0 0/0 .text * entryMatSort__13J3DDrawBufferFP12J3DMatPacket */ #pragma push @@ -193,26 +178,21 @@ asm void J3DDrawBuffer::entryInvalidSort(J3DMatPacket* param_0) { } #pragma pop -/* 80325458-8032548C 31FD98 0034+00 1/0 0/0 0/0 .text - * entryNonSort__13J3DDrawBufferFP12J3DMatPacket */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDrawBuffer::entryNonSort(J3DMatPacket* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryNonSort__13J3DDrawBufferFP12J3DMatPacket.s" +bool J3DDrawBuffer::entryNonSort(J3DMatPacket* pMat) { + pMat->clear(); + pMat->mpFirstShapePacket->clear(); + + // inlined copy of entryImm, add to start of buf + pMat->mpNextSibling = mpBuf[0]; + mpBuf[0] = pMat; + return true; } -#pragma pop -/* 8032548C-803254AC 31FDCC 0020+00 0/0 8/8 9/9 .text entryImm__13J3DDrawBufferFP9J3DPacketUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDrawBuffer::entryImm(J3DPacket* param_0, u16 param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryImm__13J3DDrawBufferFP9J3DPacketUs.s" +bool J3DDrawBuffer::entryImm(J3DPacket* pPacket, u16 index) { + pPacket->mpNextSibling = mpBuf[index]; + mpBuf[index] = pPacket; + return true; } -#pragma pop /* ############################################################################################## */ /* 803CEBE8-803CEBF4 -00001 000C+00 1/1 0/0 0/0 .data @992 */ diff --git a/libs/JSystem/J3DGraphBase/J3DPacket.cpp b/libs/JSystem/J3DGraphBase/J3DPacket.cpp index 68ade874af..1786915338 100644 --- a/libs/JSystem/J3DGraphBase/J3DPacket.cpp +++ b/libs/JSystem/J3DGraphBase/J3DPacket.cpp @@ -4,8 +4,13 @@ // #include "JSystem/J3DGraphBase/J3DPacket.h" +#include "JSystem/JKernel/JKRHeap.h" #include "dol2asm.h" +#include "dolphin/gx/GX.h" +#include "dolphin/os/OSCache.h" #include "dolphin/types.h" +#include "global.h" +#include "msl_c/string.h" // // Types: @@ -15,16 +20,6 @@ struct J3DVertexBuffer { /* 8031106C */ void setArray() const; }; -struct J3DShapePacket { - /* 80312B20 */ J3DShapePacket(); - /* 80312B74 */ ~J3DShapePacket(); - /* 80312BD4 */ void calcDifferedBufferSize(u32); - /* 80312DBC */ void newDifferedDisplayList(u32); - /* 80312E08 */ void prepareDraw() const; - /* 80312F24 */ void draw(); - /* 80312FBC */ void drawFast(); -}; - struct J3DShape { /* 80315300 */ void loadPreDrawSetting() const; @@ -35,52 +30,10 @@ struct J3DDrawBuffer { static u8 sortFuncTable[72]; }; -struct J3DPacket { - /* 8000E680 */ ~J3DPacket(); - /* 80312750 */ bool entry(J3DDrawBuffer*); - /* 80312758 */ void addChildPacket(J3DPacket*); - /* 80313044 */ void draw(); -}; - struct J3DModelData { /* 803260F8 */ void syncJ3DSysFlags() const; }; -struct J3DMatPacket { - /* 80312948 */ J3DMatPacket(); - /* 803129A4 */ ~J3DMatPacket(); - /* 80312A04 */ void addShapePacket(J3DShapePacket*); - /* 80312A24 */ void beginDiff(); - /* 80312A4C */ void endDiff(); - /* 80312A74 */ void isSame(J3DMatPacket*) const; - /* 80312A9C */ void draw(); - /* 80313048 */ void entry(J3DDrawBuffer*); -}; - -struct J3DDrawPacket { - /* 80312778 */ J3DDrawPacket(); - /* 803127B0 */ ~J3DDrawPacket(); - /* 8031280C */ void newDisplayList(u32); - /* 80312898 */ void newSingleDisplayList(u32); - /* 80312924 */ void draw(); -}; - -struct J3DDisplayListObj { - /* 80312488 */ void newDisplayList(u32); - /* 80312508 */ void newSingleDisplayList(u32); - /* 8031256C */ void single_To_Double(); - /* 803125E4 */ void setSingleDisplayList(void*, u32); - /* 80312604 */ void swapBuffer(); - /* 80312618 */ void callDL() const; - /* 80312644 */ void beginDL(); - /* 80312698 */ void endDL(); - /* 803126F4 */ void beginPatch(); - /* 80312714 */ void endPatch(); - - static u8 sGDLObj[16]; - static u8 sInterruptFlag[4 + 4 /* padding */]; -}; - struct J3DDifferedTexMtx { static u8 sTexGenBlock[4]; static u8 sTexMtxObj[4]; @@ -130,7 +83,6 @@ extern "C" u8 sInterruptFlag__17J3DDisplayListObj[4 + 4 /* padding */]; // External References: // -SECTION_INIT void memcpy(); extern "C" void __dt__9J3DPacketFv(); extern "C" void* __nw__FUl(); extern "C" void* __nwa__FUli(); @@ -138,10 +90,6 @@ extern "C" void __dl__FPv(); extern "C" void setArray__15J3DVertexBufferCFv(); extern "C" void loadPreDrawSetting__8J3DShapeCFv(); extern "C" void syncJ3DSysFlags__12J3DModelDataCFv(); -extern "C" void DCStoreRange(); -extern "C" void OSDisableInterrupts(); -extern "C" void OSRestoreInterrupts(); -extern "C" void GXCallDisplayList(); extern "C" void GDInitGDLObj(); extern "C" void GDFlushCurrToMem(); extern "C" void GDPadCurr32(); @@ -160,68 +108,55 @@ extern "C" extern u8 __GDCurrentDL[4]; // Declarations: // -/* 80312488-80312508 30CDC8 0080+00 1/1 1/1 0/0 .text newDisplayList__17J3DDisplayListObjFUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDisplayListObj::newDisplayList(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/newDisplayList__17J3DDisplayListObjFUl.s" +J3DError J3DDisplayListObj::newDisplayList(u32 capacity) { + mCapacity = ALIGN_NEXT(capacity, 0x20); + mpData[0] = new (0x20) char[mCapacity]; + mpData[1] = new (0x20) char[mCapacity]; + mSize = 0; + if (mpData[0] == NULL || mpData[1] == NULL) + return kJ3DError_Alloc; + return kJ3DError_Success; } -#pragma pop -/* 80312508-8031256C 30CE48 0064+00 1/1 1/1 0/0 .text newSingleDisplayList__17J3DDisplayListObjFUl - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDisplayListObj::newSingleDisplayList(u32 param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/newSingleDisplayList__17J3DDisplayListObjFUl.s" +J3DError J3DDisplayListObj::newSingleDisplayList(u32 capacity) { + mCapacity = ALIGN_NEXT(capacity, 0x20); + mpData[0] = new (0x20) char[mCapacity]; + mpData[1] = mpData[0]; + mSize = 0; + if (mpData[0] == NULL) + return kJ3DError_Alloc; + return kJ3DError_Success; } -#pragma pop /* 8031256C-803125E4 30CEAC 0078+00 0/0 1/1 0/0 .text single_To_Double__17J3DDisplayListObjFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDisplayListObj::single_To_Double() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/single_To_Double__17J3DDisplayListObjFv.s" +J3DError J3DDisplayListObj::single_To_Double() { + if (mpData[0] == mpData[1]) { + mpData[1] = new (0x20) char[mCapacity]; + if (mpData[1] == NULL) + return kJ3DError_Alloc; + memcpy(mpData[1], mpData[0], mCapacity); + DCStoreRange(mpData[1], mCapacity); + } + + return kJ3DError_Success; } -#pragma pop -/* 803125E4-80312604 30CF24 0020+00 0/0 1/1 0/0 .text - * setSingleDisplayList__17J3DDisplayListObjFPvUl */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDisplayListObj::setSingleDisplayList(void* param_0, u32 param_1) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/setSingleDisplayList__17J3DDisplayListObjFPvUl.s" +void J3DDisplayListObj::setSingleDisplayList(void* pDLData, u32 size) { + mCapacity = ALIGN_NEXT(size, 0x20); + mpData[0] = pDLData; + mpData[1] = mpData[0]; + mSize = size; } -#pragma pop -/* 80312604-80312618 30CF44 0014+00 1/1 0/0 0/0 .text swapBuffer__17J3DDisplayListObjFv - */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDisplayListObj::swapBuffer() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/swapBuffer__17J3DDisplayListObjFv.s" +void J3DDisplayListObj::swapBuffer() { + void* pTmp = mpData[0]; + mpData[0] = mpData[1]; + mpData[1] = pTmp; } -#pragma pop -/* 80312618-80312644 30CF58 002C+00 3/3 4/4 1/1 .text callDL__17J3DDisplayListObjCFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDisplayListObj::callDL() const { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/callDL__17J3DDisplayListObjCFv.s" +void J3DDisplayListObj::callDL() const { + GXCallDisplayList(mpData[0], mSize); } -#pragma pop /* ############################################################################################## */ /* 80434C70-80434C80 061990 0010+00 2/2 3/3 0/0 .bss sGDLObj__17J3DDisplayListObj */ @@ -277,15 +212,14 @@ bool J3DPacket::entry(J3DDrawBuffer* param_0) { return true; } -/* 80312758-80312778 30D098 0020+00 0/0 2/2 0/0 .text addChildPacket__9J3DPacketFP9J3DPacket */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DPacket::addChildPacket(J3DPacket* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/addChildPacket__9J3DPacketFP9J3DPacket.s" +void J3DPacket::addChildPacket(J3DPacket* pPacket) { + if (mpFirstChild == NULL) { + mpFirstChild = pPacket; + } else { + pPacket->mpNextSibling = mpFirstChild; + mpFirstChild = pPacket; + } } -#pragma pop /* ############################################################################################## */ /* 803CD900-803CD920 02AA20 0020+00 1/1 0/0 0/0 .data sDifferedRegister */ @@ -361,7 +295,7 @@ asm J3DDrawPacket::~J3DDrawPacket() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DDrawPacket::newDisplayList(u32 param_0) { +asm J3DError J3DDrawPacket::newDisplayList(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DPacket/newDisplayList__13J3DDrawPacketFUl.s" } @@ -371,21 +305,15 @@ asm void J3DDrawPacket::newDisplayList(u32 param_0) { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DDrawPacket::newSingleDisplayList(u32 param_0) { +asm J3DError J3DDrawPacket::newSingleDisplayList(u32 param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DPacket/newSingleDisplayList__13J3DDrawPacketFUl.s" } #pragma pop -/* 80312924-80312948 30D264 0024+00 1/0 0/0 0/0 .text draw__13J3DDrawPacketFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DDrawPacket::draw() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/draw__13J3DDrawPacketFv.s" +void J3DDrawPacket::draw() { + mpDisplayListObj->callDL(); } -#pragma pop /* 80312948-803129A4 30D288 005C+00 0/0 1/1 0/0 .text __ct__12J3DMatPacketFv */ #pragma push @@ -407,36 +335,22 @@ asm J3DMatPacket::~J3DMatPacket() { } #pragma pop -/* 80312A04-80312A24 30D344 0020+00 0/0 3/3 0/0 .text - * addShapePacket__12J3DMatPacketFP14J3DShapePacket */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DMatPacket::addShapePacket(J3DShapePacket* param_0) { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/addShapePacket__12J3DMatPacketFP14J3DShapePacket.s" +void J3DMatPacket::addShapePacket(J3DShapePacket* pShape) { + if (mpFirstShapePacket == NULL) { + mpFirstShapePacket = pShape; + } else { + pShape->mpNextSibling = mpFirstShapePacket; + mpFirstShapePacket = pShape; + } } -#pragma pop -/* 80312A24-80312A4C 30D364 0028+00 0/0 1/1 0/0 .text beginDiff__12J3DMatPacketFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DMatPacket::beginDiff() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/beginDiff__12J3DMatPacketFv.s" +void J3DMatPacket::beginDiff() { + mpShapePacket->mpDisplayListObj->beginDL(); } -#pragma pop -/* 80312A4C-80312A74 30D38C 0028+00 0/0 1/1 0/0 .text endDiff__12J3DMatPacketFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void J3DMatPacket::endDiff() { - nofralloc -#include "asm/JSystem/J3DGraphBase/J3DPacket/endDiff__12J3DMatPacketFv.s" +void J3DMatPacket::endDiff() { + mpShapePacket->mpDisplayListObj->endDL(); } -#pragma pop /* 80312A74-80312A9C 30D3B4 0028+00 0/0 1/1 0/0 .text isSame__12J3DMatPacketCFP12J3DMatPacket */ #pragma push @@ -539,7 +453,7 @@ void J3DPacket::draw() { #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void J3DMatPacket::entry(J3DDrawBuffer* param_0) { +asm bool J3DMatPacket::entry(J3DDrawBuffer* param_0) { nofralloc #include "asm/JSystem/J3DGraphBase/J3DPacket/entry__12J3DMatPacketFP13J3DDrawBuffer.s" } diff --git a/libs/JSystem/J3DGraphBase/Makefile b/libs/JSystem/J3DGraphBase/Makefile index 570ccabb27..ba29c56e49 100644 --- a/libs/JSystem/J3DGraphBase/Makefile +++ b/libs/JSystem/J3DGraphBase/Makefile @@ -50,6 +50,6 @@ $(BUILD_DIR)/libJ3DGraphBase.a: $(LIBJ3DGRAPHBASE_A_O_FILES) $(BUILD_DIR)/libs/JSystem/J3DGraphBase/%.o: libs/JSystem/J3DGraphBase/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJ3DGRAPHBASE_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/J3DGraphLoader/Makefile b/libs/JSystem/J3DGraphLoader/Makefile index 146aac065f..cb2ac6536d 100644 --- a/libs/JSystem/J3DGraphLoader/Makefile +++ b/libs/JSystem/J3DGraphLoader/Makefile @@ -38,6 +38,6 @@ $(BUILD_DIR)/libJ3DGraphLoader.a: $(LIBJ3DGRAPHLOADER_A_O_FILES) $(BUILD_DIR)/libs/JSystem/J3DGraphLoader/%.o: libs/JSystem/J3DGraphLoader/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJ3DGRAPHLOADER_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/J3DU/Makefile b/libs/JSystem/J3DU/Makefile index dc5ee8538f..cb6818b81a 100644 --- a/libs/JSystem/J3DU/Makefile +++ b/libs/JSystem/J3DU/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libJ3DU.a: $(LIBJ3DU_A_O_FILES) $(BUILD_DIR)/libs/JSystem/J3DU/%.o: libs/JSystem/J3DU/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJ3DU_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JAudio2/Makefile b/libs/JSystem/JAudio2/Makefile index 3d1477e387..a972465840 100644 --- a/libs/JSystem/JAudio2/Makefile +++ b/libs/JSystem/JAudio2/Makefile @@ -158,6 +158,6 @@ $(BUILD_DIR)/libJAudio2.a: $(LIBJAUDIO2_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JAudio2/%.o: libs/JSystem/JAudio2/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJAUDIO2_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JFramework/Makefile b/libs/JSystem/JFramework/Makefile index 7692307e19..3b33a534d8 100644 --- a/libs/JSystem/JFramework/Makefile +++ b/libs/JSystem/JFramework/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libJFramework.a: $(LIBJFRAMEWORK_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JFramework/%.o: libs/JSystem/JFramework/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJFRAMEWORK_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JGadget/Makefile b/libs/JSystem/JGadget/Makefile index 81da3ff8e9..1d3039b99f 100644 --- a/libs/JSystem/JGadget/Makefile +++ b/libs/JSystem/JGadget/Makefile @@ -28,6 +28,6 @@ $(BUILD_DIR)/libJGadget.a: $(LIBJGADGET_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JGadget/%.o: libs/JSystem/JGadget/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJGADGET_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JKernel/Makefile b/libs/JSystem/JKernel/Makefile index 4e4cd52ec4..68065da495 100644 --- a/libs/JSystem/JKernel/Makefile +++ b/libs/JSystem/JKernel/Makefile @@ -72,6 +72,6 @@ $(BUILD_DIR)/libJKernel.a: $(LIBJKERNEL_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JKernel/%.o: libs/JSystem/JKernel/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJKERNEL_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JMath/Makefile b/libs/JSystem/JMath/Makefile index 327d59bc55..6f44bfa654 100644 --- a/libs/JSystem/JMath/Makefile +++ b/libs/JSystem/JMath/Makefile @@ -28,6 +28,6 @@ $(BUILD_DIR)/libJMath.a: $(LIBJMATH_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JMath/%.o: libs/JSystem/JMath/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJMATH_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JMessage/Makefile b/libs/JSystem/JMessage/Makefile index a0dcf0ee4d..6958df60eb 100644 --- a/libs/JSystem/JMessage/Makefile +++ b/libs/JSystem/JMessage/Makefile @@ -32,6 +32,6 @@ $(BUILD_DIR)/libJMessage.a: $(LIBJMESSAGE_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JMessage/%.o: libs/JSystem/JMessage/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJMESSAGE_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JParticle/Makefile b/libs/JSystem/JParticle/Makefile index 759b7d2ee3..20dc432b1d 100644 --- a/libs/JSystem/JParticle/Makefile +++ b/libs/JSystem/JParticle/Makefile @@ -52,6 +52,6 @@ $(BUILD_DIR)/libJParticle.a: $(LIBJPARTICLE_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JParticle/%.o: libs/JSystem/JParticle/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJPARTICLE_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JStage/Makefile b/libs/JSystem/JStage/Makefile index 223a9fa457..d7e2fb7c36 100644 --- a/libs/JSystem/JStage/Makefile +++ b/libs/JSystem/JStage/Makefile @@ -36,6 +36,6 @@ $(BUILD_DIR)/libJStage.a: $(LIBJSTAGE_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JStage/%.o: libs/JSystem/JStage/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJSTAGE_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JStudio/JStudio/Makefile b/libs/JSystem/JStudio/JStudio/Makefile index b092fc5baf..5f63aeff5f 100644 --- a/libs/JSystem/JStudio/JStudio/Makefile +++ b/libs/JSystem/JStudio/JStudio/Makefile @@ -50,6 +50,6 @@ $(BUILD_DIR)/libJStudio.a: $(LIBJSTUDIO_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JStudio/JStudio/%.o: libs/JSystem/JStudio/JStudio/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJSTUDIO_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JStudio/JStudio_JAudio2/Makefile b/libs/JSystem/JStudio/JStudio_JAudio2/Makefile index b17b2a4e76..e1d7941579 100644 --- a/libs/JSystem/JStudio/JStudio_JAudio2/Makefile +++ b/libs/JSystem/JStudio/JStudio_JAudio2/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libJStudio_JAudio2.a: $(LIBJSTUDIO_JAUDIO2_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JAudio2/%.o: libs/JSystem/JStudio/JStudio_JAudio2/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJSTUDIO_JAUDIO2_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JStudio/JStudio_JParticle/Makefile b/libs/JSystem/JStudio/JStudio_JParticle/Makefile index 826ed1e416..8bf67212e5 100644 --- a/libs/JSystem/JStudio/JStudio_JParticle/Makefile +++ b/libs/JSystem/JStudio/JStudio_JParticle/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libJStudio_JParticle.a: $(LIBJSTUDIO_JPARTICLE_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JParticle/%.o: libs/JSystem/JStudio/JStudio_JParticle/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJSTUDIO_JPARTICLE_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JStudio/JStudio_JStage/Makefile b/libs/JSystem/JStudio/JStudio_JStage/Makefile index 841a288d1f..f0116da19f 100644 --- a/libs/JSystem/JStudio/JStudio_JStage/Makefile +++ b/libs/JSystem/JStudio/JStudio_JStage/Makefile @@ -36,6 +36,6 @@ $(BUILD_DIR)/libJStudio_JStage.a: $(LIBJSTUDIO_JSTAGE_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JStudio/JStudio_JStage/%.o: libs/JSystem/JStudio/JStudio_JStage/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJSTUDIO_JSTAGE_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JSupport/Makefile b/libs/JSystem/JSupport/Makefile index 477294f20b..9961fb3e28 100644 --- a/libs/JSystem/JSupport/Makefile +++ b/libs/JSystem/JSupport/Makefile @@ -30,6 +30,6 @@ $(BUILD_DIR)/libJSupport.a: $(LIBJSUPPORT_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JSupport/%.o: libs/JSystem/JSupport/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJSUPPORT_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/JSystem/JUtility/JUTNameTab.cpp b/libs/JSystem/JUtility/JUTNameTab.cpp index 2aca981c22..5cc29e9a90 100644 --- a/libs/JSystem/JUtility/JUTNameTab.cpp +++ b/libs/JSystem/JUtility/JUTNameTab.cpp @@ -6,102 +6,49 @@ #include "JSystem/JUtility/JUTNameTab.h" #include "dol2asm.h" #include "dolphin/types.h" +#include "msl_c/string.h" -// -// Types: -// - -struct ResNTAB {}; - -struct JUTNameTab { - /* 802DE9A0 */ JUTNameTab(); - /* 802DE9E0 */ JUTNameTab(ResNTAB const*); - /* 802DEA1C */ void setResource(ResNTAB const*); - /* 802DEA58 */ void getIndex(char const*) const; - /* 802DEAF8 */ void getName(u16) const; - /* 802DEB28 */ void calcKeyCode(char const*) const; -}; - -// -// Forward References: -// - -extern "C" void __ct__10JUTNameTabFv(); -extern "C" void __ct__10JUTNameTabFPC7ResNTAB(); -extern "C" void setResource__10JUTNameTabFPC7ResNTAB(); -extern "C" void getIndex__10JUTNameTabCFPCc(); -extern "C" void getName__10JUTNameTabCFUs(); -extern "C" void calcKeyCode__10JUTNameTabCFPCc(); - -// -// External References: -// +JUTNameTab::JUTNameTab() { + setResource(NULL); +} -extern "C" void _savegpr_26(); -extern "C" void _restgpr_26(); -extern "C" void strcmp(); -extern "C" extern void* __vt__10JUTNameTab[3]; +JUTNameTab::JUTNameTab(const ResNTAB* pNameTable) { + setResource(pNameTable); +} -// -// Declarations: -// +void JUTNameTab::setResource(const ResNTAB* pNameTable) { + mpNameTable = pNameTable; -/* 802DE9A0-802DE9E0 2D92E0 0040+00 0/0 5/5 0/0 .text __ct__10JUTNameTabFv */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTNameTab::JUTNameTab() { - nofralloc -#include "asm/JSystem/JUtility/JUTNameTab/__ct__10JUTNameTabFv.s" + if (pNameTable != NULL) { + mNameNum = pNameTable->mEntryNum; + mpStrData = (const char*)(pNameTable->mEntries + mNameNum); + } else { + mNameNum = 0; + mpStrData = 0; + } } -#pragma pop -/* 802DE9E0-802DEA1C 2D9320 003C+00 0/0 12/12 0/0 .text __ct__10JUTNameTabFPC7ResNTAB */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm JUTNameTab::JUTNameTab(ResNTAB const* param_0) { - nofralloc -#include "asm/JSystem/JUtility/JUTNameTab/__ct__10JUTNameTabFPC7ResNTAB.s" -} -#pragma pop +s32 JUTNameTab::getIndex(const char* pName) const { + const ResNTAB::Entry* pEntry = mpNameTable->mEntries; + u16 keyCode = calcKeyCode(pName); -/* 802DEA1C-802DEA58 2D935C 003C+00 2/2 10/10 0/0 .text setResource__10JUTNameTabFPC7ResNTAB */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTNameTab::setResource(ResNTAB const* param_0) { - nofralloc -#include "asm/JSystem/JUtility/JUTNameTab/setResource__10JUTNameTabFPC7ResNTAB.s" -} -#pragma pop + for (u16 i = 0; i < mNameNum; pEntry++, i++) + if (pEntry->mKeyCode == keyCode && + strcmp((mpNameTable->mEntries[i].mOffs + ((const char*)mpNameTable)), pName) == 0) + return i; -/* 802DEA58-802DEAF8 2D9398 00A0+00 0/0 9/9 2/2 .text getIndex__10JUTNameTabCFPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTNameTab::getIndex(char const* param_0) const { - nofralloc -#include "asm/JSystem/JUtility/JUTNameTab/getIndex__10JUTNameTabCFPCc.s" + return -1; } -#pragma pop -/* 802DEAF8-802DEB28 2D9438 0030+00 0/0 14/14 23/23 .text getName__10JUTNameTabCFUs */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTNameTab::getName(u16 param_0) const { - nofralloc -#include "asm/JSystem/JUtility/JUTNameTab/getName__10JUTNameTabCFUs.s" +const char* JUTNameTab::getName(u16 index) const { + if (index < mNameNum) + return mpNameTable->getName(index); + return NULL; } -#pragma pop -/* 802DEB28-802DEB58 2D9468 0030+00 1/1 0/0 0/0 .text calcKeyCode__10JUTNameTabCFPCc */ -#pragma push -#pragma optimization_level 0 -#pragma optimizewithasm off -asm void JUTNameTab::calcKeyCode(char const* param_0) const { - nofralloc -#include "asm/JSystem/JUtility/JUTNameTab/calcKeyCode__10JUTNameTabCFPCc.s" +u16 JUTNameTab::calcKeyCode(const char* pName) const { + u32 keyCode = 0; + while (*pName) + keyCode = (keyCode * 3) + *pName++; + return keyCode; } -#pragma pop diff --git a/libs/JSystem/JUtility/Makefile b/libs/JSystem/JUtility/Makefile index 03fee1d7de..e1b97dfd47 100644 --- a/libs/JSystem/JUtility/Makefile +++ b/libs/JSystem/JUtility/Makefile @@ -62,6 +62,6 @@ $(BUILD_DIR)/libJUtility.a: $(LIBJUTILITY_A_O_FILES) $(BUILD_DIR)/libs/JSystem/JUtility/%.o: libs/JSystem/JUtility/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBJUTILITY_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/MSL_C.PPCEABI.bare.H/Makefile b/libs/MSL_C.PPCEABI.bare.H/Makefile index ac467802dc..383edf5728 100644 --- a/libs/MSL_C.PPCEABI.bare.H/Makefile +++ b/libs/MSL_C.PPCEABI.bare.H/Makefile @@ -134,6 +134,6 @@ $(BUILD_DIR)/libMSL_C.PPCEABI.bare.H.a: $(LIBMSL_C_PPCEABI_BARE_H_A_O_FILES) $(BUILD_DIR)/libs/MSL_C.PPCEABI.bare.H/%.o: libs/MSL_C.PPCEABI.bare.H/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBMSL_C_PPCEABI_BARE_H_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/Runtime.PPCEABI.H/Makefile b/libs/Runtime.PPCEABI.H/Makefile index 2c729716a9..427cc7a8bb 100644 --- a/libs/Runtime.PPCEABI.H/Makefile +++ b/libs/Runtime.PPCEABI.H/Makefile @@ -40,6 +40,6 @@ $(BUILD_DIR)/libRuntime.PPCEABI.H.a: $(LIBRUNTIME_PPCEABI_H_A_O_FILES) $(BUILD_DIR)/libs/Runtime.PPCEABI.H/%.o: libs/Runtime.PPCEABI.H/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBRUNTIME_PPCEABI_H_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/SSystem/SComponent/Makefile b/libs/SSystem/SComponent/Makefile index cabef9159d..f69e2c250c 100644 --- a/libs/SSystem/SComponent/Makefile +++ b/libs/SSystem/SComponent/Makefile @@ -98,6 +98,6 @@ $(BUILD_DIR)/libSComponent.a: $(LIBSCOMPONENT_A_O_FILES) $(BUILD_DIR)/libs/SSystem/SComponent/%.o: libs/SSystem/SComponent/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBSCOMPONENT_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/SSystem/SStandard/Makefile b/libs/SSystem/SStandard/Makefile index 4ac517ae6c..33a049acc2 100644 --- a/libs/SSystem/SStandard/Makefile +++ b/libs/SSystem/SStandard/Makefile @@ -24,6 +24,6 @@ $(BUILD_DIR)/libSStandard.a: $(LIBSSTANDARD_A_O_FILES) $(BUILD_DIR)/libs/SSystem/SStandard/%.o: libs/SSystem/SStandard/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBSSTANDARD_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/TRK_MINNOW_DOLPHIN/Makefile b/libs/TRK_MINNOW_DOLPHIN/Makefile index 11e2ef1405..5306be0a54 100644 --- a/libs/TRK_MINNOW_DOLPHIN/Makefile +++ b/libs/TRK_MINNOW_DOLPHIN/Makefile @@ -80,6 +80,6 @@ $(BUILD_DIR)/libTRK_MINNOW_DOLPHIN.a: $(LIBTRK_MINNOW_DOLPHIN_A_O_FILES) $(BUILD_DIR)/libs/TRK_MINNOW_DOLPHIN/%.o: libs/TRK_MINNOW_DOLPHIN/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBTRK_MINNOW_DOLPHIN_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/Z2AudioLib/Makefile b/libs/Z2AudioLib/Makefile index d82186c9c8..824d9fece5 100644 --- a/libs/Z2AudioLib/Makefile +++ b/libs/Z2AudioLib/Makefile @@ -64,6 +64,6 @@ $(BUILD_DIR)/libZ2AudioLib.a: $(LIBZ2AUDIOLIB_A_O_FILES) $(BUILD_DIR)/libs/Z2AudioLib/%.o: libs/Z2AudioLib/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBZ2AUDIOLIB_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/amcstubs/Makefile b/libs/amcstubs/Makefile index aaaf17046b..73ea658c60 100644 --- a/libs/amcstubs/Makefile +++ b/libs/amcstubs/Makefile @@ -24,6 +24,6 @@ $(BUILD_DIR)/libamcstubs.a: $(LIBAMCSTUBS_A_O_FILES) $(BUILD_DIR)/libs/amcstubs/%.o: libs/amcstubs/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBAMCSTUBS_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/ai/Makefile b/libs/dolphin/ai/Makefile index a2d112f41c..488cc4de36 100644 --- a/libs/dolphin/ai/Makefile +++ b/libs/dolphin/ai/Makefile @@ -24,6 +24,6 @@ $(BUILD_DIR)/libai.a: $(LIBAI_A_O_FILES) $(BUILD_DIR)/libs/dolphin/ai/%.o: libs/dolphin/ai/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBAI_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/ar/Makefile b/libs/dolphin/ar/Makefile index 9819b5446c..a1349c0835 100644 --- a/libs/dolphin/ar/Makefile +++ b/libs/dolphin/ar/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libar.a: $(LIBAR_A_O_FILES) $(BUILD_DIR)/libs/dolphin/ar/%.o: libs/dolphin/ar/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBAR_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/base/Makefile b/libs/dolphin/base/Makefile index a20f0e1cfa..32082de384 100644 --- a/libs/dolphin/base/Makefile +++ b/libs/dolphin/base/Makefile @@ -24,6 +24,6 @@ $(BUILD_DIR)/libbase.a: $(LIBBASE_A_O_FILES) $(BUILD_DIR)/libs/dolphin/base/%.o: libs/dolphin/base/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBBASE_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/card/Makefile b/libs/dolphin/card/Makefile index c36a4b1479..a75715a5b6 100644 --- a/libs/dolphin/card/Makefile +++ b/libs/dolphin/card/Makefile @@ -50,6 +50,6 @@ $(BUILD_DIR)/libcard.a: $(LIBCARD_A_O_FILES) $(BUILD_DIR)/libs/dolphin/card/%.o: libs/dolphin/card/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBCARD_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/db/Makefile b/libs/dolphin/db/Makefile index 9dd5863cbb..dfd026922e 100644 --- a/libs/dolphin/db/Makefile +++ b/libs/dolphin/db/Makefile @@ -24,6 +24,6 @@ $(BUILD_DIR)/libdb.a: $(LIBDB_A_O_FILES) $(BUILD_DIR)/libs/dolphin/db/%.o: libs/dolphin/db/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBDB_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/dsp/Makefile b/libs/dolphin/dsp/Makefile index f471059d91..de59b8f4f7 100644 --- a/libs/dolphin/dsp/Makefile +++ b/libs/dolphin/dsp/Makefile @@ -28,6 +28,6 @@ $(BUILD_DIR)/libdsp.a: $(LIBDSP_A_O_FILES) $(BUILD_DIR)/libs/dolphin/dsp/%.o: libs/dolphin/dsp/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBDSP_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/dvd/Makefile b/libs/dolphin/dvd/Makefile index 5d9f800193..d0d26f016e 100644 --- a/libs/dolphin/dvd/Makefile +++ b/libs/dolphin/dvd/Makefile @@ -38,6 +38,6 @@ $(BUILD_DIR)/libdvd.a: $(LIBDVD_A_O_FILES) $(BUILD_DIR)/libs/dolphin/dvd/%.o: libs/dolphin/dvd/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBDVD_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/gd/Makefile b/libs/dolphin/gd/Makefile index e3b0bf2636..d1d0ac5e37 100644 --- a/libs/dolphin/gd/Makefile +++ b/libs/dolphin/gd/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libgd.a: $(LIBGD_A_O_FILES) $(BUILD_DIR)/libs/dolphin/gd/%.o: libs/dolphin/gd/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBGD_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/gf/Makefile b/libs/dolphin/gf/Makefile index 8562cb43c4..5ecee412df 100644 --- a/libs/dolphin/gf/Makefile +++ b/libs/dolphin/gf/Makefile @@ -30,6 +30,6 @@ $(BUILD_DIR)/libgf.a: $(LIBGF_A_O_FILES) $(BUILD_DIR)/libs/dolphin/gf/%.o: libs/dolphin/gf/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBGF_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/gx/GXDisplayList.cpp b/libs/dolphin/gx/GXDisplayList.cpp index dfb8c98ae7..db3eaf7417 100644 --- a/libs/dolphin/gx/GXDisplayList.cpp +++ b/libs/dolphin/gx/GXDisplayList.cpp @@ -8,12 +8,6 @@ #include "dolphin/types.h" // -// Forward References: -// - -extern "C" void GXCallDisplayList(); - -// // External References: // @@ -29,7 +23,7 @@ extern "C" extern void* __GXData; #pragma push #pragma optimization_level 0 #pragma optimizewithasm off -asm void GXCallDisplayList() { +asm void GXCallDisplayList(const void* pDL, u32 size) { nofralloc #include "asm/dolphin/gx/GXDisplayList/GXCallDisplayList.s" } diff --git a/libs/dolphin/gx/Makefile b/libs/dolphin/gx/Makefile index a3ca18eba4..1f065b9ac0 100644 --- a/libs/dolphin/gx/Makefile +++ b/libs/dolphin/gx/Makefile @@ -50,6 +50,6 @@ $(BUILD_DIR)/libgx.a: $(LIBGX_A_O_FILES) $(BUILD_DIR)/libs/dolphin/gx/%.o: libs/dolphin/gx/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBGX_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/mtx/Makefile b/libs/dolphin/mtx/Makefile index 4860a90806..3413df5f11 100644 --- a/libs/dolphin/mtx/Makefile +++ b/libs/dolphin/mtx/Makefile @@ -32,6 +32,6 @@ $(BUILD_DIR)/libmtx.a: $(LIBMTX_A_O_FILES) $(BUILD_DIR)/libs/dolphin/mtx/%.o: libs/dolphin/mtx/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBMTX_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/os/Makefile b/libs/dolphin/os/Makefile index 333f90e82b..76cc338825 100644 --- a/libs/dolphin/os/Makefile +++ b/libs/dolphin/os/Makefile @@ -68,6 +68,6 @@ $(BUILD_DIR)/libos.a: $(LIBOS_A_O_FILES) $(BUILD_DIR)/libs/dolphin/os/%.o: libs/dolphin/os/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBOS_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/pad/Makefile b/libs/dolphin/pad/Makefile index fd47b7f841..9b12c9394c 100644 --- a/libs/dolphin/pad/Makefile +++ b/libs/dolphin/pad/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libpad.a: $(LIBPAD_A_O_FILES) $(BUILD_DIR)/libs/dolphin/pad/%.o: libs/dolphin/pad/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBPAD_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/si/Makefile b/libs/dolphin/si/Makefile index b6ddf7af8e..8fdf102976 100644 --- a/libs/dolphin/si/Makefile +++ b/libs/dolphin/si/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libsi.a: $(LIBSI_A_O_FILES) $(BUILD_DIR)/libs/dolphin/si/%.o: libs/dolphin/si/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBSI_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/dolphin/vi/Makefile b/libs/dolphin/vi/Makefile index 7b07cfdb91..069d9bfa3e 100644 --- a/libs/dolphin/vi/Makefile +++ b/libs/dolphin/vi/Makefile @@ -24,6 +24,6 @@ $(BUILD_DIR)/libvi.a: $(LIBVI_A_O_FILES) $(BUILD_DIR)/libs/dolphin/vi/%.o: libs/dolphin/vi/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBVI_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/exi/Makefile b/libs/exi/Makefile index 832144d255..0947c5243f 100644 --- a/libs/exi/Makefile +++ b/libs/exi/Makefile @@ -26,6 +26,6 @@ $(BUILD_DIR)/libexi.a: $(LIBEXI_A_O_FILES) $(BUILD_DIR)/libs/exi/%.o: libs/exi/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBEXI_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/odemuexi2/Makefile b/libs/odemuexi2/Makefile index 04cc7290a1..23f8029527 100644 --- a/libs/odemuexi2/Makefile +++ b/libs/odemuexi2/Makefile @@ -24,6 +24,6 @@ $(BUILD_DIR)/libodemuexi2.a: $(LIBODEMUEXI2_A_O_FILES) $(BUILD_DIR)/libs/odemuexi2/%.o: libs/odemuexi2/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBODEMUEXI2_A_CFLAGS) -c -o $@ $@.iconv.cpp diff --git a/libs/odenotstub/Makefile b/libs/odenotstub/Makefile index d54e3ab7a5..08080085f4 100644 --- a/libs/odenotstub/Makefile +++ b/libs/odenotstub/Makefile @@ -24,6 +24,6 @@ $(BUILD_DIR)/libodenotstub.a: $(LIBODENOTSTUB_A_O_FILES) $(BUILD_DIR)/libs/odenotstub/%.o: libs/odenotstub/%.cpp @mkdir -p $(@D) @echo building... $< - @iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $< + @iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp @$(CC) $(CFLAGS) $(LIBODENOTSTUB_A_CFLAGS) -c -o $@ $@.iconv.cpp |