mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-05-23 06:54:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Makefile fixes / JUTNameTab (#129)

Browse Source 
* 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>
This commit is contained in:
Jasper St. Pierre
2021-05-10 08:54:07 -07:00
committed by GitHub
parent 9799fadfe8
commit 462d71cbef
836 changed files with 1165 additions and 1529 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+1 -1
View File
@@ -127,7 +127,7 @@ $(ELF): $(LIBS) $(O_FILES)
$(BUILD_DIR)/%.o: %.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) -c -o $@ $@.iconv.cpp
# shared cpp files for RELs
asm/JSystem/J3DGraphBase/J3DDrawBuffer/__dt__13J3DDrawBufferFv.s
-26
View File
@@ -1,26 +0,0 @@
lbl_80325008:
/* 80325008 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8032500C 7C 08 02 A6 */ mflr r0
/* 80325010 90 01 00 14 */ stw r0, 0x14(r1)
/* 80325014 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80325018 93 C1 00 08 */ stw r30, 8(r1)
/* 8032501C 7C 7E 1B 79 */ or. r30, r3, r3
/* 80325020 7C 9F 23 78 */ mr r31, r4
/* 80325024 41 82 00 28 */ beq lbl_8032504C
/* 80325028 48 00 00 41 */ bl frameInit__13J3DDrawBufferFv
/* 8032502C 80 7E 00 00 */ lwz r3, 0(r30)
/* 80325030 4B FA 9D 31 */ bl __dla__FPv
/* 80325034 38 00 00 00 */ li r0, 0
/* 80325038 90 1E 00 00 */ stw r0, 0(r30)
/* 8032503C 7F E0 07 35 */ extsh. r0, r31
/* 80325040 40 81 00 0C */ ble lbl_8032504C
/* 80325044 7F C3 F3 78 */ mr r3, r30
/* 80325048 4B FA 9C F5 */ bl __dl__FPv
lbl_8032504C:
/* 8032504C 7F C3 F3 78 */ mr r3, r30
/* 80325050 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 80325054 83 C1 00 08 */ lwz r30, 8(r1)
/* 80325058 80 01 00 14 */ lwz r0, 0x14(r1)
/* 8032505C 7C 08 03 A6 */ mtlr r0
/* 80325060 38 21 00 10 */ addi r1, r1, 0x10
/* 80325064 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DDrawBuffer/allocBuffer__13J3DDrawBufferFUl.s
-41
View File
@@ -1,41 +0,0 @@
lbl_80324F70:
/* 80324F70 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 80324F74 7C 08 02 A6 */ mflr r0
/* 80324F78 90 01 00 24 */ stw r0, 0x24(r1)
/* 80324F7C 93 E1 00 1C */ stw r31, 0x1c(r1)
/* 80324F80 93 C1 00 18 */ stw r30, 0x18(r1)
/* 80324F84 7C 7E 1B 78 */ mr r30, r3
/* 80324F88 7C 9F 23 78 */ mr r31, r4
/* 80324F8C 54 83 10 3A */ slwi r3, r4, 2
/* 80324F90 38 80 00 20 */ li r4, 0x20
/* 80324F94 4B FA 9D 59 */ bl __nwa__FUli
/* 80324F98 90 7E 00 00 */ stw r3, 0(r30)
/* 80324F9C 80 1E 00 00 */ lwz r0, 0(r30)
/* 80324FA0 28 00 00 00 */ cmplwi r0, 0
/* 80324FA4 40 82 00 0C */ bne lbl_80324FB0
/* 80324FA8 38 60 00 04 */ li r3, 4
/* 80324FAC 48 00 00 44 */ b lbl_80324FF0
lbl_80324FB0:
/* 80324FB0 93 FE 00 04 */ stw r31, 4(r30)
/* 80324FB4 7F C3 F3 78 */ mr r3, r30
/* 80324FB8 48 00 00 B1 */ bl frameInit__13J3DDrawBufferFv
/* 80324FBC C0 3E 00 14 */ lfs f1, 0x14(r30)
/* 80324FC0 C0 1E 00 10 */ lfs f0, 0x10(r30)
/* 80324FC4 EC 41 00 28 */ fsubs f2, f1, f0
/* 80324FC8 80 1E 00 04 */ lwz r0, 4(r30)
/* 80324FCC C8 22 CA 08 */ lfd f1, lit_784(r2)
/* 80324FD0 90 01 00 0C */ stw r0, 0xc(r1)
/* 80324FD4 3C 00 43 30 */ lis r0, 0x4330
/* 80324FD8 90 01 00 08 */ stw r0, 8(r1)
/* 80324FDC C8 01 00 08 */ lfd f0, 8(r1)
/* 80324FE0 EC 00 08 28 */ fsubs f0, f0, f1
/* 80324FE4 EC 02 00 24 */ fdivs f0, f2, f0
/* 80324FE8 D0 1E 00 18 */ stfs f0, 0x18(r30)
/* 80324FEC 38 60 00 00 */ li r3, 0
lbl_80324FF0:
/* 80324FF0 83 E1 00 1C */ lwz r31, 0x1c(r1)
/* 80324FF4 83 C1 00 18 */ lwz r30, 0x18(r1)
/* 80324FF8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 80324FFC 7C 08 03 A6 */ mtlr r0
/* 80325000 38 21 00 20 */ addi r1, r1, 0x20
/* 80325004 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryImm__13J3DDrawBufferFP9J3DPacketUs.s
-9
View File
@@ -1,9 +0,0 @@
lbl_8032548C:
/* 8032548C 80 C3 00 00 */ lwz r6, 0(r3)
/* 80325490 54 A5 13 BA */ rlwinm r5, r5, 2, 0xe, 0x1d
/* 80325494 7C 06 28 2E */ lwzx r0, r6, r5
/* 80325498 90 04 00 04 */ stw r0, 4(r4)
/* 8032549C 80 63 00 00 */ lwz r3, 0(r3)
/* 803254A0 7C 83 29 2E */ stwx r4, r3, r5
/* 803254A4 38 60 00 01 */ li r3, 1
/* 803254A8 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DDrawBuffer/entryNonSort__13J3DDrawBufferFP12J3DMatPacket.s
-14
View File
@@ -1,14 +0,0 @@
lbl_80325458:
/* 80325458 38 00 00 00 */ li r0, 0
/* 8032545C 90 04 00 04 */ stw r0, 4(r4)
/* 80325460 90 04 00 08 */ stw r0, 8(r4)
/* 80325464 80 A4 00 2C */ lwz r5, 0x2c(r4)
/* 80325468 90 05 00 04 */ stw r0, 4(r5)
/* 8032546C 90 05 00 08 */ stw r0, 8(r5)
/* 80325470 80 A3 00 00 */ lwz r5, 0(r3)
/* 80325474 80 05 00 00 */ lwz r0, 0(r5)
/* 80325478 90 04 00 04 */ stw r0, 4(r4)
/* 8032547C 80 63 00 00 */ lwz r3, 0(r3)
/* 80325480 90 83 00 00 */ stw r4, 0(r3)
/* 80325484 38 60 00 01 */ li r3, 1
/* 80325488 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DDrawBuffer/initialize__13J3DDrawBufferFv.s
-27
View File
@@ -1,27 +0,0 @@
lbl_80324F08:
/* 80324F08 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80324F0C 38 00 00 00 */ li r0, 0
/* 80324F10 90 03 00 08 */ stw r0, 8(r3)
/* 80324F14 90 03 00 0C */ stw r0, 0xc(r3)
/* 80324F18 C0 02 CA 00 */ lfs f0, lit_781(r2)
/* 80324F1C D0 03 00 10 */ stfs f0, 0x10(r3)
/* 80324F20 C0 02 CA 04 */ lfs f0, lit_782(r2)
/* 80324F24 D0 03 00 14 */ stfs f0, 0x14(r3)
/* 80324F28 90 03 00 1C */ stw r0, 0x1c(r3)
/* 80324F2C 90 03 00 20 */ stw r0, 0x20(r3)
/* 80324F30 38 00 00 20 */ li r0, 0x20
/* 80324F34 90 03 00 04 */ stw r0, 4(r3)
/* 80324F38 C0 23 00 14 */ lfs f1, 0x14(r3)
/* 80324F3C C0 03 00 10 */ lfs f0, 0x10(r3)
/* 80324F40 EC 41 00 28 */ fsubs f2, f1, f0
/* 80324F44 80 03 00 04 */ lwz r0, 4(r3)
/* 80324F48 C8 22 CA 08 */ lfd f1, lit_784(r2)
/* 80324F4C 90 01 00 0C */ stw r0, 0xc(r1)
/* 80324F50 3C 00 43 30 */ lis r0, 0x4330
/* 80324F54 90 01 00 08 */ stw r0, 8(r1)
/* 80324F58 C8 01 00 08 */ lfd f0, 8(r1)
/* 80324F5C EC 00 08 28 */ fsubs f0, f0, f1
/* 80324F60 EC 02 00 24 */ fdivs f0, f2, f0
/* 80324F64 D0 03 00 18 */ stfs f0, 0x18(r3)
/* 80324F68 38 21 00 10 */ addi r1, r1, 0x10
/* 80324F6C 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DPacket/addChildPacket__9J3DPacketFP9J3DPacket.s
-10
View File
@@ -1,10 +0,0 @@
lbl_80312758:
/* 80312758 80 03 00 08 */ lwz r0, 8(r3)
/* 8031275C 28 00 00 00 */ cmplwi r0, 0
/* 80312760 40 82 00 0C */ bne lbl_8031276C
/* 80312764 90 83 00 08 */ stw r4, 8(r3)
/* 80312768 4E 80 00 20 */ blr
lbl_8031276C:
/* 8031276C 90 04 00 04 */ stw r0, 4(r4)
/* 80312770 90 83 00 08 */ stw r4, 8(r3)
/* 80312774 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DPacket/addShapePacket__12J3DMatPacketFP14J3DShapePacket.s
-10
View File
@@ -1,10 +0,0 @@
lbl_80312A04:
/* 80312A04 80 03 00 2C */ lwz r0, 0x2c(r3)
/* 80312A08 28 00 00 00 */ cmplwi r0, 0
/* 80312A0C 40 82 00 0C */ bne lbl_80312A18
/* 80312A10 90 83 00 2C */ stw r4, 0x2c(r3)
/* 80312A14 4E 80 00 20 */ blr
lbl_80312A18:
/* 80312A18 90 04 00 04 */ stw r0, 4(r4)
/* 80312A1C 90 83 00 2C */ stw r4, 0x2c(r3)
/* 80312A20 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DPacket/beginDiff__12J3DMatPacketFv.s
-11
View File
@@ -1,11 +0,0 @@
lbl_80312A24:
/* 80312A24 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80312A28 7C 08 02 A6 */ mflr r0
/* 80312A2C 90 01 00 14 */ stw r0, 0x14(r1)
/* 80312A30 80 63 00 28 */ lwz r3, 0x28(r3)
/* 80312A34 80 63 00 20 */ lwz r3, 0x20(r3)
/* 80312A38 4B FF FC 0D */ bl beginDL__17J3DDisplayListObjFv
/* 80312A3C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80312A40 7C 08 03 A6 */ mtlr r0
/* 80312A44 38 21 00 10 */ addi r1, r1, 0x10
/* 80312A48 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DPacket/endDiff__12J3DMatPacketFv.s
-11
View File
@@ -1,11 +0,0 @@
lbl_80312A4C:
/* 80312A4C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80312A50 7C 08 02 A6 */ mflr r0
/* 80312A54 90 01 00 14 */ stw r0, 0x14(r1)
/* 80312A58 80 63 00 28 */ lwz r3, 0x28(r3)
/* 80312A5C 80 63 00 20 */ lwz r3, 0x20(r3)
/* 80312A60 4B FF FC 39 */ bl endDL__17J3DDisplayListObjFv
/* 80312A64 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80312A68 7C 08 03 A6 */ mtlr r0
/* 80312A6C 38 21 00 10 */ addi r1, r1, 0x10
/* 80312A70 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DPacket/newDisplayList__17J3DDisplayListObjFUl.s
-36
View File
@@ -1,36 +0,0 @@
lbl_80312488:
/* 80312488 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8031248C 7C 08 02 A6 */ mflr r0
/* 80312490 90 01 00 14 */ stw r0, 0x14(r1)
/* 80312494 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80312498 7C 7F 1B 78 */ mr r31, r3
/* 8031249C 38 04 00 1F */ addi r0, r4, 0x1f
/* 803124A0 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a
/* 803124A4 90 03 00 0C */ stw r0, 0xc(r3)
/* 803124A8 80 63 00 0C */ lwz r3, 0xc(r3)
/* 803124AC 38 80 00 20 */ li r4, 0x20
/* 803124B0 4B FB C8 3D */ bl __nwa__FUli
/* 803124B4 90 7F 00 00 */ stw r3, 0(r31)
/* 803124B8 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 803124BC 38 80 00 20 */ li r4, 0x20
/* 803124C0 4B FB C8 2D */ bl __nwa__FUli
/* 803124C4 90 7F 00 04 */ stw r3, 4(r31)
/* 803124C8 38 00 00 00 */ li r0, 0
/* 803124CC 90 1F 00 08 */ stw r0, 8(r31)
/* 803124D0 80 1F 00 00 */ lwz r0, 0(r31)
/* 803124D4 28 00 00 00 */ cmplwi r0, 0
/* 803124D8 41 82 00 10 */ beq lbl_803124E8
/* 803124DC 80 1F 00 04 */ lwz r0, 4(r31)
/* 803124E0 28 00 00 00 */ cmplwi r0, 0
/* 803124E4 40 82 00 0C */ bne lbl_803124F0
lbl_803124E8:
/* 803124E8 38 60 00 04 */ li r3, 4
/* 803124EC 48 00 00 08 */ b lbl_803124F4
lbl_803124F0:
/* 803124F0 38 60 00 00 */ li r3, 0
lbl_803124F4:
/* 803124F4 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 803124F8 80 01 00 14 */ lwz r0, 0x14(r1)
/* 803124FC 7C 08 03 A6 */ mtlr r0
/* 80312500 38 21 00 10 */ addi r1, r1, 0x10
/* 80312504 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DPacket/newSingleDisplayList__17J3DDisplayListObjFUl.s
-27
View File
@@ -1,27 +0,0 @@
lbl_80312508:
/* 80312508 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 8031250C 7C 08 02 A6 */ mflr r0
/* 80312510 90 01 00 14 */ stw r0, 0x14(r1)
/* 80312514 93 E1 00 0C */ stw r31, 0xc(r1)
/* 80312518 7C 7F 1B 78 */ mr r31, r3
/* 8031251C 38 04 00 1F */ addi r0, r4, 0x1f
/* 80312520 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a
/* 80312524 90 03 00 0C */ stw r0, 0xc(r3)
/* 80312528 80 63 00 0C */ lwz r3, 0xc(r3)
/* 8031252C 38 80 00 20 */ li r4, 0x20
/* 80312530 4B FB C7 BD */ bl __nwa__FUli
/* 80312534 90 7F 00 00 */ stw r3, 0(r31)
/* 80312538 80 1F 00 00 */ lwz r0, 0(r31)
/* 8031253C 90 1F 00 04 */ stw r0, 4(r31)
/* 80312540 38 60 00 00 */ li r3, 0
/* 80312544 90 7F 00 08 */ stw r3, 8(r31)
/* 80312548 80 1F 00 00 */ lwz r0, 0(r31)
/* 8031254C 28 00 00 00 */ cmplwi r0, 0
/* 80312550 40 82 00 08 */ bne lbl_80312558
/* 80312554 38 60 00 04 */ li r3, 4
lbl_80312558:
/* 80312558 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 8031255C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 80312560 7C 08 03 A6 */ mtlr r0
/* 80312564 38 21 00 10 */ addi r1, r1, 0x10
/* 80312568 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DPacket/setSingleDisplayList__17J3DDisplayListObjFPvUl.s
-9
View File
@@ -1,9 +0,0 @@
lbl_803125E4:
/* 803125E4 38 05 00 1F */ addi r0, r5, 0x1f
/* 803125E8 54 00 00 34 */ rlwinm r0, r0, 0, 0, 0x1a
/* 803125EC 90 03 00 0C */ stw r0, 0xc(r3)
/* 803125F0 90 83 00 00 */ stw r4, 0(r3)
/* 803125F4 80 03 00 00 */ lwz r0, 0(r3)
/* 803125F8 90 03 00 04 */ stw r0, 4(r3)
/* 803125FC 90 A3 00 08 */ stw r5, 8(r3)
/* 80312600 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DPacket/single_To_Double__17J3DDisplayListObjFv.s
-34
View File
@@ -1,34 +0,0 @@
lbl_8031256C:
/* 8031256C 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 80312570 7C 08 02 A6 */ mflr r0
/* 80312574 90 01 00 14 */ stw r0, 0x14(r1)
/* 80312578 93 E1 00 0C */ stw r31, 0xc(r1)
/* 8031257C 7C 7F 1B 78 */ mr r31, r3
/* 80312580 80 63 00 00 */ lwz r3, 0(r3)
/* 80312584 80 1F 00 04 */ lwz r0, 4(r31)
/* 80312588 7C 03 00 40 */ cmplw r3, r0
/* 8031258C 40 82 00 40 */ bne lbl_803125CC
/* 80312590 80 7F 00 0C */ lwz r3, 0xc(r31)
/* 80312594 38 80 00 20 */ li r4, 0x20
/* 80312598 4B FB C7 55 */ bl __nwa__FUli
/* 8031259C 90 7F 00 04 */ stw r3, 4(r31)
/* 803125A0 80 7F 00 04 */ lwz r3, 4(r31)
/* 803125A4 28 03 00 00 */ cmplwi r3, 0
/* 803125A8 40 82 00 0C */ bne lbl_803125B4
/* 803125AC 38 60 00 04 */ li r3, 4
/* 803125B0 48 00 00 20 */ b lbl_803125D0
lbl_803125B4:
/* 803125B4 80 9F 00 00 */ lwz r4, 0(r31)
/* 803125B8 80 BF 00 0C */ lwz r5, 0xc(r31)
/* 803125BC 4B CF 0F 85 */ bl memcpy
/* 803125C0 80 7F 00 04 */ lwz r3, 4(r31)
/* 803125C4 80 9F 00 0C */ lwz r4, 0xc(r31)
/* 803125C8 48 02 90 15 */ bl DCStoreRange
lbl_803125CC:
/* 803125CC 38 60 00 00 */ li r3, 0
lbl_803125D0:
/* 803125D0 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 803125D4 80 01 00 14 */ lwz r0, 0x14(r1)
/* 803125D8 7C 08 03 A6 */ mtlr r0
/* 803125DC 38 21 00 10 */ addi r1, r1, 0x10
/* 803125E0 4E 80 00 20 */ blr
asm/JSystem/J3DGraphBase/J3DPacket/swapBuffer__17J3DDisplayListObjFv.s
-6
View File
@@ -1,6 +0,0 @@
lbl_80312604:
/* 80312604 80 83 00 00 */ lwz r4, 0(r3)
/* 80312608 80 03 00 04 */ lwz r0, 4(r3)
/* 8031260C 90 03 00 00 */ stw r0, 0(r3)
/* 80312610 90 83 00 04 */ stw r4, 4(r3)
/* 80312614 4E 80 00 20 */ blr
asm/JSystem/JUtility/JUTNameTab/__ct__10JUTNameTabFPC7ResNTAB.s
-16
View File
@@ -1,16 +0,0 @@
lbl_802DE9E0:
/* 802DE9E0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802DE9E4 7C 08 02 A6 */ mflr r0
/* 802DE9E8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802DE9EC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802DE9F0 7C 7F 1B 78 */ mr r31, r3
/* 802DE9F4 3C A0 80 3C */ lis r5, __vt__10JUTNameTab@ha /* 0x803BB3DC@ha */
/* 802DE9F8 38 05 B3 DC */ addi r0, r5, __vt__10JUTNameTab@l /* 0x803BB3DC@l */
/* 802DE9FC 90 03 00 00 */ stw r0, 0(r3)
/* 802DEA00 48 00 00 1D */ bl setResource__10JUTNameTabFPC7ResNTAB
/* 802DEA04 7F E3 FB 78 */ mr r3, r31
/* 802DEA08 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802DEA0C 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802DEA10 7C 08 03 A6 */ mtlr r0
/* 802DEA14 38 21 00 10 */ addi r1, r1, 0x10
/* 802DEA18 4E 80 00 20 */ blr
asm/JSystem/JUtility/JUTNameTab/__ct__10JUTNameTabFv.s
-17
View File
@@ -1,17 +0,0 @@
lbl_802DE9A0:
/* 802DE9A0 94 21 FF F0 */ stwu r1, -0x10(r1)
/* 802DE9A4 7C 08 02 A6 */ mflr r0
/* 802DE9A8 90 01 00 14 */ stw r0, 0x14(r1)
/* 802DE9AC 93 E1 00 0C */ stw r31, 0xc(r1)
/* 802DE9B0 7C 7F 1B 78 */ mr r31, r3
/* 802DE9B4 3C 80 80 3C */ lis r4, __vt__10JUTNameTab@ha /* 0x803BB3DC@ha */
/* 802DE9B8 38 04 B3 DC */ addi r0, r4, __vt__10JUTNameTab@l /* 0x803BB3DC@l */
/* 802DE9BC 90 03 00 00 */ stw r0, 0(r3)
/* 802DE9C0 38 80 00 00 */ li r4, 0
/* 802DE9C4 48 00 00 59 */ bl setResource__10JUTNameTabFPC7ResNTAB
/* 802DE9C8 7F E3 FB 78 */ mr r3, r31
/* 802DE9CC 83 E1 00 0C */ lwz r31, 0xc(r1)
/* 802DE9D0 80 01 00 14 */ lwz r0, 0x14(r1)
/* 802DE9D4 7C 08 03 A6 */ mtlr r0
/* 802DE9D8 38 21 00 10 */ addi r1, r1, 0x10
/* 802DE9DC 4E 80 00 20 */ blr
asm/JSystem/JUtility/JUTNameTab/calcKeyCode__10JUTNameTabCFPCc.s
-15
View File
@@ -1,15 +0,0 @@
lbl_802DEB28:
/* 802DEB28 38 A0 00 00 */ li r5, 0
/* 802DEB2C 48 00 00 18 */ b lbl_802DEB44
lbl_802DEB30:
/* 802DEB30 88 04 00 00 */ lbz r0, 0(r4)
/* 802DEB34 7C 03 07 74 */ extsb r3, r0
/* 802DEB38 1C 05 00 03 */ mulli r0, r5, 3
/* 802DEB3C 7C A3 02 14 */ add r5, r3, r0
/* 802DEB40 38 84 00 01 */ addi r4, r4, 1
lbl_802DEB44:
/* 802DEB44 88 04 00 00 */ lbz r0, 0(r4)
/* 802DEB48 7C 00 07 75 */ extsb. r0, r0
/* 802DEB4C 40 82 FF E4 */ bne lbl_802DEB30
/* 802DEB50 54 A3 04 3E */ clrlwi r3, r5, 0x10
/* 802DEB54 4E 80 00 20 */ blr
asm/JSystem/JUtility/JUTNameTab/getIndex__10JUTNameTabCFPCc.s
-45
View File
@@ -1,45 +0,0 @@
lbl_802DEA58:
/* 802DEA58 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 802DEA5C 7C 08 02 A6 */ mflr r0
/* 802DEA60 90 01 00 24 */ stw r0, 0x24(r1)
/* 802DEA64 39 61 00 20 */ addi r11, r1, 0x20
/* 802DEA68 48 08 37 69 */ bl _savegpr_26
/* 802DEA6C 7C 7F 1B 78 */ mr r31, r3
/* 802DEA70 7C 9A 23 78 */ mr r26, r4
/* 802DEA74 80 A3 00 04 */ lwz r5, 4(r3)
/* 802DEA78 3B 85 00 04 */ addi r28, r5, 4
/* 802DEA7C 48 00 00 AD */ bl calcKeyCode__10JUTNameTabCFPCc
/* 802DEA80 3B 60 00 00 */ li r27, 0
/* 802DEA84 83 BF 00 04 */ lwz r29, 4(r31)
/* 802DEA88 54 7E 04 3E */ clrlwi r30, r3, 0x10
/* 802DEA8C A3 FF 00 0C */ lhz r31, 0xc(r31)
/* 802DEA90 48 00 00 40 */ b lbl_802DEAD0
lbl_802DEA94:
/* 802DEA94 A0 1C 00 00 */ lhz r0, 0(r28)
/* 802DEA98 7C 00 F0 40 */ cmplw r0, r30
/* 802DEA9C 40 82 00 2C */ bne lbl_802DEAC8
/* 802DEAA0 57 63 13 BA */ rlwinm r3, r27, 2, 0xe, 0x1d
/* 802DEAA4 38 03 00 06 */ addi r0, r3, 6
/* 802DEAA8 7C 1D 02 2E */ lhzx r0, r29, r0
/* 802DEAAC 7C 7D 02 14 */ add r3, r29, r0
/* 802DEAB0 7F 44 D3 78 */ mr r4, r26
/* 802DEAB4 48 08 9E E1 */ bl strcmp
/* 802DEAB8 2C 03 00 00 */ cmpwi r3, 0
/* 802DEABC 40 82 00 0C */ bne lbl_802DEAC8
/* 802DEAC0 57 63 04 3E */ clrlwi r3, r27, 0x10
/* 802DEAC4 48 00 00 1C */ b lbl_802DEAE0
lbl_802DEAC8:
/* 802DEAC8 3B 9C 00 04 */ addi r28, r28, 4
/* 802DEACC 3B 7B 00 01 */ addi r27, r27, 1
lbl_802DEAD0:
/* 802DEAD0 57 60 04 3E */ clrlwi r0, r27, 0x10
/* 802DEAD4 7C 00 F8 40 */ cmplw r0, r31
/* 802DEAD8 41 80 FF BC */ blt lbl_802DEA94
/* 802DEADC 38 60 FF FF */ li r3, -1
lbl_802DEAE0:
/* 802DEAE0 39 61 00 20 */ addi r11, r1, 0x20
/* 802DEAE4 48 08 37 39 */ bl _restgpr_26
/* 802DEAE8 80 01 00 24 */ lwz r0, 0x24(r1)
/* 802DEAEC 7C 08 03 A6 */ mtlr r0
/* 802DEAF0 38 21 00 20 */ addi r1, r1, 0x20
/* 802DEAF4 4E 80 00 20 */ blr
asm/JSystem/JUtility/JUTNameTab/getName__10JUTNameTabCFUs.s
-14
View File
@@ -1,14 +0,0 @@
lbl_802DEAF8:
/* 802DEAF8 54 85 04 3E */ clrlwi r5, r4, 0x10
/* 802DEAFC A0 03 00 0C */ lhz r0, 0xc(r3)
/* 802DEB00 7C 05 00 40 */ cmplw r5, r0
/* 802DEB04 40 80 00 1C */ bge lbl_802DEB20
/* 802DEB08 80 A3 00 04 */ lwz r5, 4(r3)
/* 802DEB0C 54 80 13 BA */ rlwinm r0, r4, 2, 0xe, 0x1d
/* 802DEB10 7C 65 02 14 */ add r3, r5, r0
/* 802DEB14 A0 03 00 06 */ lhz r0, 6(r3)
/* 802DEB18 7C 65 02 14 */ add r3, r5, r0
/* 802DEB1C 4E 80 00 20 */ blr
lbl_802DEB20:
/* 802DEB20 38 60 00 00 */ li r3, 0
/* 802DEB24 4E 80 00 20 */ blr
asm/JSystem/JUtility/JUTNameTab/setResource__10JUTNameTabFPC7ResNTAB.s
-17
View File
@@ -1,17 +0,0 @@
lbl_802DEA1C:
/* 802DEA1C 90 83 00 04 */ stw r4, 4(r3)
/* 802DEA20 28 04 00 00 */ cmplwi r4, 0
/* 802DEA24 41 82 00 24 */ beq lbl_802DEA48
/* 802DEA28 A0 04 00 00 */ lhz r0, 0(r4)
/* 802DEA2C B0 03 00 0C */ sth r0, 0xc(r3)
/* 802DEA30 A0 03 00 0C */ lhz r0, 0xc(r3)
/* 802DEA34 54 05 10 3A */ slwi r5, r0, 2
/* 802DEA38 38 05 00 04 */ addi r0, r5, 4
/* 802DEA3C 7C 04 02 14 */ add r0, r4, r0
/* 802DEA40 90 03 00 08 */ stw r0, 8(r3)
/* 802DEA44 4E 80 00 20 */ blr
lbl_802DEA48:
/* 802DEA48 38 00 00 00 */ li r0, 0
/* 802DEA4C B0 03 00 0C */ sth r0, 0xc(r3)
/* 802DEA50 90 03 00 08 */ stw r0, 8(r3)
/* 802DEA54 4E 80 00 20 */ blr
asmdiff.sh
+3 -3
View File
@@ -1,7 +1,7 @@
#!/bin/bash
OBJDUMP="$DEVKITPPC/bin/powerpc-eabi-objdump -D -bbinary -EB -mpowerpc -M gekko"
OBJDUMP="$DEVKITPPC/bin/powerpc-eabi-objdump -D -EB -mpowerpc -M gekko"
OPTIONS="--start-address=$(($1)) --stop-address=$(($2+0x4))"
$OBJDUMP $OPTIONS baserom.dol > baserom.dump
$OBJDUMP $OPTIONS build/dolzel2/main.dol > main.dump
$OBJDUMP $OPTIONS expected/build/dolzel2/main.elf > baserom.dump
$OBJDUMP $OPTIONS build/dolzel2/main.elf > main.dump
diff -u baserom.dump main.dump
diff.py
+1 -1
View File
@@ -640,7 +640,7 @@ def dump_binary() -> Tuple[str, ObjdumpCommand, ObjdumpCommand]:
end_addr = eval_int(args.end, "End address must be an integer expression.")
else:
end_addr = start_addr + MAX_FUNCTION_SIZE_BYTES
objdump_flags = ["-Dz", "-bbinary", "-EB"]
objdump_flags = ["-Dz", "-EB"]
flags1 = [
f"--start-address={start_addr + base_shift}",
f"--stop-address={end_addr + base_shift}",
diff_settings.py
+1 -1
View File
@@ -9,7 +9,7 @@ def apply(config, args):
config['build_dir'] = "build/" # only needed for mw map format
config['expected_build_dir'] = 'expected/build/'
config['myimg'] = 'build/dolzel2/main.elf'
config['baseimg'] = 'baserom.elf'
config['baseimg'] = 'expected/build/dolzel2/main.elf'
config['makeflags'] = []
if args.source:
config['makeflags'].append('DEBUG=1')
include/JSystem/J3DGraphBase/J3DDrawBuffer.h
+45
View File
@@ -1,6 +1,51 @@
#ifndef J3DDRAWBUFFER_H
#define J3DDRAWBUFFER_H
#include "JSystem/J3DGraphBase/J3DSys.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
class J3DDrawBuffer;
class J3DPacket;
class J3DDrawPacket;
class J3DMatPacket;
class J3DShapePacket;
typedef void (*J3DDrawBuffer_DrawFunc)(const J3DDrawBuffer* this_);
class J3DDrawBuffer {
public:
~J3DDrawBuffer();
void initialize();
J3DError allocBuffer(u32);
void frameInit();
void entryMatSort(J3DMatPacket*);
void entryMatAnmSort(J3DMatPacket*);
void entryZSort(J3DMatPacket*);
void entryModelSort(J3DMatPacket*);
void entryInvalidSort(J3DMatPacket*);
bool entryNonSort(J3DMatPacket*);
bool entryImm(J3DPacket* pPacket, u16 index);
void draw() const;
void drawHead() const;
void drawTail() const;
inline void calcZRatio();
public:
J3DPacket** mpBuf;
u32 mBufSize;
u32 mDrawType;
u32 mSortType;
float mZNear;
float mZFar;
float mZRatio;
Mtx* mpZMtx;
J3DPacket* mpCallBackPacket;
static u8 sortFuncTable[72];
static u8 drawFuncTable[24];
static u8 entryNum[4 + 4 /* padding */];
};
#endif /* J3DDRAWBUFFER_H */
include/JSystem/J3DGraphBase/J3DPacket.h
+108
View File
@@ -1,6 +1,114 @@
#ifndef J3DPACKET_H
#define J3DPACKET_H
#include "JSystem/J3DGraphBase/J3DSys.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/types.h"
class J3DMatPacket;
class J3DDrawBuffer;
class J3DMaterial;
class J3DMaterialAnm;
class J3DModel;
class J3DMtxBuffer;
class J3DShape;
class J3DTexMtx;
class J3DTexture;
class J3DDisplayListObj {
public:
J3DError newDisplayList(u32);
J3DError newSingleDisplayList(u32);
J3DError single_To_Double();
void setSingleDisplayList(void*, u32);
void swapBuffer();
void callDL() const;
void beginDL();
void endDL();
void beginPatch();
void endPatch();
static u8 sGDLObj[16];
static u8 sInterruptFlag[4 + 4 /* padding */];
void* mpData[2];
u32 mSize;
u32 mCapacity;
};
class J3DPacket {
public:
void addChildPacket(J3DPacket* pChild);
inline void clear() {
mpNextSibling = NULL;
mpFirstChild = NULL;
}
virtual bool entry(J3DDrawBuffer* pDrawBuffer);
virtual void draw();
virtual ~J3DPacket();
public:
J3DPacket* mpNextSibling;
J3DPacket* mpFirstChild;
};
class J3DDrawPacket : public J3DPacket {
public:
J3DDrawPacket();
~J3DDrawPacket();
J3DError newDisplayList(u32);
J3DError newSingleDisplayList(u32);
virtual void draw();
public:
void* mpUserData;
int mFlags;
char mPad0[0x0C]; // unk
J3DDisplayListObj* mpDisplayListObj;
J3DTexMtx* mpTexMtx;
};
class J3DShapePacket : public J3DDrawPacket {
public:
J3DShapePacket();
void calcDifferedBufferSize(u32);
void newDifferedDisplayList(u32);
void prepareDraw() const;
void drawFast();
virtual ~J3DShapePacket();
virtual void draw();
public:
J3DShape* mpShape;
J3DMtxBuffer* mpMtxBuffer;
Mtx* mpViewMtx;
u32 mDiffFlag;
J3DModel* mpModel;
};
class J3DMatPacket : public J3DDrawPacket {
public:
J3DMatPacket();
void addShapePacket(J3DShapePacket*);
void beginDiff();
void endDiff();
void isSame(J3DMatPacket*) const;
virtual ~J3DMatPacket();
virtual bool entry(J3DDrawBuffer* pDrawBuffer);
virtual void draw();
public:
J3DShapePacket* mpShapePacket;
J3DShapePacket* mpFirstShapePacket;
J3DMaterial* mpMaterial;
s32 mSortFlags;
J3DTexture* mpTexture;
J3DMaterialAnm* mpMaterialAnm;
};
#endif /* J3DPACKET_H */
include/JSystem/J3DGraphBase/J3DSys.h
+6
View File
@@ -3,4 +3,10 @@
#include "dolphin/types.h"
// Perhaps move to a new J3DEnum.h?
enum J3DError {
kJ3DError_Success = 0,
kJ3DError_Alloc = 4,
};
#endif /* J3DSYS_H */
include/JSystem/JUtility/JUTNameTab.h
+30
View File
@@ -3,4 +3,34 @@
#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;
private:
const ResNTAB* mpNameTable;
const char* mpStrData;
u16 mNameNum;
};
#endif /* JUTNAMETAB_H */
include/dolphin/gx/GX.h
+1
View File
@@ -1,6 +1,7 @@
#ifndef GX_H_
#define GX_H_
#include "dolphin/gx/GXDisplayList.h"
#include "dolphin/gx/GXTexture.h"
#include "dolphin/types.h"
include/dolphin/gx/GXDisplayList.h
+6
View File
@@ -3,4 +3,10 @@
#include "dolphin/types.h"
extern "C" {
void GXBeginDisplayList(void* pDL, u32 capacity);
void GXEndDisplayList(void);
void GXCallDisplayList(const void* pDL, u32 size);
};
#endif /* GXDISPLAYLIST_H */
libs/JSystem/J2DGraph/Makefile
+1 -1
View File
@@ -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
libs/JSystem/J3DGraphAnimator/Makefile
+1 -1
View File
@@ -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
libs/JSystem/J3DGraphBase/J3DDrawBuffer.cpp
+57 -77
View File
@@ -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"
}
#pragma pop
bool J3DDrawBuffer::entryNonSort(J3DMatPacket* pMat) {
pMat->clear();
pMat->mpFirstShapePacket->clear();
/* 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"
// inlined copy of entryImm, add to start of buf
pMat->mpNextSibling = mpBuf[0];
mpBuf[0] = pMat;
return true;
}
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 */
libs/JSystem/J3DGraphBase/J3DPacket.cpp
+66 -152
View File
@@ -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"
}
#pragma pop
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);
}
/* 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"
return kJ3DError_Success;
}
#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::setSingleDisplayList(void* pDLData, u32 size) {
mCapacity = ALIGN_NEXT(size, 0x20);
mpData[0] = pDLData;
mpData[1] = mpData[0];
mSize = size;
}
#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::swapBuffer() {
void* pTmp = mpData[0];
mpData[0] = mpData[1];
mpData[1] = pTmp;
}
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"
}
libs/JSystem/J3DGraphBase/Makefile
+1 -1
View File
@@ -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
libs/JSystem/J3DGraphLoader/Makefile
+1 -1
View File
@@ -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
libs/JSystem/J3DU/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JAudio2/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JFramework/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JGadget/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JKernel/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JMath/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JMessage/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JParticle/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JStage/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JStudio/JStudio/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JStudio/JStudio_JAudio2/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JStudio/JStudio_JParticle/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JStudio/JStudio_JStage/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JSupport/Makefile
+1 -1
View File
@@ -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
libs/JSystem/JUtility/JUTNameTab.cpp
+36 -89
View File
@@ -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:
//
extern "C" void _savegpr_26();
extern "C" void _restgpr_26();
extern "C" void strcmp();
extern "C" extern void* __vt__10JUTNameTab[3];
//
// Declarations:
//
/* 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"
JUTNameTab::JUTNameTab() {
setResource(NULL);
}
#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"
JUTNameTab::JUTNameTab(const ResNTAB* pNameTable) {
setResource(pNameTable);
}
#pragma pop
/* 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
void JUTNameTab::setResource(const ResNTAB* pNameTable) {
mpNameTable = pNameTable;
/* 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"
if (pNameTable != NULL) {
mNameNum = pNameTable->mEntryNum;
mpStrData = (const char*)(pNameTable->mEntries + mNameNum);
} else {
mNameNum = 0;
mpStrData = 0;
}
}
#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"
}
#pragma pop
s32 JUTNameTab::getIndex(const char* pName) const {
const ResNTAB::Entry* pEntry = mpNameTable->mEntries;
u16 keyCode = calcKeyCode(pName);
/* 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"
for (u16 i = 0; i < mNameNum; pEntry++, i++)
if (pEntry->mKeyCode == keyCode &&
strcmp((mpNameTable->mEntries[i].mOffs + ((const char*)mpNameTable)), pName) == 0)
return i;
return -1;
}
const char* JUTNameTab::getName(u16 index) const {
if (index < mNameNum)
return mpNameTable->getName(index);
return NULL;
}
u16 JUTNameTab::calcKeyCode(const char* pName) const {
u32 keyCode = 0;
while (*pName)
keyCode = (keyCode * 3) + *pName++;
return keyCode;
}
#pragma pop
libs/JSystem/JUtility/Makefile
+1 -1
View File
@@ -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
libs/MSL_C.PPCEABI.bare.H/Makefile
+1 -1
View File
@@ -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
libs/Runtime.PPCEABI.H/Makefile
+1 -1
View File
@@ -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
libs/SSystem/SComponent/Makefile
+1 -1
View File
@@ -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
libs/SSystem/SStandard/Makefile
+1 -1
View File
@@ -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
libs/TRK_MINNOW_DOLPHIN/Makefile
+1 -1
View File
@@ -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
libs/Z2AudioLib/Makefile
+1 -1
View File
@@ -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
libs/amcstubs/Makefile
+1 -1
View File
@@ -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
libs/dolphin/ai/Makefile
+1 -1
View File
@@ -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
libs/dolphin/ar/Makefile
+1 -1
View File
@@ -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
libs/dolphin/base/Makefile
+1 -1
View File
@@ -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
libs/dolphin/card/Makefile
+1 -1
View File
@@ -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
libs/dolphin/db/Makefile
+1 -1
View File
@@ -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
libs/dolphin/dsp/Makefile
+1 -1
View File
@@ -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
libs/dolphin/dvd/Makefile
+1 -1
View File
@@ -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
libs/dolphin/gd/Makefile
+1 -1
View File
@@ -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
libs/dolphin/gf/Makefile
+1 -1
View File
@@ -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
libs/dolphin/gx/GXDisplayList.cpp
+1 -7
View File
@@ -7,12 +7,6 @@
#include "dol2asm.h"
#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"
}
libs/dolphin/gx/Makefile
+1 -1
View File
@@ -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
libs/dolphin/mtx/Makefile
+1 -1
View File
@@ -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
libs/dolphin/os/Makefile
+1 -1
View File
@@ -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
libs/dolphin/pad/Makefile
+1 -1
View File
@@ -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
libs/dolphin/si/Makefile
+1 -1
View File
@@ -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
libs/dolphin/vi/Makefile
+1 -1
View File
@@ -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
libs/exi/Makefile
+1 -1
View File
@@ -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
libs/odemuexi2/Makefile
+1 -1
View File
@@ -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
libs/odenotstub/Makefile
+1 -1
View File
@@ -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
rel/d/a/b/d_a_b_bh/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M138_TARGET): $(M138_O_FILES) $(M138_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_bh/%.o: rel/d/a/b/d_a_b_bh/%.cpp
@echo [138] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M138_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_bq/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M139_TARGET): $(M139_O_FILES) $(M139_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_bq/%.o: rel/d/a/b/d_a_b_bq/%.cpp
@echo [139] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M139_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_dr/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M140_TARGET): $(M140_O_FILES) $(M140_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_dr/%.o: rel/d/a/b/d_a_b_dr/%.cpp
@echo [140] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M140_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_dre/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M141_TARGET): $(M141_O_FILES) $(M141_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_dre/%.o: rel/d/a/b/d_a_b_dre/%.cpp
@echo [141] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M141_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_ds/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M142_TARGET): $(M142_O_FILES) $(M142_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_ds/%.o: rel/d/a/b/d_a_b_ds/%.cpp
@echo [142] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M142_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_gg/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M143_TARGET): $(M143_O_FILES) $(M143_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_gg/%.o: rel/d/a/b/d_a_b_gg/%.cpp
@echo [143] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M143_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_gm/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M144_TARGET): $(M144_O_FILES) $(M144_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_gm/%.o: rel/d/a/b/d_a_b_gm/%.cpp
@echo [144] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M144_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_gnd/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M145_TARGET): $(M145_O_FILES) $(M145_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_gnd/%.o: rel/d/a/b/d_a_b_gnd/%.cpp
@echo [145] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M145_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_go/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M146_TARGET): $(M146_O_FILES) $(M146_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_go/%.o: rel/d/a/b/d_a_b_go/%.cpp
@echo [146] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M146_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_gos/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M147_TARGET): $(M147_O_FILES) $(M147_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_gos/%.o: rel/d/a/b/d_a_b_gos/%.cpp
@echo [147] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M147_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_mgn/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M148_TARGET): $(M148_O_FILES) $(M148_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_mgn/%.o: rel/d/a/b/d_a_b_mgn/%.cpp
@echo [148] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M148_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_ob/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M149_TARGET): $(M149_O_FILES) $(M149_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_ob/%.o: rel/d/a/b/d_a_b_ob/%.cpp
@echo [149] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M149_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_oh/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M150_TARGET): $(M150_O_FILES) $(M150_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_oh/%.o: rel/d/a/b/d_a_b_oh/%.cpp
@echo [150] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M150_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_oh2/Makefile
+1 -1
View File
@@ -41,7 +41,7 @@ $(M151_TARGET): $(M151_O_FILES) $(M151_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_oh2/%.o: rel/d/a/b/d_a_b_oh2/%.cpp
@echo [151] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M151_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_tn/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M152_TARGET): $(M152_O_FILES) $(M152_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_tn/%.o: rel/d/a/b/d_a_b_tn/%.cpp
@echo [152] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M152_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_yo/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M153_TARGET): $(M153_O_FILES) $(M153_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_yo/%.o: rel/d/a/b/d_a_b_yo/%.cpp
@echo [153] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M153_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_yo_ice/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M154_TARGET): $(M154_O_FILES) $(M154_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_yo_ice/%.o: rel/d/a/b/d_a_b_yo_ice/%.cpp
@echo [154] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M154_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_zant/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M155_TARGET): $(M155_O_FILES) $(M155_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_zant/%.o: rel/d/a/b/d_a_b_zant/%.cpp
@echo [155] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M155_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_zant_magic/Makefile
+1 -1
View File
@@ -41,7 +41,7 @@ $(M156_TARGET): $(M156_O_FILES) $(M156_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_magic/%.o: rel/d/a/b/d_a_b_zant_magic/%.cpp
@echo [156] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M156_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_zant_mobile/Makefile
+1 -1
View File
@@ -43,7 +43,7 @@ $(M157_TARGET): $(M157_O_FILES) $(M157_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_mobile/%.o: rel/d/a/b/d_a_b_zant_mobile/%.cpp
@echo [157] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M157_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/b/d_a_b_zant_sima/Makefile
+1 -1
View File
@@ -41,7 +41,7 @@ $(M158_TARGET): $(M158_O_FILES) $(M158_LIBS)
$(BUILD_DIR)/rel/d/a/b/d_a_b_zant_sima/%.o: rel/d/a/b/d_a_b_zant_sima/%.cpp
@echo [158] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M158_CFLAGS) -c -o $@ $@.iconv.cpp
rel/d/a/d_a_L7demo_dr/Makefile
+1 -1
View File
@@ -41,7 +41,7 @@ $(M135_TARGET): $(M135_O_FILES) $(M135_LIBS)
$(BUILD_DIR)/rel/d/a/d_a_L7demo_dr/%.o: rel/d/a/d_a_L7demo_dr/%.cpp
@echo [135] building $@
@mkdir -p $(@D)
@iconv -f UTF-8 -t SHIFT-JIS -o $@.iconv.cpp $<
@iconv -f UTF-8 -t CP932 < $< > $@.iconv.cpp
@$(CC) $(CFLAGS) $(M135_CFLAGS) -c -o $@ $@.iconv.cpp

Some files were not shown because too many files have changed in this diff Show More