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

En_Bigpamet (#910)

Browse Source 
* En_Bigpamet

* a

* PR

* a

* PR

* PR

* Update src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Maide
2022-08-07 19:33:51 -04:00
committed by GitHub
co-authored by Anghelo Carvajal Derek Hensley
parent d0313fa766
commit 5f9d4ca059
5 changed files with 769 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -2565,8 +2565,7 @@ beginseg
name "ovl_En_Bigpamet"
compress
include "build/src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.o"
include "build/data/ovl_En_Bigpamet/ovl_En_Bigpamet.data.o"
include "build/data/ovl_En_Bigpamet/ovl_En_Bigpamet.reloc.o"
include "build/src/overlays/actors/ovl_En_Bigpamet/ovl_En_Bigpamet_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.c
+737 -74
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Bigpamet/z_en_bigpamet.h
+27 -3
View File
@@ -2,18 +2,42 @@
#define Z_EN_BIGPAMET_H
#include "global.h"
#include "objects/object_tl/object_tl.h"
struct EnBigpamet;
typedef void (*EnBigpametActionFunc)(struct EnBigpamet*, PlayState*);
enum {
/* 0 */ ENBIGPAMET_0,
/* 1 */ ENBIGPAMET_1,
};
typedef struct {
/* 0x00 */ Vec3f unk_00;
/* 0x0C */ Vec3f unk_0C;
/* 0x18 */ Vec3s unk_18;
/* 0x20 */ f32 unk_20;
} EnBigpametStruct; // size = 0x24
typedef struct EnBigpamet {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x154];
/* 0x144 */ SkelAnime skelAnime2;
/* 0x188 */ Vec3s jointTable2[OBJECT_TL_2_LIMB_MAX];
/* 0x1D6 */ Vec3s morphTable2[OBJECT_TL_2_LIMB_MAX];
/* 0x224 */ SkelAnime skelAnime1;
/* 0x268 */ Vec3s jointTable1[OBJECT_TL_1_LIMB_MAX];
/* 0x280 */ Vec3s morphTable1[OBJECT_TL_1_LIMB_MAX];
/* 0x298 */ EnBigpametActionFunc actionFunc;
/* 0x29C */ char unk_29C[0x10];
/* 0x29C */ u8 unk_29C;
/* 0x29E */ s16 unk_29E;
/* 0x2A0 */ UNK_TYPE1 pad2A0[2];
/* 0x2A2 */ s16 unk_2A2;
/* 0x2A4 */ f32 unk_2A4;
/* 0x2A8 */ f32 unk_2A8;
/* 0x2AC */ f32 unk_2AC;
/* 0x2B0 */ char unk_2B0[0x31C];
/* 0x2B0 */ ColliderCylinder collider;
/* 0x2FC */ EnBigpametStruct unk_2FC[20];
} EnBigpamet; // size = 0x5CC
extern const ActorInit En_Bigpamet_InitVars;
tools/disasm/functions.txt
+4 -4
View File
@@ -10036,11 +10036,11 @@
0x80A29094:("func_80A29094",),
0x80A29150:("EnBigpamet_Update",),
0x80A292A8:("func_80A292A8",),
0x80A293E4:("func_80A293E4",),
0x80A29494:("func_80A29494",),
0x80A293E4:("EnBigpamet_OverrideLimbDraw2",),
0x80A29494:("EnBigpamet_PostLimbDraw2",),
0x80A294D8:("EnBigpamet_Draw",),
0x80A29580:("func_80A29580",),
0x80A29628:("func_80A29628",),
0x80A29580:("EnBigpamet_OverrideLimbDraw1",),
0x80A29628:("EnBigpamet_PostLimbDraw1",),
0x80A2966C:("func_80A2966C",),
0x80A29A80:("func_80A29A80",),
0x80A29C18:("BgDblueMovebg_Init",),
undefined_syms.txt
-12
View File
@@ -927,18 +927,6 @@ D_06001398 = 0x06001398;
D_06000074 = 0x06000074;
D_06001E60 = 0x06001E60;
// ovl_En_Bigpamet
D_06000440 = 0x06000440;
D_06000AF4 = 0x06000AF4;
D_06000B30 = 0x06000B30;
D_06001A50 = 0x06001A50;
D_06001C68 = 0x06001C68;
D_060031DC = 0x060031DC;
D_06004210 = 0x06004210;
D_06007C70 = 0x06007C70;
D_0600823C = 0x0600823C;
// ovl_En_Bombal
D_06000A00 = 0x06000A00;