Skip to content

Commit

Permalink
Merge remote-tracking branch 'decomp/main' into decomp_update_3
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yanis002
Yanis002 committed Jun 26, 2024
2 parents 76d050c + 93b687e commit 006babc
Show file tree
Hide file tree
Showing 222 changed files with 12,556 additions and 2,364 deletions.
6 changes: 4 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COMPILER := gcc
# hackeroot-mq HackerOoT, based on gc-eu-mq-dbg (default)
#
# The following versions are work-in-progress and not yet matching:
# (none currently)
# gc-us GameCube US
#
# Note: choosing hackeroot-mq will enable HackerOoT features,
# if another version is chosen, this repo will be like
Expand Down Expand Up @@ -84,7 +84,9 @@ else
endif

# Version-specific settings
ifeq ($(VERSION),gc-eu)
ifeq ($(VERSION),gc-us)
DEBUG := 0
else ifeq ($(VERSION),gc-eu)
DEBUG := 0
HACKEROOT := 0
else ifeq ($(VERSION),gc-eu-mq)
Expand Down
662 changes: 348 additions & 314 deletions assets/xml/objects/gameplay_keep.xml
View file

Large diffs are not rendered by default.

968 changes: 968 additions & 0 deletions assets/xml/objects/gameplay_keep_pal.xml
View file

Large diffs are not rendered by default.

116 changes: 58 additions & 58 deletions assets/xml/objects/object_bv.xml
View file
Original file line number Diff line number Diff line change
@@ -1,79 +1,79 @@
<Root>
<File Name="object_bv" Segment="6">
<!-- Boss title card -->
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="ia8" Width="128" Height="120" Offset="0x1230"/>
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="ia8" Width="128" Height="80" Offset="0x1230"/>

<Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x15B18"/>
<Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17498"/>
<Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x199A0"/>
<Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x18870"/>
<Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x4E70"/>
<Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17FC8"/>
<Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x14718"/>
<Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16098"/>
<Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x185A0"/>
<Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x17470"/>
<Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x3A70"/>
<Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x16BC8"/>

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

<!-- body overrides -->
<DList Name="gBarinadeDL_008D70" Offset="0x8D70"/>
<DList Name="gBarinadeDL_008BB8" Offset="0x8BB8"/>
<DList Name="gBarinadeDL_008D70" Offset="0x7970"/>
<DList Name="gBarinadeDL_008BB8" Offset="0x77B8"/>
<!-- Bari something -->
<DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
<!-- large spark -->
<DList Name="gBarinadeDL_0156A0" Offset="0x156A0"/>
<DList Name="gBarinadeDL_015710" Offset="0x15710"/>
<DList Name="gBarinadeDL_0156A0" Offset="0x142A0"/>
<DList Name="gBarinadeDL_015710" Offset="0x14310"/>
<!-- spark ball -->
<DList Name="gBarinadeDL_011738" Offset="0x11738"/>
<DList Name="gBarinadeDL_011768" Offset="0x11768"/>
<DList Name="gBarinadeDL_011738" Offset="0x10338"/>
<DList Name="gBarinadeDL_011768" Offset="0x10368"/>
<!-- blood -->
<DList Name="gBarinadeDL_009430" Offset="0x9430"/>
<DList Name="gBarinadeDL_009468" Offset="0x9468"/>
<DList Name="gBarinadeDL_009430" Offset="0x8030"/>
<DList Name="gBarinadeDL_009468" Offset="0x8068"/>
<!-- tumor -->
<DList Name="gBarinadeDL_0128B8" Offset="0x128B8"/>
<DList Name="gBarinadeDL_012948" Offset="0x12948"/>
<DList Name="gBarinadeDL_0128B8" Offset="0x114B8"/>
<DList Name="gBarinadeDL_012948" Offset="0x11548"/>
<!-- gore -->
<DList Name="gBarinadeDL_012BA0" Offset="0x12BA0"/>
<DList Name="gBarinadeDL_012C50" Offset="0x12C50"/>
<DList Name="gBarinadeDL_012BA0" Offset="0x117A0"/>
<DList Name="gBarinadeDL_012C50" Offset="0x11850"/>
<!-- zapper charge -->
<DList Name="gBarinadeDL_0135B0" Offset="0x135B0"/>
<DList Name="gBarinadeDL_013638" Offset="0x13638"/>
<DList Name="gBarinadeDL_0135B0" Offset="0x121B0"/>
<DList Name="gBarinadeDL_013638" Offset="0x12238"/>
<!-- small spark -->
<DList Name="gBarinadeDL_008F08" Offset="0x8F08"/>
<DList Name="gBarinadeDL_008F70" Offset="0x8F70"/>
<DList Name="gBarinadeDL_008F08" Offset="0x7B08"/>
<DList Name="gBarinadeDL_008F70" Offset="0x7B70"/>

<Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x96F8"/>
<Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0xA6F8"/>
<Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xB6F8"/>
<Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xC6F8"/>
<Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xD6F8"/>
<Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xE6F8"/>
<Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xF6F8"/>
<Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0x106F8"/>
<DList Name="gBarinadeDoorPiece1DL" Offset="0x1A3E8"/>
<DList Name="gBarinadeDoorPiece2DL" Offset="0x1AEE8"/>
<DList Name="gBarinadeDoorPiece3DL" Offset="0x1B9E8"/>
<DList Name="gBarinadeDoorPiece4DL" Offset="0x1C4E8"/>
<DList Name="gBarinadeDoorPiece5DL" Offset="0x1CFE8"/>
<DList Name="gBarinadeDoorPiece6DL" Offset="0x1DAE8"/>
<DList Name="gBarinadeDoorPiece7DL" Offset="0x1E5E8"/>
<DList Name="gBarinadeDoorPiece8DL" Offset="0x1F0E8"/>
<Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x82F8"/>
<Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0x92F8"/>
<Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xA2F8"/>
<Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xB2F8"/>
<Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xC2F8"/>
<Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xD2F8"/>
<Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xE2F8"/>
<Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0xF2F8"/>
<DList Name="gBarinadeDoorPiece1DL" Offset="0x18FE8"/>
<DList Name="gBarinadeDoorPiece2DL" Offset="0x19AE8"/>
<DList Name="gBarinadeDoorPiece3DL" Offset="0x1A5E8"/>
<DList Name="gBarinadeDoorPiece4DL" Offset="0x1B0E8"/>
<DList Name="gBarinadeDoorPiece5DL" Offset="0x1BBE8"/>
<DList Name="gBarinadeDoorPiece6DL" Offset="0x1C6E8"/>
<DList Name="gBarinadeDoorPiece7DL" Offset="0x1D1E8"/>
<DList Name="gBarinadeDoorPiece8DL" Offset="0x1DCE8"/>

<Animation Name="gBarinadeAnim_018A00" Offset="0x18A00"/>
<Animation Name="gBarinadeAnim_015F10" Offset="0x15F10"/>
<Animation Name="gBarinadeAnim_015D10" Offset="0x15D10"/>
<DList Name="gBarinadeDL_008E88" Offset="0x8E88"/>
<DList Name="gBarinadeDL_008EF0" Offset="0x8EF0"/>
<DList Name="gBarinadeDL_009388" Offset="0x9388"/>
<DList Name="gBarinadeDL_0093A0" Offset="0x93A0"/>
<DList Name="gBarinadeDL_0094F8" Offset="0x94F8"/>
<DList Name="gBarinadeDL_0095B0" Offset="0x95B0"/>
<Animation Name="gBarinadeAnim_018A00" Offset="0x17600"/>
<Animation Name="gBarinadeAnim_015F10" Offset="0x14B10"/>
<Animation Name="gBarinadeAnim_015D10" Offset="0x14910"/>
<DList Name="gBarinadeDL_008E88" Offset="0x7A88"/>
<DList Name="gBarinadeDL_008EF0" Offset="0x7AF0"/>
<DList Name="gBarinadeDL_009388" Offset="0x7F88"/>
<DList Name="gBarinadeDL_0093A0" Offset="0x7FA0"/>
<DList Name="gBarinadeDL_0094F8" Offset="0x80F8"/>
<DList Name="gBarinadeDL_0095B0" Offset="0x81B0"/>
</File>
</Root>
79 changes: 79 additions & 0 deletions assets/xml/objects/object_bv_pal.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<Root>
<File Name="object_bv" Segment="6">
<!-- Boss title card -->
<Texture Name="gBarinadeTitleCardTex" OutName="barinade_title_card" Format="ia8" Width="128" Height="120" Offset="0x1230"/>

<Skeleton Name="gBarinadeBodySkel" Type="Normal" LimbType="Standard" Offset="0x15B18"/>
<Skeleton Name="gBarinadeSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17498"/>
<Skeleton Name="gBarinadeZapperSkel" Type="Flex" LimbType="Standard" Offset="0x199A0"/>
<Skeleton Name="gBarinadeStumpSkel" Type="Flex" LimbType="Standard" Offset="0x18870"/>
<Skeleton Name="gBarinadeBariSkel" Type="Normal" LimbType="Standard" Offset="0x4E70"/>
<Skeleton Name="gBarinadeCutSupportSkel" Type="Flex" LimbType="Standard" Offset="0x17FC8"/>

<Animation Name="gBarinadeBodyAnim" Offset="0x5184"/> <!-- Body anim 1-->
<Animation Name="gBarinadeSupportAttachedAnim" Offset="0x166A8"/> <!-- Support anim 1 -->
<Animation Name="gBarinadeZapperIdleAnim" Offset="0x18D18"/> <!-- Zapper anim 1 -->
<Animation Name="gBarinadeStumpAnim" Offset="0x18150"/> <!-- Stump anim 1 -->
<Animation Name="gBarinadeBariAnim" Offset="0x24"/> <!-- Bari anim -->
<Animation Name="gBarinadeSupportDamage1Anim" Offset="0x162AC"/> <!-- Support damaged anim 1 -->
<Animation Name="gBarinadeSupportDamage2Anim" Offset="0x164B0"/> <!-- Support damaged anim 2 -->
<Animation Name="gBarinadeSupportCutAnim" Offset="0x17694"/> <!-- Support cut init anim -->
<Animation Name="gBarinadeSupportDetachedAnim" Offset="0x177F4"/> <!-- Support cut idle anim -->
<Animation Name="gBarinadeZapperDamage1Anim" Offset="0x18A68"/> <!-- Zapper damaged anim 1 -->
<Animation Name="gBarinadeZapperDamage2Anim" Offset="0x18B90"/> <!-- Zapper damaged anim 2 -->

<!-- body overrides -->
<DList Name="gBarinadeDL_008D70" Offset="0x8D70"/>
<DList Name="gBarinadeDL_008BB8" Offset="0x8BB8"/>
<!-- Bari something -->
<DList Name="gBarinadeDL_000FA0" Offset="0xFA0"/>
<!-- large spark -->
<DList Name="gBarinadeDL_0156A0" Offset="0x156A0"/>
<DList Name="gBarinadeDL_015710" Offset="0x15710"/>
<!-- spark ball -->
<DList Name="gBarinadeDL_011738" Offset="0x11738"/>
<DList Name="gBarinadeDL_011768" Offset="0x11768"/>
<!-- blood -->
<DList Name="gBarinadeDL_009430" Offset="0x9430"/>
<DList Name="gBarinadeDL_009468" Offset="0x9468"/>
<!-- tumor -->
<DList Name="gBarinadeDL_0128B8" Offset="0x128B8"/>
<DList Name="gBarinadeDL_012948" Offset="0x12948"/>
<!-- gore -->
<DList Name="gBarinadeDL_012BA0" Offset="0x12BA0"/>
<DList Name="gBarinadeDL_012C50" Offset="0x12C50"/>
<!-- zapper charge -->
<DList Name="gBarinadeDL_0135B0" Offset="0x135B0"/>
<DList Name="gBarinadeDL_013638" Offset="0x13638"/>
<!-- small spark -->
<DList Name="gBarinadeDL_008F08" Offset="0x8F08"/>
<DList Name="gBarinadeDL_008F70" Offset="0x8F70"/>

<Texture Name="gBarinadeSparkBall1Tex" Format="i8" Width="64" Height="64" Offset="0x96F8"/>
<Texture Name="gBarinadeSparkBall2Tex" Format="i8" Width="64" Height="64" Offset="0xA6F8"/>
<Texture Name="gBarinadeSparkBall3Tex" Format="i8" Width="64" Height="64" Offset="0xB6F8"/>
<Texture Name="gBarinadeSparkBall4Tex" Format="i8" Width="64" Height="64" Offset="0xC6F8"/>
<Texture Name="gBarinadeSparkBall5Tex" Format="i8" Width="64" Height="64" Offset="0xD6F8"/>
<Texture Name="gBarinadeSparkBall6Tex" Format="i8" Width="64" Height="64" Offset="0xE6F8"/>
<Texture Name="gBarinadeSparkBall7Tex" Format="i8" Width="64" Height="64" Offset="0xF6F8"/>
<Texture Name="gBarinadeSparkBall8Tex" Format="i8" Width="64" Height="64" Offset="0x106F8"/>
<DList Name="gBarinadeDoorPiece1DL" Offset="0x1A3E8"/>
<DList Name="gBarinadeDoorPiece2DL" Offset="0x1AEE8"/>
<DList Name="gBarinadeDoorPiece3DL" Offset="0x1B9E8"/>
<DList Name="gBarinadeDoorPiece4DL" Offset="0x1C4E8"/>
<DList Name="gBarinadeDoorPiece5DL" Offset="0x1CFE8"/>
<DList Name="gBarinadeDoorPiece6DL" Offset="0x1DAE8"/>
<DList Name="gBarinadeDoorPiece7DL" Offset="0x1E5E8"/>
<DList Name="gBarinadeDoorPiece8DL" Offset="0x1F0E8"/>

<Animation Name="gBarinadeAnim_018A00" Offset="0x18A00"/>
<Animation Name="gBarinadeAnim_015F10" Offset="0x15F10"/>
<Animation Name="gBarinadeAnim_015D10" Offset="0x15D10"/>
<DList Name="gBarinadeDL_008E88" Offset="0x8E88"/>
<DList Name="gBarinadeDL_008EF0" Offset="0x8EF0"/>
<DList Name="gBarinadeDL_009388" Offset="0x9388"/>
<DList Name="gBarinadeDL_0093A0" Offset="0x93A0"/>
<DList Name="gBarinadeDL_0094F8" Offset="0x94F8"/>
<DList Name="gBarinadeDL_0095B0" Offset="0x95B0"/>
</File>
</Root>
1 change: 0 additions & 1 deletion assets/xml/objects/object_demo_6k.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Root>
<ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
<File Name="object_demo_6k" Segment="6">
<Texture Name="object_demo_6k_Tex_000000" OutName="tex_00000000" Format="i8" Width="64" Height="64" Offset="0x0"/>
<DList Name="object_demo_6k_DL_001040" Offset="0x1040"/>
Expand Down
1 change: 0 additions & 1 deletion assets/xml/objects/object_demo_kekkai.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<Root>
<ExternalFile XmlPath="objects/gameplay_keep.xml" OutPath="assets/objects/gameplay_keep/"/>
<File Name="object_demo_kekkai" Segment="6">
<!-- Demo_Kekkai -->
<DList Name="gTowerBarrierDL" Offset="0x4930"/>
Expand Down
Loading

0 comments on commit 006babc

Please sign in to comment.