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

En_am OK (#501)

Browse Source 
* en_am ok

* clean up

* applying feedback and some docs, need finish still

* this should fix things

* fixing things

* fixing things and running format

* post actor_fixer

* adding object header and fixing comments

* formatting and adding enum for limbs

* addressing pr, naming things, cleanup

* fixing enum in header

* doing some docs and fixing format
This commit is contained in:
Parker Burnett
2022-02-13 12:02:31 -05:00
committed by GitHub
parent 40d1bc00fe
commit 0f7f5de084
6 changed files with 497 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/objects/object_am.xml
+17 -17
View File
@@ -1,8 +1,8 @@
<Root>
<File Name="object_am" Segment="6">
<Collision Name="object_am_Colheader_000118" Offset="0x118" />
<Animation Name="object_am_Anim_000238" Offset="0x238" />
<Animation Name="object_am_Anim_00033C" Offset="0x33C" />
<Animation Name="gArmosHopAnim" Offset="0x238" />
<Animation Name="gArmosPushedBackAnim" Offset="0x33C" />
<DList Name="object_am_DL_0005D0" Offset="0x5D0" />
<DList Name="object_am_DL_0007A8" Offset="0x7A8" />
<DList Name="object_am_DL_0016C8" Offset="0x16C8" />
@@ -21,21 +21,21 @@
<Texture Name="object_am_Tex_004C38" OutName="tex_004C38" Format="rgba16" Width="32" Height="32" Offset="0x4C38" />
<Texture Name="object_am_Tex_005438" OutName="tex_005438" Format="i4" Width="16" Height="8" Offset="0x5438" />
<Texture Name="object_am_Tex_005478" OutName="tex_005478" Format="rgba16" Width="16" Height="32" Offset="0x5478" />
<Limb Name="object_am_Standardlimb_005878" Type="Standard" Offset="0x5878" />
<Limb Name="object_am_Standardlimb_005884" Type="Standard" Offset="0x5884" />
<Limb Name="object_am_Standardlimb_005890" Type="Standard" Offset="0x5890" />
<Limb Name="object_am_Standardlimb_00589C" Type="Standard" Offset="0x589C" />
<Limb Name="object_am_Standardlimb_0058A8" Type="Standard" Offset="0x58A8" />
<Limb Name="object_am_Standardlimb_0058B4" Type="Standard" Offset="0x58B4" />
<Limb Name="object_am_Standardlimb_0058C0" Type="Standard" Offset="0x58C0" />
<Limb Name="object_am_Standardlimb_0058CC" Type="Standard" Offset="0x58CC" />
<Limb Name="object_am_Standardlimb_0058D8" Type="Standard" Offset="0x58D8" />
<Limb Name="object_am_Standardlimb_0058E4" Type="Standard" Offset="0x58E4" />
<Limb Name="object_am_Standardlimb_0058F0" Type="Standard" Offset="0x58F0" />
<Limb Name="object_am_Standardlimb_0058FC" Type="Standard" Offset="0x58FC" />
<Limb Name="object_am_Standardlimb_005908" Type="Standard" Offset="0x5908" />
<Skeleton Name="object_am_Skel_005948" Type="Normal" LimbType="Standard" Offset="0x5948" />
<Animation Name="object_am_Anim_005B3C" Offset="0x5B3C" />
<Limb Name="object_am_Standardlimb_005878" Type="Standard" EnumName="OBJECT_AM_LIMB_01" Offset="0x5878" />
<Limb Name="object_am_Standardlimb_005884" Type="Standard" EnumName="OBJECT_AM_LIMB_02" Offset="0x5884" />
<Limb Name="object_am_Standardlimb_005890" Type="Standard" EnumName="OBJECT_AM_LIMB_BODY" Offset="0x5890" />
<Limb Name="object_am_Standardlimb_00589C" Type="Standard" EnumName="OBJECT_AM_LIMB_04" Offset="0x589C" />
<Limb Name="object_am_Standardlimb_0058A8" Type="Standard" EnumName="OBJECT_AM_LIMB_05" Offset="0x58A8" />
<Limb Name="object_am_Standardlimb_0058B4" Type="Standard" EnumName="OBJECT_AM_LIMB_SHIELD" Offset="0x58B4" />
<Limb Name="object_am_Standardlimb_0058C0" Type="Standard" EnumName="OBJECT_AM_LIMB_07" Offset="0x58C0" />
<Limb Name="object_am_Standardlimb_0058CC" Type="Standard" EnumName="OBJECT_AM_LIMB_08" Offset="0x58CC" />
<Limb Name="object_am_Standardlimb_0058D8" Type="Standard" EnumName="OBJECT_AM_LIMB_SWORD" Offset="0x58D8" />
<Limb Name="object_am_Standardlimb_0058E4" Type="Standard" EnumName="OBJECT_AM_LIMB_0A" Offset="0x58E4" />
<Limb Name="object_am_Standardlimb_0058F0" Type="Standard" EnumName="OBJECT_AM_LIMB_0B" Offset="0x58F0" />
<Limb Name="object_am_Standardlimb_0058FC" Type="Standard" EnumName="OBJECT_AM_LIMB_BASE" Offset="0x58FC" />
<Limb Name="object_am_Standardlimb_005908" Type="Standard" EnumName="OBJECT_AM_LIMB_0D" Offset="0x5908" />
<Skeleton Name="object_am_Skel_005948" Type="Normal" LimbType="Standard" LimbNone="OBJECT_AM_LIMB_NONE" LimbMax="OBJECT_AM_LIMB_MAX" EnumName="object_am_Limbs" Offset="0x5948" />
<Animation Name="gArmosTakeDamageAnim" Offset="0x5B3C" />
<Collision Name="object_am_Colheader_005CF8" Offset="0x5CF8" />
</File>
</Root>
spec
+1 -2
View File
@@ -1004,8 +1004,7 @@ beginseg
name "ovl_En_Am"
compress
include "build/src/overlays/actors/ovl_En_Am/z_en_am.o"
include "build/data/ovl_En_Am/ovl_En_Am.data.o"
include "build/data/ovl_En_Am/ovl_En_Am.reloc.o"
include "build/src/overlays/actors/ovl_En_Am/ovl_En_Am_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Am/z_en_am.c
+457 -55
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Am/z_en_am.h
+15 -2
View File
@@ -2,6 +2,7 @@
#define Z_EN_AM_H
#include "global.h"
#include "objects/object_am/object_am.h"
struct EnAm;
@@ -9,9 +10,21 @@ typedef void (*EnAmActionFunc)(struct EnAm*, GlobalContext*);
typedef struct EnAm {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xEC];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[OBJECT_AM_LIMB_MAX];
/* 0x01DC */ Vec3s morphTable[OBJECT_AM_LIMB_MAX];
/* 0x0230 */ EnAmActionFunc actionFunc;
/* 0x0234 */ char unk_234[0x14C];
/* 0x0234 */ u8 textureBlend; // 0 = statue textures; 255 = enemy textures
/* 0x0236 */ s16 explodeTimer; // timer counting down till armos explodes
/* 0x0238 */ s16 returnHomeTimer; // Timer that counts down till an armos will return to its spawn position
/* 0x023A */ s16 unkFlag;
/* 0x023C */ s16 armosYaw; // Yaw of Armos
/* 0x0240 */ f32 speed; // Hopping speed of Armos
/* 0x0244 */ f32 effectAlpha;
/* 0x0248 */ f32 effectScale;
/* 0x024C */ Vec3f limbPos[13];
/* 0x02E8 */ ColliderCylinder enemyCollider; // Collider for when Armos is Hostile
/* 0x0334 */ ColliderCylinder interactCollider; // Collider for when an interactable Armos is docile
} EnAm; // size = 0x380
extern const ActorInit En_Am_InitVars;
tools/disasm/functions.txt
+7 -7
View File
@@ -5873,11 +5873,11 @@
0x808AF8F8:("EnBombf_Draw",),
0x808AFCD0:("EnAm_Init",),
0x808AFDF8:("EnAm_Destroy",),
0x808AFE38:("func_808AFE38",),
0x808AFE38:("EnAm_SpawnEffects",),
0x808AFF9C:("func_808AFF9C",),
0x808B0040:("func_808B0040",),
0x808B00D8:("func_808B00D8",),
0x808B0124:("func_808B0124",),
0x808B0040:("EnAm_RemoveEnemyTexture",),
0x808B00D8:("EnAm_WakeUp",),
0x808B0124:("EnAm_ApplyEnemyTexture",),
0x808B0208:("func_808B0208",),
0x808B0358:("func_808B0358",),
0x808B03C0:("func_808B03C0",),
@@ -5889,15 +5889,15 @@
0x808B05C8:("func_808B05C8",),
0x808B0640:("func_808B0640",),
0x808B066C:("func_808B066C",),
0x808B06D0:("func_808B06D0",),
0x808B06D0:("EnAm_TakeDamage",),
0x808B07A8:("func_808B07A8",),
0x808B0820:("func_808B0820",),
0x808B0894:("func_808B0894",),
0x808B0AD0:("func_808B0AD0",),
0x808B0B4C:("func_808B0B4C",),
0x808B0B9C:("func_808B0B9C",),
0x808B0B9C:("EnAm_UpdateDamage",),
0x808B0CC8:("EnAm_Update",),
0x808B0EA4:("func_808B0EA4",),
0x808B0EA4:("EnAm_PostLimbDraw",),
0x808B0F98:("EnAm_Draw",),
0x808B1330:("EnDekubaba_Init",),
0x808B1504:("EnDekubaba_Destroy",),
undefined_syms.txt
-7
View File
@@ -1162,13 +1162,6 @@ D_06009E70 = 0x06009E70;
D_0600A0D8 = 0x0600A0D8;
// ovl_En_Am
D_06000238 = 0x06000238;
D_0600033C = 0x0600033C;
D_06005948 = 0x06005948;
D_06005B3C = 0x06005B3C;
// ovl_En_An
D_06000308 = 0x06000308;