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_Fish (#450)

Browse Source 
* En_Fish

* R

* PR

* PR

* Update src/overlays/actors/ovl_En_Fish/z_en_fish.c

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

Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Maide
2022-01-04 04:29:49 +00:00
committed by GitHub
co-authored by Kenix3 Derek Hensley
parent f66a9f8d0e
commit fc37051216
4 changed files with 917 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/variables.h
+2 -2
View File
@@ -3912,8 +3912,8 @@ extern AnimatedMaterial D_0402C980;
extern AnimatedMaterial D_0402C9F8;
extern FlexSkeletonHeader D_0402CA98;
extern Gfx D_0402E510[];
extern UNK_TYPE D_0402E65C;
extern UNK_TYPE D_0402F0EC;
extern AnimationHeader D_0402E65C;
extern AnimationHeader D_0402F0EC;
extern Gfx D_04030100[]; // Floor shockwave ring
extern Gfx D_040301B0[];
extern UNK_TYPE D_04032270;
spec
+1 -2
View File
@@ -1376,8 +1376,7 @@ beginseg
name "ovl_En_Fish"
compress
include "build/src/overlays/actors/ovl_En_Fish/z_en_fish.o"
include "build/data/ovl_En_Fish/ovl_En_Fish.data.o"
include "build/data/ovl_En_Fish/ovl_En_Fish.reloc.o"
include "build/src/overlays/actors/ovl_En_Fish/ovl_En_Fish_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Fish/z_en_fish.c
+875 -50
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Fish/z_en_fish.h
+39 -3
View File
@@ -5,11 +5,47 @@
struct EnFish;
typedef void (*EnFishUnkFunc)(Actor*, GlobalContext*);
enum {
/* -1 */ ENFISH_MINUS1 = -1,
/* 0 */ ENFISH_0,
/* 1 */ ENFISH_1,
/* 2 */ ENFISH_2,
};
typedef struct EnFish {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk144[0x133];
/* 0x277 */ s8 unk_277;
/* 0x278 */ char unk278[0x4];
/* 0x144 */ ColliderJntSph collider;
/* 0x164 */ ColliderJntSphElement colliderElements[1];
/* 0x1A4 */ SkelAnime skelAnime;
/* 0x1E8 */ Vec3s jointTable[7];
/* 0x212 */ Vec3s morphTable[7];
/* 0x23C */ EnFishUnkFunc unkFunc;
/* 0x240 */ s16 unk_240;
/* 0x242 */ s16 unk_242;
/* 0x244 */ s16 unk_244;
/* 0x246 */ s16 unk_246;
/* 0x248 */ s32 unk_248;
/* 0x24C */ f32 unk_24C;
/* 0x250 */ f32 unk_250;
/* 0x254 */ f32 unk_254;
/* 0x258 */ f32 unk_258;
/* 0x25C */ f32 unk_25C;
/* 0x260 */ f32 unk_260;
/* 0x264 */ s16 unk_264;
/* 0x266 */ s16 unk_266;
/* 0x268 */ s16 unk_268;
/* 0x26A */ s16 unk_26A;
/* 0x26C */ s16 unk_26C;
/* 0x26E */ s16 unk_26E;
/* 0x270 */ s16 unk_270;
/* 0x272 */ s16 unk_272;
/* 0x274 */ s16 unk_274;
/* 0x276 */ s8 unk_276;
/* 0x277 */ u8 unk_277;
/* 0x278 */ s8 unk_278;
/* 0x279 */ s8 unk_279;
} EnFish; // size = 0x27C
extern const ActorInit En_Fish_InitVars;