falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ovl_En_Kaizoku OK (#945) 

* ovl_En_Kaizoku OK

* format.sh

* Review changes

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>

* Fix building

* first pass

* picto

* format

* object

* sfx

* morecleanup

* and more naming

* boyo

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* Review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* review

Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>

* floats

* steal some docs from OoT

* review

* format

* sort

* parens

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
Synray 2022-11-03 17:42:27 -07:00 committed by GitHub
parent 38c9ffe445
commit baaa79b979
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 2211 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/xml/objects/object_ge1.xml
View File

@ -38,7 +38,7 @@
<Texture Name="gGerudoWhiteSkinGradientTex" OutName="gerudo_white_skin_gradient" Format="ci8" Width="8" Height="8" Offset="0x2EB8" TlutOffset="0x2CB8" />
<Texture Name="gGerudoWhiteWhiteFabricLipsTex" OutName="gerudo_white_white_fabric_lips" Format="ci8" Width="16" Height="16" Offset="0x2EF8" TlutOffset="0x2CB8" />
<Texture Name="gGerudoWhiteEarTex" OutName="gerudo_white_ear" Format="ci8" Width="8" Height="16" Offset="0x2FF8" TlutOffset="0x2CB8" />
<!-- White-clothed Gerudo Eye Textures -->
<Texture Name="gGerudoWhiteEyeOpenTex" OutName="gerudo_white_eye_open" Format="rgba16" Width="32" Height="32" Offset="0x3078"/>
<Texture Name="gGerudoWhiteEyeHalfTex" OutName="gerudo_white_eye_half" Format="rgba16" Width="32" Height="32" Offset="0x3878"/>

60
assets/xml/objects/object_kz.xml
View File

@ -12,6 +12,7 @@
<Animation Name="object_kz_Anim_004860" Offset="0x4860" />
<Animation Name="object_kz_Anim_005644" Offset="0x5644" />
<Animation Name="object_kz_Anim_0058B8" Offset="0x58B8" />
<Texture Name="object_kz_TLUT_0058D0" OutName="tlut_0058D0" Format="rgba16" Width="16" Height="16" Offset="0x58D0" />
<Texture Name="object_kz_Tex_005AD0" OutName="tex_005AD0" Format="ci8" Width="8" Height="8" Offset="0x5AD0" />
<Texture Name="object_kz_Tex_005B10" OutName="tex_005B10" Format="ci8" Width="8" Height="8" Offset="0x5B10" />
@ -20,6 +21,7 @@
<Texture Name="object_kz_Tex_005D50" OutName="tex_005D50" Format="ci8" Width="16" Height="16" Offset="0x5D50" />
<Texture Name="object_kz_Tex_005E50" OutName="tex_005E50" Format="i8" Width="16" Height="16" Offset="0x5E50" />
<Texture Name="object_kz_Tex_005F50" OutName="tex_005F50" Format="i8" Width="8" Height="16" Offset="0x5F50" />
<DList Name="object_kz_DL_007CB0" Offset="0x7CB0" />
<DList Name="object_kz_DL_008130" Offset="0x8130" />
<DList Name="object_kz_DL_008268" Offset="0x8268" />
@ -30,19 +32,21 @@
<DList Name="object_kz_DL_008B10" Offset="0x8B10" />
<DList Name="object_kz_DL_008D80" Offset="0x8D80" />
<DList Name="object_kz_DL_008E80" Offset="0x8E80" />
<!-- <Texture Name="object_kz_TLUT_009100" OutName="tlut_009100" Format="rgba16" Width="16" Height="16" Offset="0x9100" /> -->
<!-- <Blob Name="object_kz_Blob_009300" Size="0x38" Offset="0x9300" /> -->
<Texture Name="object_kz_Tex_009338" OutName="tex_009338" Format="ci8" Width="8" Height="16" Offset="0x9338" />
<!-- <Blob Name="object_kz_Blob_0093B8" Size="0x400" Offset="0x93B8" /> -->
<Texture Name="gKaizokuEyeOpenTex" OutName="kaizoku_eye_open" Format="ci8" Width="32" Height="32" Offset="0x93B8" TlutOffset="0x9100" />
<Texture Name="object_kz_Tex_0097B8" OutName="tex_0097B8" Format="i8" Width="16" Height="16" Offset="0x97B8" />
<Texture Name="object_kz_Tex_0098B8" OutName="tex_0098B8" Format="ci8" Width="8" Height="16" Offset="0x98B8" />
<Texture Name="object_kz_Tex_009938" OutName="tex_009938" Format="ci8" Width="8" Height="8" Offset="0x9938" />
<!-- <Blob Name="object_kz_Blob_009978" Size="0x400" Offset="0x9978" /> -->
<Texture Name="gKaizokuEyeHalfTex" OutName="kaizoku_eye_half" Format="ci8" Width="32" Height="32" Offset="0x9978" TlutOffset="0x9100" />
<Texture Name="object_kz_Tex_009D78" OutName="tex_009D78" Format="i8" Width="8" Height="16" Offset="0x9D78" />
<Texture Name="object_kz_Tex_009DF8" OutName="tex_009DF8" Format="ci8" Width="16" Height="16" Offset="0x9DF8" />
<Texture Name="object_kz_Tex_009EF8" OutName="tex_009EF8" Format="ci8" Width="16" Height="16" Offset="0x9EF8" />
<Texture Name="object_kz_Tex_009FF8" OutName="tex_009FF8" Format="ci8" Width="16" Height="16" Offset="0x9FF8" />
<!-- <Blob Name="object_kz_Blob_00A0F8" Size="0x400" Offset="0xA0F8" /> -->
<Texture Name="gKaizokuEyeClosedTex" OutName="kaizoku_eye_closed" Format="ci8" Width="32" Height="32" Offset="0xA0F8" TlutOffset="0x9100" />
<DList Name="object_kz_DL_00C318" Offset="0xC318" />
<DList Name="object_kz_DL_00C4D8" Offset="0xC4D8" />
<DList Name="object_kz_DL_00C698" Offset="0xC698" />
@ -52,30 +56,32 @@
<DList Name="object_kz_DL_00CD78" Offset="0xCD78" />
<DList Name="object_kz_DL_00CE30" Offset="0xCE30" />
<DList Name="object_kz_DL_00CF20" Offset="0xCF20" />
<Limb Name="object_kz_Standardlimb_00D6B8" Type="Standard" EnumName="OBJECT_KZ_LIMB_01" Offset="0xD6B8" />
<Limb Name="object_kz_Standardlimb_00D6C4" Type="Standard" EnumName="OBJECT_KZ_LIMB_02" Offset="0xD6C4" />
<Limb Name="object_kz_Standardlimb_00D6D0" Type="Standard" EnumName="OBJECT_KZ_LIMB_03" Offset="0xD6D0" />
<Limb Name="object_kz_Standardlimb_00D6DC" Type="Standard" EnumName="OBJECT_KZ_LIMB_04" Offset="0xD6DC" />
<Limb Name="object_kz_Standardlimb_00D6E8" Type="Standard" EnumName="OBJECT_KZ_LIMB_05" Offset="0xD6E8" />
<Limb Name="object_kz_Standardlimb_00D6F4" Type="Standard" EnumName="OBJECT_KZ_LIMB_06" Offset="0xD6F4" />
<Limb Name="object_kz_Standardlimb_00D700" Type="Standard" EnumName="OBJECT_KZ_LIMB_07" Offset="0xD700" />
<Limb Name="object_kz_Standardlimb_00D70C" Type="Standard" EnumName="OBJECT_KZ_LIMB_08" Offset="0xD70C" />
<Limb Name="object_kz_Standardlimb_00D718" Type="Standard" EnumName="OBJECT_KZ_LIMB_09" Offset="0xD718" />
<Limb Name="object_kz_Standardlimb_00D724" Type="Standard" EnumName="OBJECT_KZ_LIMB_0A" Offset="0xD724" />
<Limb Name="object_kz_Standardlimb_00D730" Type="Standard" EnumName="OBJECT_KZ_LIMB_0B" Offset="0xD730" />
<Limb Name="object_kz_Standardlimb_00D73C" Type="Standard" EnumName="OBJECT_KZ_LIMB_0C" Offset="0xD73C" />
<Limb Name="object_kz_Standardlimb_00D748" Type="Standard" EnumName="OBJECT_KZ_LIMB_0D" Offset="0xD748" />
<Limb Name="object_kz_Standardlimb_00D754" Type="Standard" EnumName="OBJECT_KZ_LIMB_0E" Offset="0xD754" />
<Limb Name="object_kz_Standardlimb_00D760" Type="Standard" EnumName="OBJECT_KZ_LIMB_0F" Offset="0xD760" />
<Limb Name="object_kz_Standardlimb_00D76C" Type="Standard" EnumName="OBJECT_KZ_LIMB_10" Offset="0xD76C" />
<Limb Name="object_kz_Standardlimb_00D778" Type="Standard" EnumName="OBJECT_KZ_LIMB_11" Offset="0xD778" />
<Limb Name="object_kz_Standardlimb_00D784" Type="Standard" EnumName="OBJECT_KZ_LIMB_12" Offset="0xD784" />
<Limb Name="object_kz_Standardlimb_00D790" Type="Standard" EnumName="OBJECT_KZ_LIMB_13" Offset="0xD790" />
<Limb Name="object_kz_Standardlimb_00D79C" Type="Standard" EnumName="OBJECT_KZ_LIMB_14" Offset="0xD79C" />
<Limb Name="object_kz_Standardlimb_00D7A8" Type="Standard" EnumName="OBJECT_KZ_LIMB_15" Offset="0xD7A8" />
<Limb Name="object_kz_Standardlimb_00D7B4" Type="Standard" EnumName="OBJECT_KZ_LIMB_16" Offset="0xD7B4" />
<Limb Name="object_kz_Standardlimb_00D7C0" Type="Standard" EnumName="OBJECT_KZ_LIMB_17" Offset="0xD7C0" />
<Skeleton Name="object_kz_Skel_00D828" Type="Flex" LimbType="Standard" LimbNone="OBJECT_KZ_LIMB_NONE" LimbMax="OBJECT_KZ_LIMB_MAX" EnumName="ObjectKzLimb" Offset="0xD828" />
<Limb Name="object_kz_Standardlimb_00D6B8" Type="Standard" EnumName="KAIZOKU_LIMB_01" Offset="0xD6B8" />
<Limb Name="object_kz_Standardlimb_00D6C4" Type="Standard" EnumName="KAIZOKU_LIMB_02" Offset="0xD6C4" />
<Limb Name="object_kz_Standardlimb_00D6D0" Type="Standard" EnumName="KAIZOKU_LIMB_03" Offset="0xD6D0" />
<Limb Name="object_kz_Standardlimb_00D6DC" Type="Standard" EnumName="KAIZOKU_LIMB_04" Offset="0xD6DC" />
<Limb Name="object_kz_Standardlimb_00D6E8" Type="Standard" EnumName="KAIZOKU_LIMB_05" Offset="0xD6E8" />
<Limb Name="object_kz_Standardlimb_00D6F4" Type="Standard" EnumName="KAIZOKU_LIMB_06" Offset="0xD6F4" />
<Limb Name="object_kz_Standardlimb_00D700" Type="Standard" EnumName="KAIZOKU_LIMB_07" Offset="0xD700" />
<Limb Name="object_kz_Standardlimb_00D70C" Type="Standard" EnumName="KAIZOKU_LIMB_08" Offset="0xD70C" />
<Limb Name="object_kz_Standardlimb_00D718" Type="Standard" EnumName="KAIZOKU_LIMB_09" Offset="0xD718" />
<Limb Name="object_kz_Standardlimb_00D724" Type="Standard" EnumName="KAIZOKU_LIMB_0A" Offset="0xD724" />
<Limb Name="object_kz_Standardlimb_00D730" Type="Standard" EnumName="KAIZOKU_LIMB_R_SWORD" Offset="0xD730" />
<Limb Name="object_kz_Standardlimb_00D73C" Type="Standard" EnumName="KAIZOKU_LIMB_0C" Offset="0xD73C" />
<Limb Name="object_kz_Standardlimb_00D748" Type="Standard" EnumName="KAIZOKU_LIMB_0D" Offset="0xD748" />
<Limb Name="object_kz_Standardlimb_00D754" Type="Standard" EnumName="KAIZOKU_LIMB_0E" Offset="0xD754" />
<Limb Name="object_kz_Standardlimb_00D760" Type="Standard" EnumName="KAIZOKU_LIMB_0F" Offset="0xD760" />
<Limb Name="object_kz_Standardlimb_00D76C" Type="Standard" EnumName="KAIZOKU_LIMB_10" Offset="0xD76C" />
<Limb Name="object_kz_Standardlimb_00D778" Type="Standard" EnumName="KAIZOKU_LIMB_11" Offset="0xD778" />
<Limb Name="object_kz_Standardlimb_00D784" Type="Standard" EnumName="KAIZOKU_LIMB_12" Offset="0xD784" />
<Limb Name="object_kz_Standardlimb_00D790" Type="Standard" EnumName="KAIZOKU_LIMB_L_FOOT" Offset="0xD790" />
<Limb Name="object_kz_Standardlimb_00D79C" Type="Standard" EnumName="KAIZOKU_LIMB_14" Offset="0xD79C" />
<Limb Name="object_kz_Standardlimb_00D7A8" Type="Standard" EnumName="KAIZOKU_LIMB_15" Offset="0xD7A8" />
<Limb Name="object_kz_Standardlimb_00D7B4" Type="Standard" EnumName="KAIZOKU_LIMB_R_FOOT" Offset="0xD7B4" />
<Limb Name="object_kz_Standardlimb_00D7C0" Type="Standard" EnumName="KAIZOKU_LIMB_17" Offset="0xD7C0" />
<Skeleton Name="gKaizokuSkel" Type="Flex" LimbType="Standard" LimbNone="KAIZOKU_LIMB_NONE" LimbMax="KAIZOKU_LIMB_MAX" EnumName="KaizokuLimb" Offset="0xD828" />
<Animation Name="object_kz_Anim_00DBE4" Offset="0xDBE4" />
<Animation Name="object_kz_Anim_00E1C8" Offset="0xE1C8" />
<Animation Name="object_kz_Anim_00E8BC" Offset="0xE8BC" />

20
include/z64collision_check.h
View File

@ -283,16 +283,16 @@ typedef enum {
} ColChkMassType;
typedef enum {
/* 0 */ COLTYPE_HIT0, // Blue blood, white hitmark
/* 1 */ COLTYPE_HIT1, // No blood, dust hitmark
/* 2 */ COLTYPE_HIT2, // Green blood, dust hitmark
/* 3 */ COLTYPE_HIT3, // No blood, white hitmark
/* 4 */ COLTYPE_HIT4, // Water burst, no hitmark
/* 5 */ COLTYPE_HIT5, // No blood, red hitmark
/* 6 */ COLTYPE_HIT6, // Green blood, white hitmark
/* 7 */ COLTYPE_HIT7, // Red blood, white hitmark
/* 8 */ COLTYPE_HIT8, // Blue blood, red hitmark
/* 9 */ COLTYPE_METAL,
/* 0 */ COLTYPE_HIT0, // Blue blood, white hitmark
/* 1 */ COLTYPE_HIT1, // No blood, dust hitmark
/* 2 */ COLTYPE_HIT2, // Green blood, dust hitmark
/* 3 */ COLTYPE_HIT3, // No blood, white hitmark
/* 4 */ COLTYPE_HIT4, // Water burst, no hitmark
/* 5 */ COLTYPE_HIT5, // No blood, red hitmark
/* 6 */ COLTYPE_HIT6, // Green blood, white hitmark
/* 7 */ COLTYPE_HIT7, // Red blood, white hitmark
/* 8 */ COLTYPE_HIT8, // Blue blood, red hitmark
/* 9 */ COLTYPE_METAL,
/* 10 */ COLTYPE_NONE,
/* 11 */ COLTYPE_WOOD,
/* 12 */ COLTYPE_HARD,

3
spec
View File

@ -4024,8 +4024,7 @@ beginseg
name "ovl_En_Kaizoku"
compress
include "build/src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.o"
include "build/data/ovl_En_Kaizoku/ovl_En_Kaizoku.data.o"
include "build/data/ovl_En_Kaizoku/ovl_En_Kaizoku.reloc.o"
include "build/src/overlays/actors/ovl_En_Kaizoku/ovl_En_Kaizoku_reloc.o"
endseg
beginseg

2173
src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c
View File

File diff suppressed because it is too large Load Diff

87
src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.h
View File

@ -2,19 +2,98 @@
#define Z_EN_KAIZOKU_H
#include "global.h"
#include "z64snap.h"
#include "objects/object_kz/object_kz.h"
#define KAIZOKU_GET_EXIT_INDEX(thisx) ((thisx)->params & 0x3F)
#define KAIZOKU_GET_SWITCHFLAG(thisx) (((thisx)->params >> 6) & 0x7F)
struct EnKaizoku;
typedef void (*EnKaizokuActionFunc)(struct EnKaizoku*, PlayState*);
typedef enum EnKaizokuAnimation {
/* 0 */ EN_KAIZOKU_ANIM_0,
/* 1 */ EN_KAIZOKU_ANIM_1,
/* 2 */ EN_KAIZOKU_ANIM_2,
/* 3 */ EN_KAIZOKU_ANIM_3,
/* 4 */ EN_KAIZOKU_ANIM_4,
/* 5 */ EN_KAIZOKU_ANIM_5,
/* 6 */ EN_KAIZOKU_ANIM_6,
/* 7 */ EN_KAIZOKU_ANIM_7,
/* 8 */ EN_KAIZOKU_ANIM_8,
/* 9 */ EN_KAIZOKU_ANIM_9,
/* 10 */ EN_KAIZOKU_ANIM_10,
/* 11 */ EN_KAIZOKU_ANIM_11,
/* 12 */ EN_KAIZOKU_ANIM_12,
/* 13 */ EN_KAIZOKU_ANIM_13,
/* 14 */ EN_KAIZOKU_ANIM_14,
/* 15 */ EN_KAIZOKU_ANIM_15,
/* 16 */ EN_KAIZOKU_ANIM_16,
/* 17 */ EN_KAIZOKU_ANIM_17,
/* 18 */ EN_KAIZOKU_ANIM_18,
/* 19 */ EN_KAIZOKU_ANIM_MAX
} EnKaizokuAnimation;
typedef struct EnKaizoku {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x168];
/* 0x000 */ PictoActor picto;
/* 0x148 */ SkelAnime skelAnime;
/* 0x18C */ Vec3s jointTable[KAIZOKU_LIMB_MAX];
/* 0x21C */ Vec3s morphTable[KAIZOKU_LIMB_MAX];
/* 0x2AC */ EnKaizokuActionFunc actionFunc;
/* 0x2B0 */ char unk_2B0[0x40];
/* 0x2B0 */ s16 action;
/* 0x2B2 */ s16 unk_2B2;
/* 0x2B4 */ s16 lookTimer;
/* 0x2B6 */ s16 unk_2B6;
/* 0x2B8 */ s16 unk_2B8;
/* 0x2BA */ s16 drawDmgEffType;
/* 0x2BC */ s16 switchFlag;
/* 0x2BE */ s16 unk_2BE;
/* 0x2C0 */ f32 drawDmgEffScale;
/* 0x2C4 */ f32 drawDmgEffFrozenSteamScale;
/* 0x2C8 */ s16 unk_2C8;
/* 0x2CA */ s16 unk_2CA;
/* 0x2CC */ s16 eyeIndex;
/* 0x2CE */ s16 blinkTimer;
/* 0x2D0 */ s16 unk_2D0;
/* 0x2D2 */ s16 swordState;
/* 0x2D4 */ s16 exitIndex;
/* 0x2D6 */ s16 unk_2D6;
/* 0x2D8 */ u8 unk_2D8;
/* 0x2D9 */ u8 unk_2D9;
/* 0x2DC */ f32 frameCount;
/* 0x2E0 */ f32 unk_2E0;
/* 0x2E4 */ EnKaizokuAnimation animIndex;
/* 0x2E8 */ s32 bodyPartsPosIndex;
/* 0x2EC */ s32 unk_2EC;
/* 0x2F0 */ f32 unk_2F0;
/* 0x2F4 */ s16 unk_2F4;
/* 0x2F6 */ char unk_2F6[0x2FA];
/* 0x2F8 */ Vec3f unk_2F8;
/* 0x304 */ Vec3f unk_304;
/* 0x310 */ Vec3f bodyPartsPos[15];
/* 0x3C4 */ Vec3f unk_3C4;
/* 0x3D0 */ s32 blureIndex;
/* 0x3D4 */ ColliderCylinder bodyCollider;
/* 0x420 */ ColliderQuad swordCollider;
/* 0x4A0 */ ColliderTris blockCollider; // Unused. Inferred from OoT
/* 0x4C0 */ ColliderTrisElement blockElements[2]; // Unused. Inferred from OoT
/* 0x578 */ Vec3s headRot;
/* 0x580 */ Vec3f rightFootPos;
/* 0x58C */ Vec3f leftFootPos;
/* 0x598 */ s32 unk_598;
/* 0x59C */ s16 unk_59C;
/* 0x59E */ s16 subCamId;
/* 0x5A0 */ s16 unk_5A0;
/* 0x5A2 */ s16 unk_5A2;
/* 0x5A4 */ Vec3f subCamEye;
/* 0x5B0 */ Vec3f subCamAt;
/* 0x5BC */ Vec3f subCamUp;
/* 0x5C8 */ Vec3f unk_5C8;
/* 0x5D4 */ Vec3f unk_5D4;
/* 0x5E0 */ f32 unk_5E0;
/* 0x5E4 */ f32 unk_5E4;
/* 0x5E8 */ f32 unk_5E8;
/* 0x5EC */ f32 unk_5EC;
} EnKaizoku; // size = 0x5F0
#endif // Z_EN_KAIZOKU_H

2
src/overlays/actors/ovl_Obj_Boyo/z_obj_boyo.c
View File

@ -82,7 +82,7 @@ void ObjBoyo_UpdatePlayerBumpValues(ObjBoyo* this, Player* target) {
void ObjBoyo_UpdatePirateBumpValues(ObjBoyo* src, EnKaizoku* target) {
target->unk_2F0 = 30.0f;
target->unk_2F4 = Actor_YawBetweenActors(&src->actor, &target->actor);
target->unk_2F4 = Actor_YawBetweenActors(&src->actor, &target->picto.actor);
}
void ObjBoyo_UpdateBombBumpValues(ObjBoyo* src, EnBom* target) {

12
tools/disasm/functions.txt
View File

@ -14659,8 +14659,8 @@
0x80B85858:("func_80B85858",),
0x80B85900:("func_80B85900",),
0x80B85A00:("func_80B85A00",),
0x80B85E18:("func_80B85E18",),
0x80B85EA0:("func_80B85EA0",),
0x80B85E18:("EnKaizoku_ChangeAnim",),
0x80B85EA0:("EnKaizoku_ValidatePictograph",),
0x80B85F48:("func_80B85F48",),
0x80B85FA8:("func_80B85FA8",),
0x80B86804:("func_80B86804",),
@ -14698,10 +14698,10 @@
0x80B8971C:("func_80B8971C",),
0x80B89A08:("func_80B89A08",),
0x80B8A0A0:("EnKaizoku_Update",),
0x80B8A318:("func_80B8A318",),
0x80B8A468:("func_80B8A468",),
0x80B8A6B0:("func_80B8A6B0",),
0x80B8A718:("func_80B8A718",),
0x80B8A318:("EnKaizoku_OverrideLimbDraw",),
0x80B8A468:("EnKaizoku_PostLimbDraw",),
0x80B8A6B0:("EnKaizoku_TransformLimbDraw",),
0x80B8A718:("EnKaizoku_Draw",),
0x80B8B2D0:("EnGe2_Init",),
0x80B8B504:("EnGe2_Destroy",),
0x80B8B514:("func_80B8B514",),

5
undefined_syms.txt
View File

@ -865,11 +865,6 @@ D_06002ED8 = 0x06002ED8;
D_06003168 = 0x06003168;
D_060081F4 = 0x060081F4;
// ovl_En_Kaizoku
D_060058B8 = 0x060058B8;
D_0600D828 = 0x0600D828;
// ovl_En_Kitan
D_06000CE8 = 0x06000CE8;