mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-06 20:52:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

En_Test6 (#627)

Browse Source 
* En_Test6

* ArrCount

* Always forget params

* PR

* Move defs

* PR

* Fix

* PR

* Merge

* Merge

* PR

* Fix

* PR

* PR

* Fix bss

* Match (thanks Anon)

* bss

* PR

* Merge

* bss

Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com>
Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
Maide
2022-04-09 05:38:54 +01:00
committed by GitHub
parent 06412c070f
commit afd3ae243d
8 changed files with 1326 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_demo.c
+1 -1
View File
@@ -22,7 +22,7 @@ u8 sCutsceneStoredPlayerForm = 0;
static u16 seqId;
#endif
s16 sCutsceneQuakeIndex;
struct_801F4D48 sCutsceneCameraInfo;
DbCameraUnkStruct sCutsceneCameraInfo;
u16 D_801F4DC8[10];
UNK_TYPE D_801F4DDC;
u8 D_801F4DE0;
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+1
View File
@@ -9,6 +9,7 @@
#include "overlays/actors/ovl_Item_B_Heart/z_item_b_heart.h"
#include "objects/object_boss02/object_boss02.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "prevent_bss_reordering.h"
#define FLAGS (ACTOR_FLAG_1 | ACTOR_FLAG_4 | ACTOR_FLAG_10 | ACTOR_FLAG_20)
src/overlays/actors/ovl_En_Test6/z_en_test6.c
+1262 -26
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Test6/z_en_test6.h
+37 -1
View File
@@ -7,10 +7,46 @@ struct EnTest6;
typedef void (*EnTest6ActionFunc)(struct EnTest6*, GlobalContext*);
#define ENTEST6_GET(thisx) ((thisx)->params)
enum {
/* 24 */ ENTEST6_24 = 24,
/* 25 */ ENTEST6_25,
/* 26 */ ENTEST6_26,
};
typedef struct {
/* 0x00 */ LightNode* node;
/* 0x04 */ LightInfo info;
} EnTest6Light;
typedef struct EnTest6 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ EnTest6ActionFunc actionFunc;
/* 0x0148 */ char unk_148[0x140];
/* 0x0148 */ Gfx* unk_148;
/* 0x014C */ f32 unk_14C;
/* 0x0150 */ f32 unk_150;
/* 0x0154 */ f32 unk_154;
/* 0x0158 */ f32 unk_158;
/* 0x015C */ f32 unk_15C;
/* 0x0160 */ f32 unk_160;
/* 0x0164 */ EnTest6Light lights[2];
/* 0x018C */ DbCameraUnkStruct unk_18C;
/* 0x020C */ Vec3f unk_20C[6];
/* 0x0254 */ Vec3f (*unk_254)[64];
/* 0x0258 */ Vec3f unk_258;
/* 0x0264 */ Vec3f unk_264;
/* 0x0270 */ f32 unk_270;
/* 0x0274 */ s16 unk_274;
/* 0x0276 */ s16 unk_276;
/* 0x0278 */ s16 unk_278;
/* 0x027A */ s16 unk_27A;
/* 0x027C */ s16 unk_27C;
/* 0x027E */ s16 unk_27E;
/* 0x0280 */ s16 unk_280;
/* 0x0282 */ s16 unk_282;
/* 0x0284 */ s16 unk_284;
/* 0x0286 */ s16 unk_286;
} EnTest6; // size = 0x288
extern const ActorInit En_Test6_InitVars;