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_Bom_Bowl_Man (#616)

Browse Source 
* En_Bom_Bowl_Man

* sAnimations

* Fixup data

* PR
This commit is contained in:
Maide
2022-02-19 20:45:21 +00:00
committed by GitHub
parent c91423abae
commit e2d546c8f0
7 changed files with 681 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/xml/overlays/ovl_En_Bom_Bowl_Man.xml
+6
View File
@@ -0,0 +1,6 @@
<Root>
<File Name="ovl_En_Bom_Bowl_Man" BaseAddress="0x809C4790" RangeStart="0x1A50" RangeEnd="0x1A70">
<DList Name="gEnBomBowlMan_D_809C61E0" Offset="0x1A50"/>
<DList Name="gEnBomBowlMan_D_809C61F0" Offset="0x1A60"/>
</File>
</Root>
include/z64item.h
+1
View File
@@ -299,6 +299,7 @@ typedef enum {
/* 0x3C */ GI_KEY_SMALL = 0x3C,
/* 0x3E */ GI_MAP = 0x3E,
/* 0x3F */ GI_COMPASS,
/* 0x50 */ GI_50 = 0x50,
/* 0x52 */ GI_SCALE_GOLD = 0x52, // Assumed, used in En_Fishing
/* 0x59 */ GI_BOTTLE_POTION_RED = 0x59,
/* 0x5B */ GI_POTION_RED = 0x5B,
spec
+1 -2
View File
@@ -2435,8 +2435,7 @@ beginseg
name "ovl_En_Bom_Bowl_Man"
compress
include "build/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.o"
include "build/data/ovl_En_Bom_Bowl_Man/ovl_En_Bom_Bowl_Man.data.o"
include "build/data/ovl_En_Bom_Bowl_Man/ovl_En_Bom_Bowl_Man.reloc.o"
include "build/src/overlays/actors/ovl_En_Bom_Bowl_Man/ovl_En_Bom_Bowl_Man_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
+627 -29
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.h
+45 -2
View File
@@ -7,11 +7,54 @@ struct EnBomBowlMan;
typedef void (*EnBomBowlManActionFunc)(struct EnBomBowlMan*, GlobalContext*);
#define ENBOMBOWLMAN_GET_F(thisx) ((thisx)->params & 0xF)
#define ENBOMBOWLMAN_GET_F0(thisx) (((thisx)->params >> 4) & 0xF)
#define ENBOMBOWLMAN_GET_FF00(thisx) (((thisx)->params >> 8) & 0xFF)
#define ENBOMBOWLMAN_F0_0 0
#define ENBOMBOWLMAN_F0_2 2
#define ENBOMBOWLMAN_FF00_MINUS1 -1
typedef struct EnBomBowlMan {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x140];
/* 0x0144 */ SkelAnime skelAnime;
/* 0x0188 */ Vec3s jointTable[21];
/* 0x0206 */ Vec3s morphTable[21];
/* 0x0284 */ EnBomBowlManActionFunc actionFunc;
/* 0x0288 */ char unk_288[0x74];
/* 0x0288 */ s16 unk_288;
/* 0x028A */ s16 unk_28A;
/* 0x028C */ UNK_TYPE1 unk28C[2];
/* 0x028E */ s16 unk_28E;
/* 0x0290 */ s16 unk_290;
/* 0x0292 */ UNK_TYPE1 unk292[2];
/* 0x0294 */ Path* path;
/* 0x0298 */ s16 unk_298;
/* 0x029A */ s16 unk_29A;
/* 0x029C */ s16 unk_29C;
/* 0x029E */ s16 unk_29E;
/* 0x02A0 */ Vec3f unk_2A0;
/* 0x02AC */ UNK_TYPE1 unk2AC[0xC];
/* 0x02B8 */ s16 unk_2B8;
/* 0x02BA */ s16 unk_2BA;
/* 0x02BC */ s16 unk_2BC;
/* 0x02BE */ UNK_TYPE1 unk2BE[2];
/* 0x02C0 */ s16 unk_2C0;
/* 0x02C2 */ s16 unk_2C2;
/* 0x02C4 */ f32 unk_2C4;
/* 0x02C8 */ f32 unk_2C8;
/* 0x02CC */ UNK_TYPE1 unk2CC[4];
/* 0x02D0 */ s16 unk_2D0;
/* 0x02D2 */ s16 unk_2D2;
/* 0x02D4 */ s16 unk_2D4;
/* 0x02D6 */ s16 unk_2D6;
/* 0x02D8 */ struct EnBomBowlMan* unk_2D8[5];
/* 0x02EC */ UNK_TYPE1 unk2EC[0x4];
/* 0x02F0 */ s16 unk_2F0;
/* 0x02F2 */ s16 unk_2F2;
/* 0x02F4 */ s16 unk_2F4;
/* 0x02F6 */ s16 unk_2F6;
/* 0x02F8 */ s32 unk_2F8;
} EnBomBowlMan; // size = 0x2FC
extern const ActorInit En_Bom_Bowl_Man_InitVars;
tools/disasm/functions.txt
+1 -1
View File
@@ -9078,7 +9078,7 @@
0x809C5BA0:("func_809C5BA0",),
0x809C5BF4:("func_809C5BF4",),
0x809C5E14:("EnBomBowlMan_Update",),
0x809C5F44:("func_809C5F44",),
0x809C5F44:("EnBomBowlMan_OverrideLimbDraw",),
0x809C5FC4:("EnBomBowlMan_Draw",),
0x809C64C0:("func_809C64C0",),
0x809C6578:("EnSyatekiMan_Init",),
undefined_syms.txt
-5
View File
@@ -1210,11 +1210,6 @@ D_06000530 = 0x06000530;
D_060064B8 = 0x060064B8;
D_0600F82C = 0x0600F82C;
// ovl_En_Bom_Bowl_Man
D_060064B8 = 0x060064B8;
D_0600F82C = 0x0600F82C;
// ovl_En_Box
D_0600043C = 0x0600043C;