izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Misc Cleanup 2 (#1306)

Browse Source 
* Cleanup undefined_syms.txt

* removed unused from Bba textures

* eyegore beamos textures

* object_eg Unused -> Beamons

* ssh

* segment 0x07
This commit is contained in:
Derek Hensley
2023-06-25 08:44:42 -04:00
committed by GitHub
parent 541199888c
commit 283a37affb
4 changed files with 31 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_bba.xml
+12 -12
View File
@@ -52,18 +52,18 @@
<!-- Unused Textures -->
<!-- These are just exact copies of the used textures -->
<Texture Name="gBbaUnusedHairSkinTex" OutName="bba_unused_hair_skin" Format="ci8" Width="32" Height="32" Offset="0x6D20" TlutOffset="0x6B20" />
<Texture Name="gBbaUnusedEarTex" OutName="bba_unused_ear" Format="ci8" Width="8" Height="8" Offset="0x7120" TlutOffset="0x6B20" />
<Texture Name="gBbaUnusedNostrilTex" OutName="bba_unused_nostril" Format="ci8" Width="8" Height="8" Offset="0x7160" TlutOffset="0x6B20" />
<Texture Name="gBbaUnusedEyeTex" OutName="bba_unused_eye" Format="rgba16" Width="32" Height="32" Offset="0x71A0"/>
<Texture Name="gBbaUnusedWrinklesTex" OutName="bba_unused_wrinkles" Format="ci8" Width="32" Height="32" Offset="0x79A0" TlutOffset="0x6B20" />
<Texture Name="gBbaUnusedCheekTex" OutName="bba_unused_cheek" Format="ci8" Width="16" Height="16" Offset="0x7DA0" TlutOffset="0x6B20" />
<Texture Name="gBbaUnusedSkinTex" OutName="bba_unused_skin" Format="ci8" Width="8" Height="8" Offset="0x7EA0" TlutOffset="0x6B20" />
<Texture Name="gBbaUnusedForeheadTex" OutName="bba_unused_forehead" Format="ci8" Width="32" Height="32" Offset="0x7EE0" TlutOffset="0x6B20" />
<Texture Name="gBbaUnusedFingersTex" OutName="bba_unused_fingers" Format="ci8" Width="16" Height="16" Offset="0x82E0" TlutOffset="0x6B20" />
<Texture Name="gBbaUnusedShirtTex" OutName="bba_unused_shirt" Format="ci8" Width="16" Height="16" Offset="0x83E0" TlutOffset="0x6B20" />
<Texture Name="gBbaUnusedBagTex" OutName="bba_unused_bag" Format="ci8" Width="16" Height="16" Offset="0x84E0" TlutOffset="0x6B20" />
<Texture Name="gBbaUnusedSkirtTex" OutName="bba_unused_skirt" Format="ci8" Width="16" Height="16" Offset="0x85E0" TlutOffset="0x6B20" />
<Texture Name="gBbaHairSkin2Tex" OutName="bba_hair_skin_2" Format="ci8" Width="32" Height="32" Offset="0x6D20" TlutOffset="0x6B20" />
<Texture Name="gBbaEar2Tex" OutName="bba_ear_2" Format="ci8" Width="8" Height="8" Offset="0x7120" TlutOffset="0x6B20" />
<Texture Name="gBbaNostril2Tex" OutName="bba_nostril_2" Format="ci8" Width="8" Height="8" Offset="0x7160" TlutOffset="0x6B20" />
<Texture Name="gBbaEye2Tex" OutName="bba_eye_2" Format="rgba16" Width="32" Height="32" Offset="0x71A0"/>
<Texture Name="gBbaWrinkles2Tex" OutName="bba_wrinkles_2" Format="ci8" Width="32" Height="32" Offset="0x79A0" TlutOffset="0x6B20" />
<Texture Name="gBbaCheek2Tex" OutName="bba_cheek_2" Format="ci8" Width="16" Height="16" Offset="0x7DA0" TlutOffset="0x6B20" />
<Texture Name="gBbaSkin2Tex" OutName="bba_skin_2" Format="ci8" Width="8" Height="8" Offset="0x7EA0" TlutOffset="0x6B20" />
<Texture Name="gBbaForehead2Tex" OutName="bba_forehead_2" Format="ci8" Width="32" Height="32" Offset="0x7EE0" TlutOffset="0x6B20" />
<Texture Name="gBbaFingers2Tex" OutName="bba_fingers_2" Format="ci8" Width="16" Height="16" Offset="0x82E0" TlutOffset="0x6B20" />
<Texture Name="gBbaShirt2Tex" OutName="bba_shirt_2" Format="ci8" Width="16" Height="16" Offset="0x83E0" TlutOffset="0x6B20" />
<Texture Name="gBbaBag2Tex" OutName="bba_bag_2" Format="ci8" Width="16" Height="16" Offset="0x84E0" TlutOffset="0x6B20" />
<Texture Name="gBbaSkirt2Tex" OutName="bba_skirt_2" Format="ci8" Width="16" Height="16" Offset="0x85E0" TlutOffset="0x6B20" />
<!-- Textures -->
<Texture Name="gBbaSkinTex" OutName="bba_skin" Format="ci8" Width="8" Height="8" Offset="0x86E0" />
assets/xml/objects/object_eg.xml
+10 -10
View File
@@ -34,20 +34,20 @@
<!-- Display list for Eyegore's laser attack -->
<DList Name="gEyegoreLaserDL" Offset="0x41F0" /> <!-- Original name is "eg_sen_SCR1_F_model" -->
<!-- Several unused textures. Purpose unknown. -->
<Texture Name="gEyegoreUnusedUnknown1Tex" OutName="eyegore_unused_unknown_1" Format="rgba16" Width="8" Height="8" Offset="0x4280" /> <!-- unused -->
<Texture Name="gEyegoreUnusedUnknown2Tex" OutName="eyegore_unused_unknown_2" Format="i4" Width="16" Height="32" Offset="0x4300" /> <!-- type is uncertain -->
<Texture Name="gEyegoreUnusedUnknown3Tex" OutName="eyegore_unused_unknown_3" Format="rgba16" Width="16" Height="32" Offset="0x4400" /> <!-- unused -->
<Texture Name="gEyegoreUnusedUnknown4Tex" OutName="eyegore_unused_unknown_4" Format="rgba16" Width="16" Height="8" Offset="0x4800" /> <!-- unused -->
<Texture Name="gEyegoreUnusedUnknown5Tex" OutName="eyegore_unused_unknown_5" Format="rgba16" Width="16" Height="16" Offset="0x4900" /> <!-- unused -->
<Texture Name="gEyegoreUnusedEyeTex" OutName="eyegore_unused_eye" Format="rgba16" Width="32" Height="16" Offset="0x4B00" /> <!-- unused -->
<Texture Name="gEyegoreUnusedUnknown6Tex" OutName="eyegore_unused_unknown_6" Format="rgba16" Width="16" Height="16" Offset="0x4F00" /> <!-- unused -->
<!-- Several unused textures that look to come from object_vm. Purpose unknown. -->
<Texture Name="gEyegoreBeamosBodyGradientTex" OutName="eyegore_beamos_body_gradient" Format="rgba16" Width="8" Height="8" Offset="0x4280" />
<Texture Name="gEyegoreBeamosGrayMetalTex" OutName="eyegore_beamos_gray_metal" Format="i4" Width="16" Height="32" Offset="0x4300" />
<Texture Name="gEyegoreBeamosBoltAndMetalTex" OutName="eyegore_beamos_bolt_and_metal" Format="rgba16" Width="16" Height="32" Offset="0x4400" />
<Texture Name="gEyegoreBeamosInnerEyeLidTex" OutName="eyegore_beamos_inner_eye_lid" Format="rgba16" Width="16" Height="8" Offset="0x4800" />
<Texture Name="gEyegoreBeamosEyeOutlineTex" OutName="eyegore_beamos_eye_outline" Format="rgba16" Width="16" Height="16" Offset="0x4900" />
<Texture Name="gEyegoreBeamosEyeTex" OutName="eyegore_beamos_eye" Format="rgba16" Width="32" Height="16" Offset="0x4B00" />
<Texture Name="gEyegoreBeamosBodyTex" OutName="eyegore_beamos_body_tex" Format="rgba16" Width="16" Height="16" Offset="0x4F00" />
<!-- Animated texture for Eyegore's laser attack. Uses gEyegoreEyeLaserTexAnim. -->
<Texture Name="gEyegoreLaserTex" OutName="eyegore_laser" Format="rgba16" Width="8" Height="8" Offset="0x5100" />
<!-- Unused teeth texture. Purpose unknown. -->
<Texture Name="gEyegoreUnusedTeethTex" OutName="eyegore_unused_teeth" Format="rgba16" Width="32" Height="32" Offset="0x5180" /> <!-- unused -->
<!-- Unused teeth texture that looks to come from object_vm. Purpose unknown. -->
<Texture Name="gEyegoreBeamosTeethTex" OutName="eyegore_beamos_teeth" Format="rgba16" Width="32" Height="32" Offset="0x5180" />
<!-- Eyegore limb display lists -->
<DList Name="gEyegoreHipsDL" Offset="0x7C80" />
src/overlays/actors/ovl_En_Ssh/z_en_ssh.c
+5 -2
View File
@@ -6,6 +6,7 @@
#include "z_en_ssh.h"
#include "objects/object_ssh/object_ssh.h"
#include "objects/object_st/object_st.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_4 | ACTOR_FLAG_10 | ACTOR_FLAG_20)
@@ -627,8 +628,10 @@ void EnSsh_SetColliders(EnSsh* this, PlayState* play) {
}
void EnSsh_Init(Actor* thisx, PlayState* play) {
// @bug - this symbol no longer exists, reads from a random place in object_ssh_Tex_000190 instead
f32 frameCount = Animation_GetLastFrame(&D_06000304);
//! @bug: object_st_Anim_000304 is similar if not idential to object_ssh_Anim_001494.
//! They also shared the same offset into their respective object files in OoT.
//! However since object_ssh is the one loaded, this ends up reading garbage data from within object_ssh_Tex_000190.
f32 frameCount = Animation_GetLastFrame(&object_st_Anim_000304);
s32 pad;
EnSsh* this = THIS;
undefined_syms.txt
+4 -483
View File
File diff suppressed because it is too large Load Diff