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

Boss_04 (#529)

Browse Source 
* Boss_04

* What even is spelling anyway

* PR

* PR
This commit is contained in:
Maide
2022-01-04 06:02:29 +00:00
committed by GitHub
parent 4ca8658d77
commit 897e68fbae
6 changed files with 817 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -3
View File
@@ -2548,9 +2548,7 @@ beginseg
name "ovl_Boss_04"
compress
include "build/src/overlays/actors/ovl_Boss_04/z_boss_04.o"
include "build/data/ovl_Boss_04/ovl_Boss_04.data.o"
include "build/data/ovl_Boss_04/ovl_Boss_04.bss.o"
include "build/data/ovl_Boss_04/ovl_Boss_04.reloc.o"
include "build/src/overlays/actors/ovl_Boss_04/ovl_Boss_04_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Boss_04/z_boss_04.c
+749 -42
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Boss_04/z_boss_04.h
+63 -2
View File
@@ -9,9 +9,70 @@ typedef void (*Boss04ActionFunc)(struct Boss04*, GlobalContext*);
typedef struct Boss04 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xC0];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[9];
/* 0x01BE */ Vec3s morphtable[9];
/* 0x01F4 */ s16 unk_1F4;
/* 0x01F6 */ s8 unk_1F6;
/* 0x01F7 */ u8 unk_1F7;
/* 0x01F8 */ s16 unk_1F8;
/* 0x01FA */ s16 unk_1FA;
/* 0x01FC */ UNK_TYPE1 unk_1FC[2];
/* 0x01FE */ s16 unk_1FE;
/* 0x0200 */ s16 unk_200;
/* 0x0204 */ Boss04ActionFunc actionFunc;
/* 0x0208 */ char unk_208[0x544];
/* 0x0208 */ ColliderJntSph collider1;
/* 0x0228 */ ColliderJntSphElement collider1Elements[1];
/* 0x0268 */ ColliderJntSph collider2;
/* 0x0288 */ ColliderJntSphElement collider2Elements[1];
/* 0x02C8 */ s16 unk_2C8;
/* 0x02CC */ f32 unk_2CC;
/* 0x02D0 */ f32 unk_2D0;
/* 0x02D4 */ s16 unk_2D4;
/* 0x02D6 */ s16 unk_2D6;
/* 0x02D8 */ s16 unk_2D8;
/* 0x02DA */ s16 unk_2DA;
/* 0x02DC */ s16 unk_2DC;
/* 0x02DE */ s16 unk_2DE;
/* 0x02E0 */ s16 unk_2E0;
/* 0x02E2 */ s16 unk_2E2;
/* 0x02E4 */ Vec3f unk_2E4[16];
/* 0x02E4 */ Vec3f unk_3A4[15];
/* 0x02E4 */ Vec3f unk_458[15];
/* 0x02E4 */ Vec3f unk_50C[11];
/* 0x02E4 */ Vec3f unk_590[11];
/* 0x02E4 */ Vec3f unk_614[6];
/* 0x02E4 */ Vec3f unk_65C[6];
/* 0x02E4 */ Vec3f unk_6A4;
/* 0x02E4 */ Vec3f unk_6B0;
/* 0x06BC */ Vec3f unk_6BC;
/* 0x06C8 */ Vec3f unk_6C8;
/* 0x06D4 */ f32 unk_6D4;
/* 0x06D8 */ f32 unk_6D8;
/* 0x06DC */ f32 unk_6DC;
/* 0x06E0 */ f32 unk_6E0;
/* 0x06E4 */ f32 unk_6E4;
/* 0x06E8 */ f32 unk_6E8;
/* 0x06EC */ UNK_TYPE1 unk_6EC[4];
/* 0x06F0 */ f32 unk_6F0;
/* 0x06F4 */ s16 unk_6F4;
/* 0x06F6 */ s16 unk_6F6;
/* 0x06F8 */ f32 unk_6F8;
/* 0x06FC */ f32 unk_6FC;
/* 0x0700 */ f32 unk_700;
/* 0x0704 */ u32 unk_704;
/* 0x0708 */ s16 unk_708;
/* 0x070A */ s16 unk_70A;
/* 0x070C */ Vec3f unk_70C;
/* 0x0718 */ Vec3f unk_718;
/* 0x0724 */ UNK_TYPE1 unk_724[4];
/* 0x0728 */ f32 unk_728;
/* 0x072C */ UNK_TYPE1 unk_72C[0x10];
/* 0x073C */ f32 unk_73C;
/* 0x0740 */ UNK_TYPE1 unk_740[4];
/* 0x0744 */ f32 unk_744;
/* 0x0748 */ s16 unk_748;
/* 0x074A */ u8 unk_74A;
} Boss04; // size = 0x74C
extern const ActorInit Boss_04_InitVars;
src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
+2 -2
View File
@@ -538,7 +538,7 @@ void EnClearTag_UpdateCamera(EnClearTag* this, GlobalContext* globalCtx) {
func_80169590(globalCtx, 0, 1);
func_80169590(globalCtx, this->camId, 7);
func_800B7298(globalCtx, &this->actor, 4);
camera = Play_GetCamera(globalCtx, 0);
camera = Play_GetCamera(globalCtx, MAIN_CAM);
this->eye.x = camera->eye.x;
this->eye.y = camera->eye.y;
this->eye.z = camera->eye.z;
@@ -557,7 +557,7 @@ void EnClearTag_UpdateCamera(EnClearTag* this, GlobalContext* globalCtx) {
player->actor.speedXZ = 0.0f;
if (func_80152498(&globalCtx->msgCtx) == 0) {
camera = Play_GetCamera(globalCtx, 0);
camera = Play_GetCamera(globalCtx, MAIN_CAM);
camera->eye = this->eye;
camera->eyeNext = this->eye;
camera->at = this->at;
tools/disasm/functions.txt
+2 -2
View File
@@ -9375,8 +9375,8 @@
0x809ED45C:("func_809ED45C",),
0x809ED50C:("func_809ED50C",),
0x809ED8BC:("Boss04_Update",),
0x809EDCCC:("func_809EDCCC",),
0x809EDECC:("func_809EDECC",),
0x809EDCCC:("Boss04_OverrideLimbDraw",),
0x809EDECC:("Boss04_PostLimbDraw",),
0x809EDF58:("Boss04_Draw",),
0x809EE4E0:("func_809EE4E0",),
0x809EE668:("func_809EE668",),
undefined_syms.txt
-7
View File
@@ -1087,13 +1087,6 @@ D_06009C14 = 0x06009C14;
D_06009CF8 = 0x06009CF8;
D_0600A6C8 = 0x0600A6C8;
// ovl_Boss_04
D_0600004C = 0x0600004C;
D_06004510 = 0x06004510;
D_06004550 = 0x06004550;
D_060045E8 = 0x060045E8;
// ovl_Boss_05
D_060006A4 = 0x060006A4;