mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-04-07 15:16:31 +00:00
Code Issues Projects Releases Wiki Activity

General object cleanup (#799)

Browse source 
* Object cleanup

* Fix running man

* fix mm symbols
This commit is contained in:
Anghelo Carvajal 2021-04-30 00:38:15 -04:00 • committed by GitHub
parent 98aef8988a
commit 6e58354c71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
assets/xml/objects/object_fd.xml
View file

@ -4,9 +4,9 @@
<Texture Name="gVolvagiaBossTitleCardTex" OutName="volvagia_boss_title_card" Format="i8" Width="128" Height="120" Offset="0xD700"/>
<!-- Skeletons -->
<Skeleton Name="gVolvagiaLeftArmSkel" Type="Standard" LimbType="Standard" Offset="0x114E0"/>
<Skeleton Name="gVolvagiaRightArmSkel" Type="Standard" LimbType="Standard" Offset="0x115A0"/>
<Skeleton Name="gVolvagiaHeadSkel" Type="Standard" LimbType="Standard" Offset="0x11660"/>
<Skeleton Name="gVolvagiaLeftArmSkel" Type="Normal" LimbType="Standard" Offset="0x114E0"/>
<Skeleton Name="gVolvagiaRightArmSkel" Type="Normal" LimbType="Standard" Offset="0x115A0"/>
<Skeleton Name="gVolvagiaHeadSkel" Type="Normal" LimbType="Standard" Offset="0x11660"/>
<!-- Animations -->
<Animation Name="gVolvagiaLeftArmEmergeAnim" Offset="0x11464"/>

16
assets/xml/objects/object_goma.xml
View file

@ -28,16 +28,16 @@
<Animation Name="gGohmaAnim_0039D0" Offset="0x39D0"/> <!-- unused attack animation -->
<!-- Limb textures -->
<Texture Name="gGohmaTex_0183A8" Outname="gohma_tex_0183A8" Format="rgb5a1" Width="16" Height="16" Offset="0x183A8"/>
<Texture Name="gGohmaTex_0185A8" Outname="gohma_tex_0185A8" Format="rgb5a1" Width="16" Height="16" Offset="0x185A8"/>
<Texture Name="gGohmaTex_0187A8" Outname="gohma_tex_0187A8" Format="rgb5a1" Width="16" Height="16" Offset="0x187A8"/>
<Texture Name="gGohmaTex_0189A8" Outname="gohma_tex_0189A8" Format="rgb5a1" Width="32" Height="32" Offset="0x189A8"/>
<Texture Name="gGohmaTex_0191A8" Outname="gohma_tex_0191A8" Format="rgb5a1" Width="16" Height="16" Offset="0x191A8"/>
<Texture Name="gGohmaTex_0193A8" Outname="gohma_tex_0193A8" Format="rgb5a1" Width="32" Height="32" Offset="0x193A8"/>
<Texture Name="gGohmaTex_0183A8" OutName="gohma_tex_0183A8" Format="rgb5a1" Width="16" Height="16" Offset="0x183A8"/>
<Texture Name="gGohmaTex_0185A8" OutName="gohma_tex_0185A8" Format="rgb5a1" Width="16" Height="16" Offset="0x185A8"/>
<Texture Name="gGohmaTex_0187A8" OutName="gohma_tex_0187A8" Format="rgb5a1" Width="16" Height="16" Offset="0x187A8"/>
<Texture Name="gGohmaTex_0189A8" OutName="gohma_tex_0189A8" Format="rgb5a1" Width="32" Height="32" Offset="0x189A8"/>
<Texture Name="gGohmaTex_0191A8" OutName="gohma_tex_0191A8" Format="rgb5a1" Width="16" Height="16" Offset="0x191A8"/>
<Texture Name="gGohmaTex_0193A8" OutName="gohma_tex_0193A8" Format="rgb5a1" Width="32" Height="32" Offset="0x193A8"/>
<!-- Boss title card -->
<Texture Name="gGohmaTitleCardTex" OutName="gohma_title_card" Format="i8" Width="128" Height="120" Offset="0x19BA8"/>
<!-- Door -->
<DList Name="gGohmaDoorDL" Offset="0x1EC20"/>
<Collision Name="gGohmaDoorCol" Offset="0x1EDD0"/>

7
assets/xml/objects/object_mm.xml
View file

@ -1,13 +1,16 @@
<Root>
<File Name="object_mm" Segment="6">
<Skeleton Name="gRunningManSkel" Type="Flex" LimbType="Standard" Offset="0x5E18"/>
<Animation Name="gRunningManRunAnim" Offset="0x0718"/>
<Animation Name="gRunningManSitStandAnim" Offset="0x6940"/>
<Animation Name="gRunningManSitWaitAnim" Offset="0x6C50"/>
<Animation Name="gRunningManSprintAnim" Offset="0x0468"/>
<Animation Name="gRunningManExcitedAnim" Offset="0x73A0"/>
<Animation Name="gRunningManHappyAnim" Offset="0x8060"/>
<Texture Name="gRunningManMouthClosedTex" Outname="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xE30"/>
<Texture Name="gRunningManMouthOpenTex" Outname="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30"/>
<Texture Name="gRunningManTLUT" OutName="running_man_tlut" Format="rgb5a1" Width="16" Height="16" Offset="0x730"/>
<Texture Name="gRunningManMouthOpenTex" OutName="running_man_mouth_open" Format="ci8" Width="32" Height="16" Offset="0xE30"/>
<Texture Name="gRunningManMouthClosedTex" OutName="running_man_mouth_closed" Format="ci8" Width="32" Height="16" Offset="0xC30"/>
</File>
</Root>

2
assets/xml/objects/object_po_field.xml
View file

@ -15,6 +15,6 @@
<DList Name="gBigPoeFaceDL" Offset="0x5900"/>
<DList Name="gBigPoeBodyDL" Offset="0x59F0"/>
<DList Name="gPoeFieldBurnDL" Offset="0x66D0"/>
<Skeleton Name="gPoeFieldSkel" Type="Standard" LimbType="Standard" Offset="0x6A30"/>
<Skeleton Name="gPoeFieldSkel" Type="Normal" LimbType="Standard" Offset="0x6A30"/>
</File>
</Root>

2
assets/xml/objects/object_po_sisters.xml
View file

@ -17,7 +17,7 @@
<DList Name="gPoeSistersAmyBodyDL" Offset="0x3DC8"/>
<DList Name="gPoSistersAmyFaceDL" Offset="0x4020"/>
<DList Name="gPoSistersBurnDL" Offset="0x46E0"/>
<Skeleton Name="gPoeSistersSkel" Type="Standard" LimbType="Standard" Offset="0x65C8"/>
<Skeleton Name="gPoeSistersSkel" Type="Normal" LimbType="Standard" Offset="0x65C8"/>
<DList Name="gPoSistersJoellePaintingDL" Offset="0x6830"/>
<DList Name="gPoSistersBethPaintingDL" Offset="0x6D60"/>
<DList Name="gPoSistersAmyPaintingDL" Offset="0x7230"/>

2
assets/xml/objects/object_poh.xml
View file

@ -9,6 +9,6 @@
<DList Name="gPoeBurnDL" Offset="0x2608"/>
<DList Name="gPoeLanternDL" Offset="0x2D28"/>
<DList Name="gPoeSoulDL" Offset="0x3850"/>
<Skeleton Name="gPoeSkel" Type="Standard" LimbType="Standard" Offset="0x50D0"/>
<Skeleton Name="gPoeSkel" Type="Normal" LimbType="Standard" Offset="0x50D0"/>
</File>
</Root>

8
assets/xml/objects/object_spot09_obj.xml
View file

@ -6,9 +6,9 @@
<DList Name="gCarpentersTentDL" Offset="0x7D40"/>
<DList Name="gValleyRepairedBridgeDL" Offset="0x6210"/>
<DList Name="gCarpentersTentEntranceDL" Offset="0x8010"/>
<Collision Name="gValleyObjects1Col" Offset="0x5520" Size="0x30"/>
<Collision Name="gValleyObjects2Col" Offset="0x283C" Size="0x30"/>
<Collision Name="gValleyObjects3Col" Offset="0x8458" Size="0x30"/>
<Collision Name="gValleyObjects4Col" Offset="0x7580" Size="0x30"/>
<Collision Name="gValleyObjects1Col" Offset="0x5520"/>
<Collision Name="gValleyObjects2Col" Offset="0x283C"/>
<Collision Name="gValleyObjects3Col" Offset="0x8458"/>
<Collision Name="gValleyObjects4Col" Offset="0x7580"/>
</File>
</Root>

2
src/overlays/actors/ovl_En_Mm/z_en_mm.c
View file

@ -522,7 +522,7 @@ void EnMm_Update(Actor* thisx, GlobalContext* globalCtx) {
extern Gfx D_0602CA38[]; // bunny hood dlist from object_link_child. replace with proper symbol later
void EnMm_Draw(Actor* thisx, GlobalContext* globalCtx) {
static u64* mouthTextures[] = { gRunningManMouthClosedTex, gRunningManMouthOpenTex };
static u64* mouthTextures[] = { gRunningManMouthOpenTex, gRunningManMouthClosedTex };
s32 pad;
EnMm* this = THIS;

2
src/overlays/actors/ovl_En_Mm2/z_en_mm2.c
View file

@ -318,7 +318,7 @@ void EnMm2_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void EnMm2_Draw(Actor* thisx, GlobalContext* globalCtx) {
static u64* mouthTextures[] = { gRunningManMouthClosedTex, gRunningManMouthOpenTex };
static u64* mouthTextures[] = { gRunningManMouthOpenTex, gRunningManMouthClosedTex };
EnMm2* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_mm2.c", 634);