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_Flowerpot (#539)

Browse Source 
* Obj_Flowerpot

* PR
This commit is contained in:
Maide
2022-01-04 06:37:52 +00:00
committed by GitHub
parent d90a15ba6e
commit af52799bc7
4 changed files with 632 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -3
View File
@@ -2644,9 +2644,7 @@ beginseg
name "ovl_Obj_Flowerpot"
compress
include "build/src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.o"
include "build/data/ovl_Obj_Flowerpot/ovl_Obj_Flowerpot.data.o"
include "build/data/ovl_Obj_Flowerpot/ovl_Obj_Flowerpot.bss.o"
include "build/data/ovl_Obj_Flowerpot/ovl_Obj_Flowerpot.reloc.o"
include "build/src/overlays/actors/ovl_Obj_Flowerpot/ovl_Obj_Flowerpot_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.c
+622 -47
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_Obj_Flowerpot/z_obj_flowerpot.h
+9 -2
View File
@@ -7,11 +7,18 @@ struct ObjFlowerpot;
typedef void (*ObjFlowerpotActionFunc)(struct ObjFlowerpot*, GlobalContext*);
#define ENOBJFLOWERPOT_GET_3F(thisx) ((thisx)->params & 0x3F)
#define ENOBJFLOWERPOT_GET_7F00(thisx) (((thisx)->params >> 8) & 0x7F)
typedef struct ObjFlowerpot {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xA0];
/* 0x0144 */ ColliderJntSph collider;
/* 0x0164 */ ColliderJntSphElement colliderElements[2];
/* 0x01E4 */ ObjFlowerpotActionFunc actionFunc;
/* 0x01E8 */ char unk_1E8[0x8];
/* 0x01E8 */ s16 unk_1E8;
/* 0x01EA */ u8 unk_1EA;
/* 0x01EB */ s8 unk_1EB;
/* 0x01EC */ s8 unk_1EC;
} ObjFlowerpot; // size = 0x1F0
extern const ActorInit Obj_Flowerpot_InitVars;
undefined_syms.txt
-7
View File
@@ -3904,13 +3904,6 @@ D_06003440 = 0x06003440;
D_06000158 = 0x06000158;
D_06001C00 = 0x06001C00;
// ovl_Obj_Flowerpot
D_060012E0 = 0x060012E0;
D_06001408 = 0x06001408;
D_060014F0 = 0x060014F0;
D_060015B0 = 0x060015B0;
// ovl_Obj_Funen
D_060000D0 = 0x060000D0;