nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Use a different color when aiming at hookshotable collision (#3105)

Browse Source 
* Colors

* Use VTX data in OTR file

* Move to equipment
This commit is contained in:
louist103
2023-08-20 14:00:28 -04:00
committed by GitHub
parent 61eba0efad
commit 155f5e165a
8 changed files with 54 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
soh/assets/objects/object_link_boy/object_link_boy.h
View File

@@ -308,6 +308,9 @@ static const ALIGN_ASSET(2) char gLinkAdultHookshotDesignTex[] = dgLinkAdultHook
#define dgLinkAdultHookshotChainTex "__OTR__objects/object_link_boy/gLinkAdultHookshotChainTex"
static const ALIGN_ASSET(2) char gLinkAdultHookshotChainTex[] = dgLinkAdultHookshotChainTex;
#define dgLinkAdultHookshotRedicleVtx "__OTR__objects/object_link_boy/gLinkAdultHookshotRedicleVtx"
static const ALIGN_ASSET(2) char gLinkAdultHookshotRedicleVtx[] = dgLinkAdultHookshotRedicleVtx;
#define dgLinkAdultHookshotReticleTex "__OTR__objects/object_link_boy/gLinkAdultHookshotReticleTex"
static const ALIGN_ASSET(2) char gLinkAdultHookshotReticleTex[] = dgLinkAdultHookshotReticleTex;

4
soh/assets/xml/GC_MQ_D/objects/object_link_boy.xml
View File

@@ -202,6 +202,10 @@
<Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
<Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
<Array Name="gLinkAdultHookshotRedicleVtx" Count="3" Offset="0x2CB18">
<Vtx/>
</Array>
<DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
<!-- Boots -->

4
soh/assets/xml/GC_NMQ_D/objects/object_link_boy.xml
View File

@@ -202,6 +202,10 @@
<Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
<Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
<Array Name="gLinkAdultHookshotRedicleVtx" Count="3" Offset="0x2CB18">
<Vtx/>
</Array>
<DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
<!-- Boots -->

4
soh/assets/xml/GC_NMQ_PAL_F/objects/object_link_boy.xml
View File

@@ -202,6 +202,10 @@
<Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
<Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
<Array Name="gLinkAdultHookshotRedicleVtx" Count="3" Offset="0x2CB18">
<Vtx/>
</Array>
<DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
<!-- Boots -->

4
soh/assets/xml/N64_PAL_11/objects/object_link_boy.xml
View File

@@ -202,6 +202,10 @@
<Texture Name="gLinkAdultGauntletPlate1Tex" OutName="gauntlet_plate_1" Format="rgba16" Width="16" Height="32" Offset="0x9980"/>
<Texture Name="gLinkAdultGauntletPlate2Tex" OutName="gauntlet_plate_2" Format="rgba16" Width="32" Height="32" Offset="0x9D80"/>
<Array Name="gLinkAdultHookshotRedicleVtx" Count="3" Offset="0x2CB18">
<Vtx/>
</Array>
<DList Name="gLinkAdultHookshotReticleDL" Offset="0x2CB48"/>
<!-- Boots -->