mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-20 13:55:26 +00:00
Code Issues Projects Releases Wiki Activity

gWindMill* -> gWindmill*

Browse source
This commit is contained in:
Dragorn421 2021-09-21 10:47:51 +02:00
parent 5fd93ae79b
commit aec0103938
No known key found for this signature in database
GPG key ID: C182A3A3996E8201
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
assets/xml/objects/object_fu.xml
View file

@ -31,8 +31,8 @@
<Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20"/> <Texture Name="gWindmillManEyeClosedTex" OutName="eye_closed" Format="ci8" Width="32" Height="32" Offset="0x5F20"/>
<Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320"/> <Texture Name="gWindmillManEyeAngryTex" OutName="eye_angry" Format="ci8" Width="32" Height="32" Offset="0x6320"/>
<Texture Name="gWindMillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720"/> <Texture Name="gWindmillManMouthOpenTex" OutName="mouth_open" Format="ci8" Width="32" Height="16" Offset="0x6720"/>
<Texture Name="gWindMillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920"/> <Texture Name="gWindmillManMouthAngryTex" OutName="mouth_angry" Format="ci8" Width="32" Height="16" Offset="0x6920"/>
<Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20"/> <Texture Name="gWindmillManHairTex" OutName="hair" Format="ci8" Width="8" Height="16" Offset="0x6B20"/>
<Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/> <Skeleton Name="gWindmillManSkel" Type="Flex" LimbType="Standard" Offset="0x6C90"/>

2
src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
View file

@ -411,7 +411,7 @@ void DemoEc_UpdateWindmillMan(DemoEc* this, GlobalContext* globalCtx) {
} }
void DemoEc_DrawWindmillMan(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_DrawWindmillMan(DemoEc* this, GlobalContext* globalCtx) {
DemoEc_DrawSkeleton(this, globalCtx, &gWindmillManEyeClosedTex, &gWindMillManMouthAngryTex, NULL, NULL); DemoEc_DrawSkeleton(this, globalCtx, &gWindmillManEyeClosedTex, &gWindmillManMouthAngryTex, NULL, NULL);
} }
void DemoEc_InitKokiriBoy(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_InitKokiriBoy(DemoEc* this, GlobalContext* globalCtx) {

2
src/overlays/actors/ovl_En_Fu/z_en_fu.c
View file

@ -299,7 +299,7 @@ void EnFu_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
void EnFu_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnFu_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* sEyesSegments[] = { gWindmillManEyeClosedTex, gWindmillManEyeAngryTex }; static void* sEyesSegments[] = { gWindmillManEyeClosedTex, gWindmillManEyeAngryTex };
static void* sMouthSegments[] = { gWindMillManMouthOpenTex, gWindMillManMouthAngryTex }; static void* sMouthSegments[] = { gWindmillManMouthOpenTex, gWindmillManMouthAngryTex };
s32 pad; s32 pad;
EnFu* this = THIS; EnFu* this = THIS;