izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bg_Dblue_Movebg (#568)

Browse Source 
* Bg_Dblue_Movebg

* UNK_TYPE1

* PR

* Match Draw (thanks Anon58)

* Match

* data

* PR
This commit is contained in:
Maide
2022-02-13 23:24:26 +00:00
committed by GitHub
parent 5fa02d9725
commit 66b309218c
14 changed files with 878 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+2 -2
View File
@@ -3669,8 +3669,8 @@ void func_8019F88C(Vec3f* arg0, u16 sfxId, UNK_TYPE arg2);
// void func_8019F900(void);
// void func_8019FA18(void);
void func_8019FAD8(Vec3f* param_1, u16 sfxId, f32 param_3);
// void func_8019FB0C(void);
// void func_8019FC20(void);
void func_8019FB0C(Vec3f* arg0, u16 sfxId, f32 arg2, s32 arg3);
void func_8019FC20(Vec3f* pos, u16 sfxId);
// void func_8019FCB8(void);
// void func_8019FD90(void);
void func_8019FDC8(UNK_PTR arg0, u16 sfxId, UNK_TYPE arg2);
spec
+1 -3
View File
@@ -2706,9 +2706,7 @@ beginseg
name "ovl_Bg_Dblue_Movebg"
compress
include "build/src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.o"
include "build/data/ovl_Bg_Dblue_Movebg/ovl_Bg_Dblue_Movebg.data.o"
include "build/data/ovl_Bg_Dblue_Movebg/ovl_Bg_Dblue_Movebg.bss.o"
include "build/data/ovl_Bg_Dblue_Movebg/ovl_Bg_Dblue_Movebg.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Dblue_Movebg/ovl_Bg_Dblue_Movebg_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.c
+820 -25
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Bg_Dblue_Movebg/z_bg_dblue_movebg.h
+43 -4
View File
@@ -7,11 +7,50 @@ struct BgDblueMovebg;
typedef void (*BgDblueMovebgActionFunc)(struct BgDblueMovebg*, GlobalContext*);
#define BGDBLUEMOVEBG_GET_F(thisx) ((thisx)->params & 0xF)
#define BGDBLUEMOVEBG_GET_FF0(thisx) (((thisx)->params >> 4) & 0xFF)
#define BGDBLUEMOVEBG_GET_F000(thisx) (((thisx)->params >> 0xC) & 0xF)
typedef struct BgDblueMovebg {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18];
/* 0x015C */ BgDblueMovebgActionFunc actionFunc;
/* 0x0160 */ char unk_160[0x210];
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ BgDblueMovebgActionFunc actionFunc;
/* 0x160 */ s32 unk_160;
/* 0x164 */ Gfx* unk_164;
/* 0x168 */ Gfx* unk_168;
/* 0x16C */ TexturePtr unk_16C;
/* 0x170 */ s8 unk_170;
/* 0x171 */ s8 unk_171;
/* 0x172 */ u16 unk_172;
/* 0x174 */ u16 unk_174;
/* 0x178 */ s32 unk_178;
/* 0x17C */ UNK_TYPE1 unk17C[2];
/* 0x17E */ s16 unk_17E;
/* 0x180 */ s16 unk_180;
/* 0x184 */ f32 unk_184;
/* 0x188 */ s16 unk_188;
/* 0x18A */ s16 unk_18A;
/* 0x18C */ s16 unk_18C;
/* 0x18E */ s16 unk_18E;
/* 0x190 */ Vec3f unk_190;
/* 0x19C */ Vec3f unk_19C;
/* 0x1A8 */ Vec3f unk_1A8;
/* 0x1B4 */ UNK_TYPE1 unk1B4[2];
/* 0x1B6 */ s16 unk_1B6[2];
/* 0x1BC */ s32 unk_1BC;
/* 0x1C0 */ s32 unk_1C0;
/* 0x1C4 */ s32 unk_1C4;
/* 0x1C8 */ s32 unk_1C8;
/* 0x1CC */ s16 unk_1CC;
/* 0x1CE */ s16 unk_1CE;
/* 0x1D0 */ s16 unk_1D0;
/* 0x1D2 */ s16 unk_1D2;
/* 0x1D4 */ f32 unk_1D4;
/* 0x1D8 */ s16 unk_1D8[2][8];
/* 0x1F8 */ f32 unk_1F8[2][8];
/* 0x238 */ Vec3f unk_238[2][8];
/* 0x2F8 */ Actor* unk_2F8[2];
/* 0x300 */ u8 unk_300[2][8];
/* 0x310 */ UNK_TYPE1 unk310[0x60];
} BgDblueMovebg; // size = 0x370
extern const ActorInit Bg_Dblue_Movebg_InitVars;
src/overlays/actors/ovl_Boss_02/z_boss_02.c
+1 -1
View File
@@ -1621,7 +1621,7 @@ void func_809DD2F8(GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, effect->unk_26 + (i * 3),
(effect->unk_26 + (i * 3)) * 5, 32, 64, 1, 0, 0, 32, 32));
Matrix_InsertTranslation(effect->unk_00.x, effect->unk_00.y, effect->unk_00.z, 0);
Matrix_InsertTranslation(effect->unk_00.x, effect->unk_00.y, effect->unk_00.z, MTXMODE_NEW);
Matrix_NormalizeXYZ(&globalCtx->billboardMtxF);
Matrix_Scale(effect->unk_34 * D_809DF5B0, effect->unk_34 * D_809DF5B0, 1.0f, MTXMODE_APPLY);
src/overlays/actors/ovl_En_Bigslime/z_en_bigslime.c
+1 -1
View File
@@ -2946,7 +2946,7 @@ void EnBigslime_DrawMinislime(EnBigslime* this, GlobalContext* globalCtx2) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, &gMinislimeNormalDL);
if (minislime->frozenAlpha > 0) {
Matrix_InsertTranslation(0.0f, (0.1f - minislime->frozenScale) * -4000.0f, 0.0f, 1);
Matrix_InsertTranslation(0.0f, (0.1f - minislime->frozenScale) * -4000.0f, 0.0f, MTXMODE_APPLY);
Matrix_Scale(0.1f, minislime->frozenScale, 0.1f, MTXMODE_APPLY);
AnimatedMat_Draw(globalCtx, this->minislimeFrozenTexAnim);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, minislime->frozenAlpha);
src/overlays/actors/ovl_En_Fz/z_en_fz.c
+2 -2
View File
@@ -619,7 +619,7 @@ void func_809334B8(EnFz* this, GlobalContext* globalCtx) {
sp58.y = this->actor.world.pos.y + 20.0f;
sp58.z = this->actor.world.pos.z;
Matrix_RotateY(this->actor.shape.rot.y, 0);
Matrix_RotateY(this->actor.shape.rot.y, MTXMODE_NEW);
sp64.x = 0.0f;
sp64.y = -2.0f;
@@ -736,7 +736,7 @@ void func_809338E0(EnFz* this, GlobalContext* globalCtx) {
sp58.y = this->actor.world.pos.y + 20.0f;
sp58.z = this->actor.world.pos.z;
Matrix_RotateY(this->actor.shape.rot.y, 0);
Matrix_RotateY(this->actor.shape.rot.y, MTXMODE_NEW);
sp64.x = 0.0f;
sp64.y = -2.0f;
src/overlays/actors/ovl_En_Gm/z_en_gm.c
+1 -1
View File
@@ -786,7 +786,7 @@ void func_8094F3D0(EnGm* this, GlobalContext* globalCtx) {
this->unk_3AC = 0.0f;
}
Math_SmoothStepToF(&this->unk_3B0, this->unk_3AC, 0.8f, 40.0f, 10.0f);
Matrix_InsertTranslation(this->unk_3B0, 0.0f, 0.0f, 1);
Matrix_InsertTranslation(this->unk_3B0, 0.0f, 0.0f, MTXMODE_APPLY);
this->unk_3F0 = sp28;
}
src/overlays/actors/ovl_En_Goroiwa/z_en_goroiwa.c
+1 -1
View File
@@ -1358,7 +1358,7 @@ void func_8094220C(EnGoroiwa* this, GlobalContext* globalCtx) {
ptr->unk_18 = BgCheck_EntityRaycastFloor5(&globalCtx->colCtx, &ptr->unk_28, &spD0, &this->actor, &spC4);
if (ptr->unk_10 <= 0.0f) {
Matrix_InsertRotation(ptr->unk_1C, ptr->unk_1E, ptr->unk_20, 0);
Matrix_InsertRotation(ptr->unk_1C, ptr->unk_1E, ptr->unk_20, MTXMODE_NEW);
Matrix_MultiplyVector3fByState(&D_80942E6C, &spB8);
temp_f20 = this->unk_1DC * 0.9f;
src/overlays/actors/ovl_En_Ot/z_en_ot.c
+2 -2
View File
@@ -437,7 +437,7 @@ void func_80B5C3D8(EnOt* this, GlobalContext* globalCtx) {
Vec3f sp38;
this->unk_3A0 += 0x2D8;
Matrix_RotateY(this->unk_3A0, 0);
Matrix_RotateY(this->unk_3A0, MTXMODE_NEW);
Matrix_GetStateTranslationAndScaledZ(26.259998f, &sp5C);
Matrix_GetStateTranslationAndScaledZ(-26.259998f, &sp50);
this->unk_348.x = this->unk_394.x + sp5C.x;
@@ -461,7 +461,7 @@ void func_80B5C3D8(EnOt* this, GlobalContext* globalCtx) {
}
if (Animation_OnFrame(&this->skelAnime, 12.0f)) {
Matrix_RotateY(func_800DFCDC(GET_ACTIVE_CAM(globalCtx)), 0);
Matrix_RotateY(func_800DFCDC(GET_ACTIVE_CAM(globalCtx)), MTXMODE_NEW);
sp38.x = 1.0f;
sp38.y = 8.1f;
sp38.z = 0.0f;
src/overlays/actors/ovl_En_Pametfrog/z_en_pametfrog.c
+1 -1
View File
@@ -683,7 +683,7 @@ void EnPametfrog_WallPause(EnPametfrog* this, GlobalContext* globalCtx) {
} else {
SkelAnime_Update(&this->skelAnime);
this->timer--;
Matrix_InsertRotationAroundUnitVector_f(this->wallRotation, &this->unk_2DC, 0);
Matrix_InsertRotationAroundUnitVector_f(this->wallRotation, &this->unk_2DC, MTXMODE_NEW);
Matrix_MultiplyVector3fByState(&this->unk_2D0, &vec);
Math_Vec3f_Copy(&this->unk_2D0, &vec);
Math3D_CrossProduct(&this->unk_2DC, &this->unk_2D0, &this->unk_2E8);
src/overlays/actors/ovl_En_Sw/z_en_sw.c
+1 -1
View File
@@ -275,7 +275,7 @@ void func_808D90F0(EnSw* this, s32 arg1, s16 arg2) {
temp = arg2;
}
Matrix_InsertRotationAroundUnitVector_f(BINANG_TO_RAD(temp), &this->unk_368, 0);
Matrix_InsertRotationAroundUnitVector_f(BINANG_TO_RAD(temp), &this->unk_368, MTXMODE_NEW);
Matrix_MultiplyVector3fByState(&this->unk_350, &sp2C);
Math_Vec3f_Copy(&this->unk_350, &sp2C);
Math3D_CrossProduct(&this->unk_368, &this->unk_350, &this->unk_35C);
src/overlays/actors/ovl_Obj_Hunsui/z_obj_hunsui.h
+2
View File
@@ -7,6 +7,8 @@ struct ObjHunsui;
typedef void (*ObjHunsuiActionFunc)(struct ObjHunsui*, GlobalContext*);
#define OBJHUNSUI_GET_F000(thisx) (((thisx)->params >> 0xC) & 0xF)
typedef struct ObjHunsui {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18];
undefined_syms.txt
-9
View File
@@ -603,15 +603,6 @@ D_0600D250 = 0x0600D250;
D_060002C8 = 0x060002C8;
D_060005C4 = 0x060005C4;
// ovl_Bg_Dblue_Movebg
D_06004848 = 0x06004848;
D_060052B8 = 0x060052B8;
D_06008778 = 0x06008778;
D_0600A528 = 0x0600A528;
D_0600CD10 = 0x0600CD10;
D_0600CE00 = 0x0600CE00;
// ovl_Bg_Dblue_Waterfall
D_06003250 = 0x06003250;