mirror of
https://github.com/izzy2lost/2ship2harkinian-Android.git
synced 2026-06-19 01:20:08 -07:00
@@ -4260,8 +4260,7 @@ beginseg
|
||||
name "ovl_Bg_Dblue_Waterfall"
|
||||
compress
|
||||
include "build/src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.o"
|
||||
include "build/data/ovl_Bg_Dblue_Waterfall/ovl_Bg_Dblue_Waterfall.data.o"
|
||||
include "build/data/ovl_Bg_Dblue_Waterfall/ovl_Bg_Dblue_Waterfall.reloc.o"
|
||||
include "build/src/overlays/actors/ovl_Bg_Dblue_Waterfall/ovl_Bg_Dblue_Waterfall_reloc.o"
|
||||
endseg
|
||||
|
||||
beginseg
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -7,11 +7,25 @@ struct BgDblueWaterfall;
|
||||
|
||||
typedef void (*BgDblueWaterfallActionFunc)(struct BgDblueWaterfall*, GlobalContext*);
|
||||
|
||||
#define BGDBLUEWATERFALL_GET_7F(thisx) ((thisx)->params & 0x7F)
|
||||
#define BGDBLUEWATERFALL_GET_100(thisx) (((thisx)->params >> 8) & 1)
|
||||
|
||||
typedef struct BgDblueWaterfall {
|
||||
/* 0x0000 */ Actor actor;
|
||||
/* 0x0144 */ char unk_144[0x50];
|
||||
/* 0x0144 */ ColliderCylinder collider;
|
||||
/* 0x0190 */ AnimatedMaterial* unk_190;
|
||||
/* 0x0194 */ BgDblueWaterfallActionFunc actionFunc;
|
||||
/* 0x0198 */ char unk_198[0x14];
|
||||
/* 0x0198 */ f32 unk_198;
|
||||
/* 0x019C */ s16 unk_19C;
|
||||
/* 0x019E */ u8 unk_19E;
|
||||
/* 0x019F */ u8 unk_19F;
|
||||
/* 0x01A0 */ u8 unk_1A0;
|
||||
/* 0x01A1 */ UNK_TYPE1 unk1A1[2];
|
||||
/* 0x01A3 */ s8 unk_1A3;
|
||||
/* 0x01A4 */ s16 unk_1A4;
|
||||
/* 0x01A6 */ UNK_TYPE1 unk1A6[1];
|
||||
/* 0x01A7 */ s8 unk_1A7;
|
||||
/* 0x01A8 */ f32 unk_1A8;
|
||||
} BgDblueWaterfall; // size = 0x1AC
|
||||
|
||||
extern const ActorInit Bg_Dblue_Waterfall_InitVars;
|
||||
|
||||
@@ -579,14 +579,6 @@ D_0600D250 = 0x0600D250;
|
||||
D_060002C8 = 0x060002C8;
|
||||
D_060005C4 = 0x060005C4;
|
||||
|
||||
// ovl_Bg_Dblue_Waterfall
|
||||
|
||||
D_06003250 = 0x06003250;
|
||||
D_06003358 = 0x06003358;
|
||||
D_06003770 = 0x06003770;
|
||||
D_0600B280 = 0x0600B280;
|
||||
D_0600B448 = 0x0600B448;
|
||||
|
||||
// ovl_Bg_Dkjail_Ivy
|
||||
|
||||
D_06000080 = 0x06000080;
|
||||
|
||||
Reference in New Issue
Block a user