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

Bg_Ikana_Rotaryroom (#573) 

* Bg_Ikana_Rotaryroom

* Merge

* Merge

* PR

* PR
This commit is contained in:
Maide 2022-02-13 23:39:10 +00:00 committed by GitHub
parent 66b309218c
commit 5fe04d87e0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 966 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec
View File

@ -4308,8 +4308,7 @@ beginseg
name "ovl_Bg_Ikana_Rotaryroom"
compress
include "build/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.o"
include "build/data/ovl_Bg_Ikana_Rotaryroom/ovl_Bg_Ikana_Rotaryroom.data.o"
include "build/data/ovl_Bg_Ikana_Rotaryroom/ovl_Bg_Ikana_Rotaryroom.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/ovl_Bg_Ikana_Rotaryroom_reloc.o"
endseg
beginseg

7
src/overlays/actors/ovl_Bg_Ikana_Block/z_bg_ikana_block.h
View File

@ -11,7 +11,12 @@ typedef struct BgIkanaBlock {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x1C];
/* 0x0160 */ BgIkanaBlockActionFunc actionFunc;
/* 0x0164 */ char unk_164[0x1C];
/* 0x0164 */ char unk_164[0xC];
/* 0x0170 */ f32 unk_170;
/* 0x0174 */ char unk_174[0x8];
/* 0x017C */ u8 unk_17C;
/* 0x017D */ char unk_17D[0x1];
/* 0x017E */ u8 unk_17E;
} BgIkanaBlock; // size = 0x180
extern const ActorInit Bg_Ikana_Block_InitVars;

977
src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.c
View File

File diff suppressed because it is too large Load Diff

41
src/overlays/actors/ovl_Bg_Ikana_Rotaryroom/z_bg_ikana_rotaryroom.h
View File

@ -6,12 +6,47 @@
struct BgIkanaRotaryroom;
typedef void (*BgIkanaRotaryroomActionFunc)(struct BgIkanaRotaryroom*, GlobalContext*);
typedef void (*BgIkanaRotaryroomUnkFunc)(Actor*, GlobalContext*);
typedef void (*BgIkanaRotaryroomUnkFunc2)(struct BgIkanaRotaryroom*, GlobalContext*);
#define BGIKANAROTARYROOM_GET_1(thisx) ((thisx)->params & 1)
#define BGIKANAROTARYROOM_GET_FE(thisx) (((thisx)->params >> 1) & 0x7F)
#define BGIKANAROTARYROOM_GET_7F00(thisx) (((thisx)->params >> 8) & 0x7F)
typedef struct {
/* 0x00 */ Actor* unk_00;
/* 0x04 */ MtxF unk_04;
} BgIkanaRotaryroomStruct1; // size = 0x44
typedef struct {
/* 0x00 */ Actor* unk_00;
/* 0x04 */ MtxF unk_04;
/* 0x44 */ Vec3s unk_44;
/* 0x4C */ f32 unk_4C;
} BgIkanaRotaryroomStruct2; // size = 0x50
typedef struct {
/* 0x00 */ MtxF unk_00;
/* 0x40 */ Vec3s unk_40;
/* 0x48 */ f32 unk_48;
/* 0x4C */ Vec3f unk_4C;
} BgIkanaRotaryroomStruct3; // size = 0x58
typedef struct BgIkanaRotaryroom {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x43C];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x015C */ ColliderJntSph collider;
/* 0x017C */ ColliderJntSphElement colliderElements[2];
/* 0x01FC */ AnimatedMaterial* unk_1FC;
/* 0x0200 */ BgIkanaRotaryroomUnkFunc unk_200;
/* 0x0204 */ BgIkanaRotaryroomStruct1 unk_204;
/* 0x0248 */ BgIkanaRotaryroomStruct1 unk_248[2];
/* 0x02D0 */ BgIkanaRotaryroomStruct1 unk_2D0[4];
/* 0x03E0 */ BgIkanaRotaryroomStruct2 unk_3E0[4];
/* 0x0520 */ BgIkanaRotaryroomStruct3 unk_520;
/* 0x0578 */ BgIkanaRotaryroomUnkFunc2 unk_578;
/* 0x057C */ BgIkanaRotaryroomUnkFunc2 unk_57C;
/* 0x0580 */ BgIkanaRotaryroomActionFunc actionFunc;
/* 0x0584 */ char unk_584[0x4];
/* 0x0584 */ s16 unk_584;
} BgIkanaRotaryroom; // size = 0x588
extern const ActorInit Bg_Ikana_Rotaryroom_InitVars;

8
undefined_syms.txt
View File

@ -700,14 +700,6 @@ D_06001AD8 = 0x06001AD8;
D_06001E18 = 0x06001E18;
D_06002358 = 0x06002358;
// ovl_Bg_Ikana_Rotaryroom
D_06004710 = 0x06004710;
D_060048A0 = 0x060048A0;
D_06007360 = 0x06007360;
D_06007448 = 0x06007448;
D_06007B68 = 0x06007B68;
// ovl_Bg_Ikninside
D_0600CC78 = 0x0600CC78;