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>
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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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