mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 05:19:36 +00:00
Code Issues Projects Releases Wiki Activity

PR 1

Browse source
This commit is contained in:
Kelebek1 2020-07-17 09:26:45 +01:00
parent 3be2c03098
commit 606584f376
3 changed files with 364 additions and 317 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
spec
View file

@ -2556,7 +2556,11 @@ endseg
beginseg beginseg
name "ovl_En_GirlA" name "ovl_En_GirlA"
include "build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o" include "build/src/overlays/actors/ovl_En_GirlA/z_en_girla.o"
#ifdef NON_MATCHING
include "build/src/overlays/actors/ovl_En_GirlA/ovl_En_GirlA_reloc.o"
#else
include "build/data/overlays/actors/z_en_girla.reloc.o" include "build/data/overlays/actors/z_en_girla.reloc.o"
#endif
endseg endseg
beginseg beginseg

663
src/overlays/actors/ovl_En_GirlA/z_en_girla.c
View file

File diff suppressed because it is too large Load diff

14
src/overlays/actors/ovl_En_GirlA/z_en_girla.h
View file

@ -6,22 +6,26 @@
struct EnGirlA; struct EnGirlA;
typedef void (*EnGirlAActionFunc)(struct EnGirlA*, GlobalContext*);
typedef void (*EnGirlA2Func)(GlobalContext*, struct EnGirlA*);
typedef void (*EnGirlA3Func)(Actor*, GlobalContext*, s32);
typedef struct EnGirlA { typedef struct EnGirlA {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ void (*actionFunc)(struct EnGirlA*, GlobalContext*); /* 0x0190 */ EnGirlAActionFunc actionFunc;
/* 0x0194 */ s8 unk_194; /* 0x0194 */ s8 unk_194;
/* 0x0195 */ s8 unk_195; /* 0x0195 */ s8 unk_195;
/* 0x0196 */ s16 unk_196; /* 0x0196 */ s16 unk_196;
/* 0x0198 */ void (*unk_198)(struct EnGirlA*, GlobalContext*); /* 0x0198 */ EnGirlAActionFunc unk_198;
/* 0x019C */ s32 unk_19C; /* 0x019C */ s32 unk_19C;
/* 0x01A0 */ s16 unk_1A0; /* 0x01A0 */ s16 unk_1A0;
/* 0x01A2 */ s16 unk_1A2; /* 0x01A2 */ s16 unk_1A2;
/* 0x01A4 */ s32 unk_1A4; /* 0x01A4 */ s32 unk_1A4;
/* 0x01A8 */ s16 unk_1A8; /* 0x01A8 */ s16 unk_1A8;
/* 0x01AA */ s16 unk_1AA; /* 0x01AA */ s16 unk_1AA;
/* 0x01AC */ void (*unk_1AC)(GlobalContext*, struct EnGirlA*); /* 0x01AC */ EnGirlA2Func unk_1AC;
/* 0x01B0 */ void (*unk_1B0)(GlobalContext*, struct EnGirlA*); /* 0x01B0 */ EnGirlA2Func unk_1B0;
/* 0x01B4 */ s16 unk_1B4; /* 0x01B4 */ s16 unk_1B4;
/* 0x01B6 */ s16 unk_1B6; /* 0x01B6 */ s16 unk_1B6;
/* 0x01B8 */ s16 unk_1B8; /* 0x01B8 */ s16 unk_1B8;
@ -33,7 +37,7 @@ typedef struct EnGirlA {
/* 0x01CA */ s16 unk_1CA; /* 0x01CA */ s16 unk_1CA;
/* 0x01CC */ s16 unk_1CC; /* 0x01CC */ s16 unk_1CC;
/* 0x01CE */ s16 unk_1CE; /* 0x01CE */ s16 unk_1CE;
/* 0x01D0 */ void (*unk_1D0)(Actor*, GlobalContext*, s32); /* 0x01D0 */ EnGirlA3Func unk_1D0;
} EnGirlA; // size = 0x01D4 } EnGirlA; // size = 0x01D4
extern const ActorInit En_Girla_InitVars; extern const ActorInit En_Girla_InitVars;