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

ovl_En_Ruppecrow OK with documentation (#502)

Browse Source 
* Implement EnRuppecrow_Init

* Implement EnRuppecrow_Destroy

* Implement EnRuppecrow_Update

* Implement EnRuppecrow_Draw

* Implement func_80BE2260, func_80BE2808

* Implement func_80BE30F4

* Implement func_80BE2F6C

* Implement func_80BE35A4

* Implement func_80BE2728

* Initial work on func_80BE2B80

* Implement func_80BE2B80

* Implement func_80BE2794

* Implement func_80BE3354

* Implement func_80BE348C

* Implement func_80BE2E18

* Implement func_80BE2D4C

* Run format script for cleanup

* Implement func_80BE2668

* Implement func_80BE3178

* Implement func_80BE32DC

* Initial work on func_80BE2874

* Implement func_80BE2874

* Implement func_80BE2330

* Implement func_80BE24CC

* Move static data into C file

* Rename D_WORDs to static names

* Format and document EnRuppecrow

* Update documentation

* Apply feedback

* Remove unecessary struct padding

* Implement review suggestions

* Run actorfixer

* Use object header
This commit is contained in:
Nick Sturgeon
2022-01-04 05:02:53 +00:00
committed by GitHub
parent de61e04312
commit 78cb55ce97
4 changed files with 602 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spec
+1 -2
View File
@@ -4919,8 +4919,7 @@ beginseg
name "ovl_En_Ruppecrow"
compress
include "build/src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.o"
include "build/data/ovl_En_Ruppecrow/ovl_En_Ruppecrow.data.o"
include "build/data/ovl_En_Ruppecrow/ovl_En_Ruppecrow.reloc.o"
include "build/src/overlays/actors/ovl_En_Ruppecrow/ovl_En_Ruppecrow_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.c
+574 -43
View File
File diff suppressed because it is too large Load Diff
src/overlays/actors/ovl_En_Ruppecrow/z_en_ruppecrow.h
+27 -4
View File
@@ -3,15 +3,38 @@
#include "global.h"
#define ENRUPPECROW_GET_PATH(thisx) (((thisx)->params & 0xFC00) >> 0xA)
#define ENRUPPECROW_RUPEE_COUNT 20
#define ENRUPPECROW_LIMB_COUNT 9
#define ENRUPPECROW_LIMB_POS_COUNT 4
struct EnRuppecrow;
typedef void (*EnRuppecrowActionFunc)(struct EnRuppecrow*, GlobalContext*);
typedef struct EnRuppecrow {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x94];
/* 0x01D8 */ EnRuppecrowActionFunc actionFunc;
/* 0x01DC */ char unk_1DC[0x128];
/* 0x000 */ Actor actor;
/* 0x144 */ EnItem00* rupees[ENRUPPECROW_RUPEE_COUNT];
/* 0x194 */ SkelAnime skelAnime;
/* 0x1D8 */ EnRuppecrowActionFunc actionFunc;
/* 0x1DC */ UNK_TYPE4 unk_1DC; // unused
/* 0x1E0 */ Vec3s joinTable[ENRUPPECROW_LIMB_COUNT];
/* 0x216 */ Vec3s morphTable[ENRUPPECROW_LIMB_COUNT];
/* 0x24C */ Path* path;
/* 0x250 */ s32 currentPoint;
/* 0x254 */ ColliderJntSph collider;
/* 0x274 */ ColliderJntSphElement colliderElement;
/* 0x2B4 */ u16 isGoingCounterClockwise;
/* 0x2B8 */ f32 speedModifier;
/* 0x2BC */ s16 rupeeIndex;
/* 0x2BE */ s16 yOffset;
/* 0x2C0 */ UNK_TYPE4 unk_2C0; // unused
/* 0x2C4 */ u8 currentEffect;
/* 0x2C8 */ f32 unk_2C8; // set but not used
/* 0x2CC */ f32 unk_2CC; // set but not used
/* 0x2D0 */ f32 iceSfxTimer;
/* 0x2D4 */ Vec3f limbPos[ENRUPPECROW_LIMB_POS_COUNT];
} EnRuppecrow; // size = 0x304
extern const ActorInit En_Ruppecrow_InitVars;
undefined_syms.txt
-5
View File
@@ -3311,11 +3311,6 @@ D_06009220 = 0x06009220;
D_0600C700 = 0x0600C700;
// ovl_En_Ruppecrow
D_060000F0 = 0x060000F0;
D_060010C0 = 0x060010C0;
// ovl_En_Rz
D_06003A20 = 0x06003A20;