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_Syateki_Wf (Shooting Gallery Wolfos) OK (#673)

Browse Source 
* EnSyatekiWf_Init and EnSyatekiWf_Destroy OK

* func_80A201CC OK

* func_80A20284 OK

* func_80A2030C and func_80A20320 OK

* func_80A20378 OK

* func_80A200E0 OK

* func_80A203DC OK

* func_80A20670 OK

* func_80A206DC and func_80A20710 OK

* func_80A2075C OK

* func_80A2079C and func_80A20800 OK

* func_80A208F8 OK

* Import data to C

* func_80A20858 OK

* EnSyatekiWf_Update OK

* Draw functions OK

* Use generated reloc

* Delete struct padding

* Use object symbols

* Name the statics

* ANIMMODE enum

* Misc cleanup

* Format

* Respond to review

* Change do-while loops to just be while loops

* Decimal counter
This commit is contained in:
Tom Overton
2022-02-19 21:26:04 +00:00
committed by GitHub
parent debcfa3d72
commit 8e3d28b536
6 changed files with 439 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -1
View File
@@ -595,7 +595,7 @@ void EffectSsEnIce_Spawn(GlobalContext* globalCtx, Vec3f* pos, f32 scale, Vec3f*
// void EffectSsFireTail_SpawnFlameOnPlayer(void);
void EffectSsEnFire_SpawnVec3f(GlobalContext* globalCtx, Actor* actor, Vec3f* pos, s16 scale, s16 arg4, s16 flags, s16 bodyPart);
// void EffectSsEnFire_SpawnVec3s(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE2 param_5, UNK_TYPE2 param_6, UNK_TYPE2 param_7);
// void EffectSsExtra_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE2 param_5, UNK_TYPE2 param_6);
void EffectSsExtra_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scoreIdx);
void EffectSsDeadDb_Spawn(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, Color_RGBA8* prim, Color_RGBA8* env, s16 scale, s16 scaleStep, s32 unk);
void func_800B3030(GlobalContext* globalCtx, Vec3f* pos, Vec3f* velocity, Vec3f* accel, s16 scale, s16 scaleStep, s32 colorIndex);
// void EffectSsDeadDd_Spawn(UNK_TYPE4 uParm1, Vec3f* pzParm2, Vec3f* pzParm3, Vec3f* pzParm4, UNK_TYPE1* param_5, UNK_TYPE1* param_6, UNK_TYPE2 param_7, UNK_TYPE2 param_8, UNK_TYPE2 param_9, UNK_TYPE4 param_10);
spec
+1 -2
View File
@@ -2659,8 +2659,7 @@ beginseg
name "ovl_En_Syateki_Wf"
compress
include "build/src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.o"
include "build/data/ovl_En_Syateki_Wf/ovl_En_Syateki_Wf.data.o"
include "build/data/ovl_En_Syateki_Wf/ovl_En_Syateki_Wf.reloc.o"
include "build/src/overlays/actors/ovl_En_Syateki_Wf/ovl_En_Syateki_Wf_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.c
+412 -50
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Syateki_Wf/z_en_syateki_wf.h
+23 -4
View File
@@ -3,15 +3,34 @@
#include "global.h"
#define EN_SYATEKI_WF_GET_PARAM_F0(thisx) (((thisx)->params & 0xF0) >> 4)
#define EN_SYATEKI_WF_GET_PARAM_FF00(thisx) (((thisx)->params & 0xFF00) >> 8)
struct EnSyatekiWf;
typedef void (*EnSyatekiWfActionFunc)(struct EnSyatekiWf*, GlobalContext*);
typedef struct EnSyatekiWf {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x150];
/* 0x0294 */ EnSyatekiWfActionFunc actionFunc;
/* 0x0298 */ char unk_298[0x134];
/* 0x000 */ Actor actor;
/* 0x144 */ SkelAnime skelAnime;
/* 0x188 */ Vec3s jointTable[22];
/* 0x20C */ Vec3s morphTable[22];
/* 0x290 */ UNK_TYPE1 unk_290[0x4];
/* 0x294 */ EnSyatekiWfActionFunc actionFunc;
/* 0x298 */ s16 unk_298;
/* 0x29A */ s16 unk_29A;
/* 0x29C */ s16 unk_29C;
/* 0x2A0 */ Vec3s* unk_2A0;
/* 0x2A4 */ s16 unk_2A4;
/* 0x2A6 */ s16 unk_2A6;
/* 0x2A8 */ s16 unk_2A8;
/* 0x2AC */ f32 unk_2AC;
/* 0x2B0 */ u8 eyeIndex;
/* 0x2B4 */ ColliderCylinder unk_2B4;
/* 0x300 */ ColliderCylinder unk_300;
/* 0x34C */ ColliderJntSph unk_34C;
/* 0x36C */ ColliderJntSphElement unk_36C;
/* 0x3AC */ UNK_TYPE1 unk_3AC[0x20];
} EnSyatekiWf; // size = 0x3CC
extern const ActorInit En_Syateki_Wf_InitVars;
tools/disasm/functions.txt
+2 -2
View File
@@ -9892,8 +9892,8 @@
0x80A20858:("func_80A20858",),
0x80A208F8:("func_80A208F8",),
0x80A20A50:("EnSyatekiWf_Update",),
0x80A20CF4:("func_80A20CF4",),
0x80A20D10:("func_80A20D10",),
0x80A20CF4:("EnSyatekiWf_OverrideLimbDraw",),
0x80A20D10:("EnSyatekiWf_PostLimbDraw",),
0x80A20DA4:("EnSyatekiWf_Draw",),
0x80A21150:("func_80A21150",),
0x80A211F4:("func_80A211F4",),
undefined_syms.txt
-5
View File
@@ -1841,11 +1841,6 @@ D_06003180 = 0x06003180;
D_060033D0 = 0x060033D0;
D_0600466C = 0x0600466C;
// ovl_En_Syateki_Wf
D_060095D0 = 0x060095D0;
D_0600A3CC = 0x0600A3CC;
// ovl_En_S_Goro
D_060091A8 = 0x060091A8;