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_Snowball2 (#596)

Browse Source 
* Obj_Snowball2

* Merge

* merge

* PR
This commit is contained in:
Maide
2022-02-19 19:41:46 +00:00
committed by GitHub
parent 5d3ddfac00
commit 271cf4de70
4 changed files with 574 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -4054,8 +4054,7 @@ beginseg
name "ovl_Obj_Snowball2"
compress
include "build/src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.o"
include "build/data/ovl_Obj_Snowball2/ovl_Obj_Snowball2.data.o"
include "build/data/ovl_Obj_Snowball2/ovl_Obj_Snowball2.reloc.o"
include "build/src/overlays/actors/ovl_Obj_Snowball2/ovl_Obj_Snowball2_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.c
+561 -46
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Obj_Snowball2/z_obj_snowball2.h
+12 -2
View File
@@ -7,11 +7,21 @@ struct ObjSnowball2;
typedef void (*ObjSnowball2ActionFunc)(struct ObjSnowball2*, GlobalContext*);
#define ENOBJSNOWBALL2_GET_3F(thisx) ((thisx)->params & 0x3F)
#define ENOBJSNOWBALL2_GET_7F00(thisx) (((thisx)->params >> 8) & 0x7F)
typedef struct ObjSnowball2 {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x60];
/* 0x0144 */ ColliderJntSph collider;
/* 0x0164 */ ColliderJntSphElement colliderElements[1];
/* 0x01A4 */ ObjSnowball2ActionFunc actionFunc;
/* 0x01A8 */ char unk_1A8[0xC];
/* 0x01A8 */ s16 unk_1A8;
/* 0x01AA */ s16 unk_1AA;
/* 0x01AC */ s8 unk_1AC;
/* 0x01AD */ u8 unk_1AD;
/* 0x01AE */ s8 unk_1AE;
/* 0x01AF */ s8 unk_1AF;
/* 0x01B0 */ UNK_TYPE1 unk1B0[4];
} ObjSnowball2; // size = 0x1B4
extern const ActorInit Obj_Snowball2_InitVars;
undefined_syms.txt
-4
View File
@@ -2183,10 +2183,6 @@ D_060011E0 = 0x060011E0;
D_06001C00 = 0x06001C00;
// ovl_Obj_Snowball2
D_06008B90 = 0x06008B90;
// ovl_Obj_Spinyroll
D_06000460 = 0x06000460;