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_Ishi (#538)

Browse Source 
* En_Ishi

* PR

* PR

* Merge
This commit is contained in:
Maide
2022-01-04 06:51:21 +00:00
committed by GitHub
parent f48e1f8de8
commit 92302fa6d6
5 changed files with 700 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/variables.h
+3 -3
View File
@@ -4003,9 +4003,9 @@ extern UNK_TYPE D_04091CE0;
extern Gfx D_05000C40[];
extern UNK_TYPE D_05001D20;
extern UNK_TYPE D_050061E8;
extern UNK_TYPE D_05006420;
extern UNK_TYPE D_050066B0;
extern Gfx D_050061E8[];
extern Gfx D_05006420[];
extern Gfx D_050066B0[];
extern UNK_TYPE D_05007498;
extern Gfx D_05007890[];
extern Gfx D_050078A0[];
spec
+1 -2
View File
@@ -1674,8 +1674,7 @@ beginseg
name "ovl_En_Ishi"
compress
include "build/src/overlays/actors/ovl_En_Ishi/z_en_ishi.o"
include "build/data/ovl_En_Ishi/ovl_En_Ishi.data.o"
include "build/data/ovl_En_Ishi/ovl_En_Ishi.reloc.o"
include "build/src/overlays/actors/ovl_En_Ishi/ovl_En_Ishi_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+680 -67
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Ishi/z_en_ishi.h
+16 -2
View File
@@ -6,12 +6,26 @@
struct EnIshi;
typedef void (*EnIshiActionFunc)(struct EnIshi*, GlobalContext*);
typedef void (*EnIshiUnkFunc)(struct EnIshi*, GlobalContext*);
typedef void (*EnIshiUnkFunc2)(Actor*, GlobalContext*);
#define ENISHI_GET_1(thisx) ((thisx)->params & 1)
#define ENISHI_GET_2(thisx) (((thisx)->params >> 1) & 1)
#define ENISHI_GET_4(thisx) (((thisx)->params >> 2) & 1)
#define ENISHI_GET_8(thisx) (((thisx)->params >> 3) & 1)
#define ENISHI_GET_70(thisx) (((thisx)->params >> 4) & 7)
#define ENISHI_GET_F0(thisx) (((thisx)->params >> 4) & 0xF)
#define ENISHI_GET_100(thisx) (((thisx)->params >> 8) & 1)
#define ENISHI_GET_FE00(thisx) (((thisx)->params >> 9) & 0x7F)
typedef struct EnIshi {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x4C];
/* 0x0144 */ ColliderCylinder collider;
/* 0x0190 */ EnIshiActionFunc actionFunc;
/* 0x0194 */ char unk_194[0x4];
/* 0x0194 */ s8 unk_194;
/* 0x0195 */ s8 unk_195;
/* 0x0196 */ s8 unk_196;
/* 0x0197 */ u8 unk_197;
} EnIshi; // size = 0x198
extern const ActorInit En_Ishi_InitVars;
undefined_syms.txt
-4
View File
@@ -2600,10 +2600,6 @@ D_06012FC8 = 0x06012FC8;
D_06013928 = 0x06013928;
D_06016588 = 0x06016588;
// ovl_En_Ishi
D_060009B0 = 0x060009B0;
// ovl_En_Ja
D_0600BA30 = 0x0600BA30;