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

Obj_Bombiwa (#637)

Browse Source 
* Obj_Bombiwa

* PR
This commit is contained in:
Maide
2022-02-28 02:11:06 +00:00
committed by GitHub
parent 684df37ebc
commit 484263dedc
4 changed files with 489 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -1498,8 +1498,7 @@ beginseg
name "ovl_Obj_Bombiwa"
compress
include "build/src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.o"
include "build/data/ovl_Obj_Bombiwa/ovl_Obj_Bombiwa.data.o"
include "build/data/ovl_Obj_Bombiwa/ovl_Obj_Bombiwa.reloc.o"
include "build/src/overlays/actors/ovl_Obj_Bombiwa/ovl_Obj_Bombiwa_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
+468 -37
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.h
+20 -1
View File
@@ -7,9 +7,28 @@ struct ObjBombiwa;
typedef void (*ObjBombiwaActionFunc)(struct ObjBombiwa*, GlobalContext*);
#define OBJBOMBIWA_GET_7F(thisx) ((thisx)->params & 0x7F)
#define OBJBOMBIWA_GET_100(thisx) (((thisx)->params >> 8) & 1)
#define OBJBOMBIWA_GET_8000(thisx) (((thisx)->params >> 0xF) & 1)
#define OBJBOMBIWA_100_0 0
typedef struct {
/* 0x00 */ f32 unk_00;
/* 0x04 */ Vec3f unk_04;
/* 0x10 */ f32 unk_10;
/* 0x14 */ Vec3s unk_14;
/* 0x1A */ s16 unk_1A;
} ObjBombiwaStruct; // size = 0x1C
typedef struct ObjBombiwa {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xC0];
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ ObjBombiwaStruct unk_190[4];
/* 0x0200 */ s8 unk_200;
/* 0x0201 */ s8 unk_201;
/* 0x0202 */ s8 unk_202;
/* 0x0203 */ u8 unk_203;
/* 0x0204 */ ObjBombiwaActionFunc actionFunc;
} ObjBombiwa; // size = 0x208
undefined_syms.txt
-8
View File
@@ -2003,14 +2003,6 @@ D_060014F0 = 0x060014F0;
D_06007630 = 0x06007630;
D_06009A88 = 0x06009A88;
// ovl_Obj_Bombiwa
D_060009E0 = 0x060009E0;
D_06000AF0 = 0x06000AF0;
D_06004560 = 0x06004560;
D_06004688 = 0x06004688;
D_06005990 = 0x06005990;
// ovl_Obj_Chan
D_06000A10 = 0x06000A10;