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_Bombf (#677)

Browse Source 
* En_Bombf

* PR

* PR
This commit is contained in:
Maide
2022-03-24 22:48:19 -03:00
committed by GitHub
parent 0fbbde8d7d
commit 44db1ac61a
4 changed files with 455 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -988,8 +988,7 @@ beginseg
name "ovl_En_Bombf"
compress
include "build/src/overlays/actors/ovl_En_Bombf/z_en_bombf.o"
include "build/data/ovl_En_Bombf/ovl_En_Bombf.data.o"
include "build/data/ovl_En_Bombf/ovl_En_Bombf.reloc.o"
include "build/src/overlays/actors/ovl_En_Bombf/ovl_En_Bombf_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
+441 -30
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Bombf/z_en_bombf.h
+13 -3
View File
@@ -7,13 +7,23 @@ struct EnBombf;
typedef void (*EnBombfActionFunc)(struct EnBombf*, GlobalContext*);
#define ENBOMBF_GET(thisx) ((thisx)->params)
#define ENBOMBF_0 0
#define ENBOMBF_1 1
typedef struct EnBombf {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xAC];
/* 0x0144 */ ColliderCylinder colliderCylinder;
/* 0x0190 */ ColliderJntSph colliderJntSph;
/* 0x01B0 */ ColliderJntSphElement colliderJntSphElements[1];
/* 0x01F0 */ s16 timer;
/* 0x01F2 */ char unk_1F2[0x2];
/* 0x01F4 */ EnBombfActionFunc actionFunc;
/* 0x01F8 */ char unk_1F8[0x10];
/* 0x01F8 */ s32 unk_1F8;
/* 0x01FC */ u8 unk_1FC;
/* 0x01FE */ s16 unk_1FE;
/* 0x0200 */ f32 unk_200;
/* 0x0204 */ f32 unk_204;
} EnBombf; // size = 0x208
extern const ActorInit En_Bombf_InitVars;
undefined_syms.txt
-6
View File
@@ -1140,12 +1140,6 @@ D_0600F82C = 0x0600F82C;
D_060064B8 = 0x060064B8;
D_0600F82C = 0x0600F82C;
// ovl_En_Bombf
D_06000340 = 0x06000340;
D_06000408 = 0x06000408;
D_06000530 = 0x06000530;
// ovl_En_Bomjimb
D_060064B8 = 0x060064B8;