En_Water_Effect (#435)

* En_Water_Effect

* PR

* PR

* undef

* PR
This commit is contained in:
Maide
2022-01-04 04:03:47 +00:00
committed by GitHub
parent 4ee7dc1da6
commit 6b50345831
4 changed files with 698 additions and 35 deletions
+1 -2
View File
@@ -3046,8 +3046,7 @@ beginseg
name "ovl_En_Water_Effect"
compress
include "build/src/overlays/actors/ovl_En_Water_Effect/z_en_water_effect.o"
include "build/data/ovl_En_Water_Effect/ovl_En_Water_Effect.data.o"
include "build/data/ovl_En_Water_Effect/ovl_En_Water_Effect.reloc.o"
include "build/src/overlays/actors/ovl_En_Water_Effect/ovl_En_Water_Effect_reloc.o"
endseg
beginseg
File diff suppressed because it is too large Load Diff
@@ -5,9 +5,41 @@
struct EnWaterEffect;
typedef struct {
/* 0x00 */ u8 unk_00;
/* 0x01 */ u8 unk_01;
/* 0x04 */ Vec3f unk_04;
/* 0x10 */ Vec3f unk_10;
/* 0x1C */ Vec3f unk_1C;
/* 0x28 */ s16 unk_28;
/* 0x2A */ u8 unk_2A;
/* 0x2C */ Vec3f unk_2C;
/* 0x38 */ f32 unk_38;
/* 0x3C */ s16 unk_3C;
} EnWaterEffectStruct; // size = 0x40
enum {
/* 0x 1 */ ENWATEREFFECT_1 = 1,
/* 0x309 */ ENWATEREFFECT_777 = 777,
/* 0x30A */ ENWATEREFFECT_778,
/* 0x30B */ ENWATEREFFECT_779,
/* 0x30C */ ENWATEREFFECT_780,
};
typedef struct EnWaterEffect {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0xCF8];
/* 0x144 */ EnWaterEffectStruct unk_144[50];
/* 0xDC4 */ s16 unk_DC4;
/* 0xDC6 */ s16 unk_DC6;
/* 0xDC8 */ Vec3f unk_DC8[5];
/* 0xE04 */ UNK_TYPE1 unk_E04[4];
/* 0xE04 */ f32 unk_E08[4];
/* 0xE18 */ f32 unk_E18[4];
/* 0xE28 */ UNK_TYPE1 unk_E28[4];
/* 0xE2C */ f32 unk_E2C;
/* 0xE30 */ f32 unk_E30;
/* 0xE34 */ f32 unk_E34;
/* 0xE38 */ f32 unk_E38;
} EnWaterEffect; // size = 0xE3C
extern const ActorInit En_Water_Effect_InitVars;
-16
View File
@@ -3737,22 +3737,6 @@ D_0600A054 = 0x0600A054;
D_06000EC0 = 0x06000EC0;
// ovl_En_Water_Effect
D_06000420 = 0x06000420;
D_06000730 = 0x06000730;
D_06000A48 = 0x06000A48;
D_06000CD8 = 0x06000CD8;
D_06000DE0 = 0x06000DE0;
D_06000E0C = 0x06000E0C;
D_06000E40 = 0x06000E40;
D_06000E58 = 0x06000E58;
D_06004260 = 0x06004260;
D_060042B0 = 0x060042B0;
D_060042F8 = 0x060042F8;
D_06004340 = 0x06004340;
D_060043E8 = 0x060043E8;
// ovl_En_Wdhand
D_060000F4 = 0x060000F4;