Skip to content

Commit 1b0e35c

Browse files
cadmichensldmemilybrooks
authored
Extract NTSC assets for gc-us (#1973)
* Extract NTSC assets for gc-us * Extract kanji zeldaret/mm#1536 Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com> --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: emilybrooks <emilybrooksemilybrooks@gmail.com>
1 parent 2457120 commit 1b0e35c

File tree

159 files changed

+11985
-1938
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

159 files changed

+11985
-1938
lines changed

‎Makefile

+4-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ COMPILER := ido
1919
# gc-eu-mq GameCube Europe/PAL Master Quest
2020
# gc-eu-mq-dbg GameCube Europe/PAL Master Quest Debug (default)
2121
# The following versions are work-in-progress and not yet matching:
22-
# (none currently)
22+
# gc-us GameCube US
2323
VERSION := gc-eu-mq-dbg
2424
# Number of threads to extract and compress with
2525
N_THREADS := $(shell nproc)
@@ -52,7 +52,9 @@ ifeq ($(NON_MATCHING),1)
5252
endif
5353

5454
# Version-specific settings
55-
ifeq ($(VERSION),gc-eu)
55+
ifeq ($(VERSION),gc-us)
56+
DEBUG := 0
57+
else ifeq ($(VERSION),gc-eu)
5658
DEBUG := 0
5759
else ifeq ($(VERSION),gc-eu-mq)
5860
DEBUG := 0

‎assets/xml/objects/gameplay_keep.xml

+348-314
Large diffs are not rendered by default.

‎assets/xml/objects/gameplay_keep_pal.xml

+968
Large diffs are not rendered by default.

‎assets/xml/objects/object_bv.xml

+58-58
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,79 @@
11
<Root>
22
<File Name="object_bv" Segment="6">
33
<!-- Boss title card -->
4-
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="ia8" Width="128" Height="120" Offset="0x1230"/>
4+
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="ia8" Width="128" Height="80" Offset="0x1230"/>
55

6-
<Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x15B18"/>
7-
<Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17498"/>
8-
<Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x199A0"/>
9-
<Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x18870"/>
10-
<Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x4E70"/>
11-
<Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17FC8"/>
6+
<Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
7+
<Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
8+
<Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
9+
<Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
10+
<Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
11+
<Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>
1212

13-
<Animation Name="gBarinadeBodyAnim" Offset="0x5184"/> <!-- Body anim 1-->
14-
<Animation Name="gBarinadeSupportAttachedAnim" Offset="0x166A8"/> <!-- Support anim 1 -->
15-
<Animation Name="gBarinadeZapperIdleAnim" Offset="0x18D18"/> <!-- Zapper anim 1 -->
16-
<Animation Name="gBarinadeStumpAnim" Offset="0x18150"/> <!-- Stump anim 1 -->
13+
<Animation Name="gBarinadeBodyAnim" Offset="0x3D84"/> <!-- Body anim 1-->
14+
<Animation Name="gBarinadeSupportAttachedAnim" Offset="0x152A8"/> <!-- Support anim 1 -->
15+
<Animation Name="gBarinadeZapperIdleAnim" Offset="0x17918"/> <!-- Zapper anim 1 -->
16+
<Animation Name="gBarinadeStumpAnim" Offset="0x16D50"/> <!-- Stump anim 1 -->
1717
<Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
18-
<Animation Name="gBarinadeSupportDamage1Anim" Offset="0x162AC"/> <!-- Support damaged anim 1 -->
19-
<Animation Name="gBarinadeSupportDamage2Anim" Offset="0x164B0"/> <!-- Support damaged anim 2 -->
20-
<Animation Name="gBarinadeSupportCutAnim" Offset="0x17694"/> <!-- Support cut init anim -->
21-
<Animation Name="gBarinadeSupportDetachedAnim" Offset="0x177F4"/> <!-- Support cut idle anim -->
22-
<Animation Name="gBarinadeZapperDamage1Anim" Offset="0x18A68"/> <!-- Zapper damaged anim 1 -->
23-
<Animation Name="gBarinadeZapperDamage2Anim" Offset="0x18B90"/> <!-- Zapper damaged anim 2 -->
18+
<Animation Name="gBarinadeSupportDamage1Anim" Offset="0x14EAC"/> <!-- Support damaged anim 1 -->
19+
<Animation Name="gBarinadeSupportDamage2Anim" Offset="0x150B0"/> <!-- Support damaged anim 2 -->
20+
<Animation Name="gBarinadeSupportCutAnim" Offset="0x16294"/> <!-- Support cut init anim -->
21+
<Animation Name="gBarinadeSupportDetachedAnim" Offset="0x163F4"/> <!-- Support cut idle anim -->
22+
<Animation Name="gBarinadeZapperDamage1Anim" Offset="0x17668"/> <!-- Zapper damaged anim 1 -->
23+
<Animation Name="gBarinadeZapperDamage2Anim" Offset="0x17790"/> <!-- Zapper damaged anim 2 -->
2424

2525
<!-- body overrides -->
26-
<DList Name="gBarinadeDL_008D70" Offset="0x8D70"/>
27-
<DList Name="gBarinadeDL_008BB8" Offset="0x8BB8"/>
26+
<DList Name="gBarinadeDL_008D70" Offset="0x7970"/>
27+
<DList Name="gBarinadeDL_008BB8" Offset="0x77B8"/>
2828
<!-- Bari something -->
2929
<DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
3030
<!-- large spark -->
31-
<DList Name="gBarinadeDL_0156A0" Offset="0x156A0"/>
32-
<DList Name="gBarinadeDL_015710" Offset="0x15710"/>
31+
<DList Name="gBarinadeDL_0156A0" Offset="0x142A0"/>
32+
<DList Name="gBarinadeDL_015710" Offset="0x14310"/>
3333
<!-- spark ball -->
34-
<DList Name="gBarinadeDL_011738" Offset="0x11738"/>
35-
<DList Name="gBarinadeDL_011768" Offset="0x11768"/>
34+
<DList Name="gBarinadeDL_011738" Offset="0x10338"/>
35+
<DList Name="gBarinadeDL_011768" Offset="0x10368"/>
3636
<!-- blood -->
37-
<DList Name="gBarinadeDL_009430" Offset="0x9430"/>
38-
<DList Name="gBarinadeDL_009468" Offset="0x9468"/>
37+
<DList Name="gBarinadeDL_009430" Offset="0x8030"/>
38+
<DList Name="gBarinadeDL_009468" Offset="0x8068"/>
3939
<!-- tumor -->
40-
<DList Name="gBarinadeDL_0128B8" Offset="0x128B8"/>
41-
<DList Name="gBarinadeDL_012948" Offset="0x12948"/>
40+
<DList Name="gBarinadeDL_0128B8" Offset="0x114B8"/>
41+
<DList Name="gBarinadeDL_012948" Offset="0x11548"/>
4242
<!-- gore -->
43-
<DList Name="gBarinadeDL_012BA0" Offset="0x12BA0"/>
44-
<DList Name="gBarinadeDL_012C50" Offset="0x12C50"/>
43+
<DList Name="gBarinadeDL_012BA0" Offset="0x117A0"/>
44+
<DList Name="gBarinadeDL_012C50" Offset="0x11850"/>
4545
<!-- zapper charge -->
46-
<DList Name="gBarinadeDL_0135B0" Offset="0x135B0"/>
47-
<DList Name="gBarinadeDL_013638" Offset="0x13638"/>
46+
<DList Name="gBarinadeDL_0135B0" Offset="0x121B0"/>
47+
<DList Name="gBarinadeDL_013638" Offset="0x12238"/>
4848
<!-- small spark -->
49-
<DList Name="gBarinadeDL_008F08" Offset="0x8F08"/>
50-
<DList Name="gBarinadeDL_008F70" Offset="0x8F70"/>
49+
<DList Name="gBarinadeDL_008F08" Offset="0x7B08"/>
50+
<DList Name="gBarinadeDL_008F70" Offset="0x7B70"/>
5151

52-
<Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x96F8"/>
53-
<Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0xA6F8"/>
54-
<Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xB6F8"/>
55-
<Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xC6F8"/>
56-
<Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xD6F8"/>
57-
<Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xE6F8"/>
58-
<Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xF6F8"/>
59-
<Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0x106F8"/>
60-
<DList Name="gBarinadeDoorPiece1DL" Offset="0x1A3E8"/>
61-
<DList Name="gBarinadeDoorPiece2DL" Offset="0x1AEE8"/>
62-
<DList Name="gBarinadeDoorPiece3DL" Offset="0x1B9E8"/>
63-
<DList Name="gBarinadeDoorPiece4DL" Offset="0x1C4E8"/>
64-
<DList Name="gBarinadeDoorPiece5DL" Offset="0x1CFE8"/>
65-
<DList Name="gBarinadeDoorPiece6DL" Offset="0x1DAE8"/>
66-
<DList Name="gBarinadeDoorPiece7DL" Offset="0x1E5E8"/>
67-
<DList Name="gBarinadeDoorPiece8DL" Offset="0x1F0E8"/>
52+
<Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x82F8"/>
53+
<Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0x92F8"/>
54+
<Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xA2F8"/>
55+
<Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xB2F8"/>
56+
<Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xC2F8"/>
57+
<Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xD2F8"/>
58+
<Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xE2F8"/>
59+
<Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0xF2F8"/>
60+
<DList Name="gBarinadeDoorPiece1DL" Offset="0x18FE8"/>
61+
<DList Name="gBarinadeDoorPiece2DL" Offset="0x19AE8"/>
62+
<DList Name="gBarinadeDoorPiece3DL" Offset="0x1A5E8"/>
63+
<DList Name="gBarinadeDoorPiece4DL" Offset="0x1B0E8"/>
64+
<DList Name="gBarinadeDoorPiece5DL" Offset="0x1BBE8"/>
65+
<DList Name="gBarinadeDoorPiece6DL" Offset="0x1C6E8"/>
66+
<DList Name="gBarinadeDoorPiece7DL" Offset="0x1D1E8"/>
67+
<DList Name="gBarinadeDoorPiece8DL" Offset="0x1DCE8"/>
6868

69-
<Animation Name="gBarinadeAnim_018A00" Offset="0x18A00"/>
70-
<Animation Name="gBarinadeAnim_015F10" Offset="0x15F10"/>
71-
<Animation Name="gBarinadeAnim_015D10" Offset="0x15D10"/>
72-
<DList Name="gBarinadeDL_008E88" Offset="0x8E88"/>
73-
<DList Name="gBarinadeDL_008EF0" Offset="0x8EF0"/>
74-
<DList Name="gBarinadeDL_009388" Offset="0x9388"/>
75-
<DList Name="gBarinadeDL_0093A0" Offset="0x93A0"/>
76-
<DList Name="gBarinadeDL_0094F8" Offset="0x94F8"/>
77-
<DList Name="gBarinadeDL_0095B0" Offset="0x95B0"/>
69+
<Animation Name="gBarinadeAnim_018A00" Offset="0x17600"/>
70+
<Animation Name="gBarinadeAnim_015F10" Offset="0x14B10"/>
71+
<Animation Name="gBarinadeAnim_015D10" Offset="0x14910"/>
72+
<DList Name="gBarinadeDL_008E88" Offset="0x7A88"/>
73+
<DList Name="gBarinadeDL_008EF0" Offset="0x7AF0"/>
74+
<DList Name="gBarinadeDL_009388" Offset="0x7F88"/>
75+
<DList Name="gBarinadeDL_0093A0" Offset="0x7FA0"/>
76+
<DList Name="gBarinadeDL_0094F8" Offset="0x80F8"/>
77+
<DList Name="gBarinadeDL_0095B0" Offset="0x81B0"/>
7878
</File>
7979
</Root>

‎assets/xml/objects/object_bv_pal.xml

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<Root>
2+
<File Name="object_bv" Segment="6">
3+
<!-- Boss title card -->
4+
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="ia8" Width="128" Height="120" Offset="0x1230"/>
5+
6+
<Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x15B18"/>
7+
<Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17498"/>
8+
<Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x199A0"/>
9+
<Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x18870"/>
10+
<Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x4E70"/>
11+
<Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17FC8"/>
12+
13+
<Animation Name="gBarinadeBodyAnim" Offset="0x5184"/> <!-- Body anim 1-->
14+
<Animation Name="gBarinadeSupportAttachedAnim" Offset="0x166A8"/> <!-- Support anim 1 -->
15+
<Animation Name="gBarinadeZapperIdleAnim" Offset="0x18D18"/> <!-- Zapper anim 1 -->
16+
<Animation Name="gBarinadeStumpAnim" Offset="0x18150"/> <!-- Stump anim 1 -->
17+
<Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
18+
<Animation Name="gBarinadeSupportDamage1Anim" Offset="0x162AC"/> <!-- Support damaged anim 1 -->
19+
<Animation Name="gBarinadeSupportDamage2Anim" Offset="0x164B0"/> <!-- Support damaged anim 2 -->
20+
<Animation Name="gBarinadeSupportCutAnim" Offset="0x17694"/> <!-- Support cut init anim -->
21+
<Animation Name="gBarinadeSupportDetachedAnim" Offset="0x177F4"/> <!-- Support cut idle anim -->
22+
<Animation Name="gBarinadeZapperDamage1Anim" Offset="0x18A68"/> <!-- Zapper damaged anim 1 -->
23+
<Animation Name="gBarinadeZapperDamage2Anim" Offset="0x18B90"/> <!-- Zapper damaged anim 2 -->
24+
25+
<!-- body overrides -->
26+
<DList Name="gBarinadeDL_008D70" Offset="0x8D70"/>
27+
<DList Name="gBarinadeDL_008BB8" Offset="0x8BB8"/>
28+
<!-- Bari something -->
29+
<DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
30+
<!-- large spark -->
31+
<DList Name="gBarinadeDL_0156A0" Offset="0x156A0"/>
32+
<DList Name="gBarinadeDL_015710" Offset="0x15710"/>
33+
<!-- spark ball -->
34+
<DList Name="gBarinadeDL_011738" Offset="0x11738"/>
35+
<DList Name="gBarinadeDL_011768" Offset="0x11768"/>
36+
<!-- blood -->
37+
<DList Name="gBarinadeDL_009430" Offset="0x9430"/>
38+
<DList Name="gBarinadeDL_009468" Offset="0x9468"/>
39+
<!-- tumor -->
40+
<DList Name="gBarinadeDL_0128B8" Offset="0x128B8"/>
41+
<DList Name="gBarinadeDL_012948" Offset="0x12948"/>
42+
<!-- gore -->
43+
<DList Name="gBarinadeDL_012BA0" Offset="0x12BA0"/>
44+
<DList Name="gBarinadeDL_012C50" Offset="0x12C50"/>
45+
<!-- zapper charge -->
46+
<DList Name="gBarinadeDL_0135B0" Offset="0x135B0"/>
47+
<DList Name="gBarinadeDL_013638" Offset="0x13638"/>
48+
<!-- small spark -->
49+
<DList Name="gBarinadeDL_008F08" Offset="0x8F08"/>
50+
<DList Name="gBarinadeDL_008F70" Offset="0x8F70"/>
51+
52+
<Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x96F8"/>
53+
<Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0xA6F8"/>
54+
<Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xB6F8"/>
55+
<Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xC6F8"/>
56+
<Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xD6F8"/>
57+
<Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xE6F8"/>
58+
<Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xF6F8"/>
59+
<Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0x106F8"/>
60+
<DList Name="gBarinadeDoorPiece1DL" Offset="0x1A3E8"/>
61+
<DList Name="gBarinadeDoorPiece2DL" Offset="0x1AEE8"/>
62+
<DList Name="gBarinadeDoorPiece3DL" Offset="0x1B9E8"/>
63+
<DList Name="gBarinadeDoorPiece4DL" Offset="0x1C4E8"/>
64+
<DList Name="gBarinadeDoorPiece5DL" Offset="0x1CFE8"/>
65+
<DList Name="gBarinadeDoorPiece6DL" Offset="0x1DAE8"/>
66+
<DList Name="gBarinadeDoorPiece7DL" Offset="0x1E5E8"/>
67+
<DList Name="gBarinadeDoorPiece8DL" Offset="0x1F0E8"/>
68+
69+
<Animation Name="gBarinadeAnim_018A00" Offset="0x18A00"/>
70+
<Animation Name="gBarinadeAnim_015F10" Offset="0x15F10"/>
71+
<Animation Name="gBarinadeAnim_015D10" Offset="0x15D10"/>
72+
<DList Name="gBarinadeDL_008E88" Offset="0x8E88"/>
73+
<DList Name="gBarinadeDL_008EF0" Offset="0x8EF0"/>
74+
<DList Name="gBarinadeDL_009388" Offset="0x9388"/>
75+
<DList Name="gBarinadeDL_0093A0" Offset="0x93A0"/>
76+
<DList Name="gBarinadeDL_0094F8" Offset="0x94F8"/>
77+
<DList Name="gBarinadeDL_0095B0" Offset="0x95B0"/>
78+
</File>
79+
</Root>

‎assets/xml/objects/object_demo_6k.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Root>
2-
<ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
32
<File Name="object_demo_6k" Segment="6">
43
<Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
54
<DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>

‎assets/xml/objects/object_demo_kekkai.xml

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Root>
2-
<ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
32
<File Name="object_demo_kekkai" Segment="6">
43
<!-- Demo_Kekkai -->
54
<DList Name="gTowerBarrierDL" Offset="0x4930"/>

0 commit comments

Comments
 (0)