diff options
| author | Tom Overton <tom-overton@users.noreply.github.com> | 2021-10-31 09:25:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-31 13:25:10 -0300 |
| commit | d4effceefd6610b8bb782fec97387ed2340ec4f2 (patch) | |
| tree | 8c1a62598896e88831d4f8ae2b6276bfe7ef601e /include | |
| parent | b1b114e142f05443524d91b4127d9bf97fe75a28 (diff) | |
En_Elforg (Stray Fairy) OK and mostly documented (#359)
* Migrate data to C
* EnElforg_Init OK
* func_80ACC470 OK
* EnElforg_Destroy OK
* EnElforg_Update OK
* func_80ACCBD0 OK
* func_80ACCBB8 OK
* func_80ACD6EC OK
* func_80ACD59C OK
* func_80ACD6A8 OK
* func_80ACD610 OK
* func_80ACD878 OK
* Declare animated materials for Elforg
* EnElforg_Draw OK
* func_80ACCC98 OK
* func_80ACC7E4 OK
* func_80ACC8D4 OK
* func_80ACCEB0 OK
* func_80ACC994 OK
* PLAYER -> GET_PLAYER
* func_80ACCE4C OK
* func_80ACC934 OK
* func_80ACCAC0 OK
* func_80ACD2E4 OK
* func_80ACD1F0 OK
* func_80ACD164 OK
* func_80ACD1B0 OK (maybe fakematch but oh well)
* func_80ACD088 OK
* Better match for func_80ACD1B0
* Use compiled reloc
* Move static data to appropriate function
* Name sCylinderInit appropriately
* Add explanatory comment
* Clean up forward declarations
* Add macro for the flag
* Macro and enum for type
* Add STRAY_FAIRY_GET_PARAM_1C0 macro (no clue what this does)
* Document the area stuff
* Name some functions
* Document timer and direction
* Eliminate some early returns
* Tons more documentation
* Name remaining functions
* Document flags
* Name targetDistanceFromHome
* fairyFountainTimer -> secondaryTimer, since it's used outside of Fairy Fountains
* Name the unknown flag
* Name the collider fairy type
* Last bit of renaming/documenting
* Remove zero check
* Use hex constant for newAngle
* Merge animation updates
* Use 0x10000 instead of 65536.0f
* Use decimal for alpha
* Move yDifference initialization up to the same line as declaration
* Use +=/-=
* <= 30 instead of < 31
* += -1 -> --
* >= 81 -> > 80
* 0xDFFFFFFF -> ~0x20000000
* EnElforg_InitializeSpeedAndRotation -> EnElforg_InitializeParams
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.h | 4 | ||||
| -rw-r--r-- | include/variables.h | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/functions.h b/include/functions.h index 6ba1d1a70..40412e629 100644 --- a/include/functions.h +++ b/include/functions.h @@ -2021,7 +2021,7 @@ void func_80105818(GlobalContext* globalCtx, u32 uParm2, TransitionActorEntry* p // void func_80109EF8(void); // void func_80109F78(void); s32 func_8010A000(GlobalContext* globalCtx); -// void func_8010A074(void); +s32 func_8010A074(GlobalContext* globalCtx); // void func_8010A0A4(void); // void func_8010A0F0(void); // void func_8010A164(void); @@ -2155,7 +2155,7 @@ void func_8011552C(GlobalContext* globalCtx, s16 arg1); // void func_801155B4(void); // void func_80115764(void); void func_80115844(GlobalContext* globalCtx, s16 param_2); -void func_80115908(GlobalContext* globalCtx, u8 param_2); +s32 func_80115908(GlobalContext* globalCtx, u8 param_2); void func_801159c0(s16 param_1); void func_801159EC(s16 arg0); void func_80115A14(s32 arg0, s16 arg1); diff --git a/include/variables.h b/include/variables.h index ffaadaadf..d61be8307 100644 --- a/include/variables.h +++ b/include/variables.h @@ -3972,8 +3972,13 @@ extern UNK_TYPE D_04029140; extern Gfx D_04029CB0[]; extern Gfx D_04029CF0[]; extern UNK_TYPE D_04029D20; -extern UNK_TYPE D_0402B494; -extern UNK_TYPE D_0402C908; +extern AnimationHeader D_0402B494; +extern AnimatedMaterial D_0402C818; +extern AnimatedMaterial D_0402C890; +extern AnimatedMaterial D_0402C908; +extern AnimatedMaterial D_0402C980; +extern AnimatedMaterial D_0402C9F8; +extern FlexSkeletonHeader D_0402CA98; extern Gfx D_0402E510[]; extern UNK_TYPE D_0402E65C; extern UNK_TYPE D_0402F0EC; |