mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-11 06:14:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

En_Elforg (Stray Fairy) OK and mostly documented (#359)

Browse Source 
* 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
This commit is contained in:
Tom Overton
2021-10-31 09:25:10 -07:00
committed by GitHub
parent b1b114e142
commit d4effceefd
9 changed files with 642 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+20 -20
View File
@@ -12075,30 +12075,30 @@
0x80ACBDFC:("func_80ACBDFC",),
0x80ACBEE0:("ObjAqua_Update",),
0x80ACC048:("ObjAqua_Draw",),
0x80ACC470:("func_80ACC470",),
0x80ACC470:("EnElforg_InitializeParams",),
0x80ACC50C:("EnElforg_Init",),
0x80ACC7A4:("EnElforg_Destroy",),
0x80ACC7E4:("func_80ACC7E4",),
0x80ACC8D4:("func_80ACC8D4",),
0x80ACC934:("func_80ACC934",),
0x80ACC994:("func_80ACC994",),
0x80ACCAC0:("func_80ACCAC0",),
0x80ACC7E4:("EnElforg_SpawnSparkles",),
0x80ACC8D4:("EnElforg_ApproachTargetYPosition",),
0x80ACC934:("EnElforg_ApproachTargetSpeedXZ",),
0x80ACC994:("EnElforg_MoveToTargetFairyFountain",),
0x80ACCAC0:("EnElforg_MoveToTarget",),
0x80ACCBB8:("func_80ACCBB8",),
0x80ACCBD0:("func_80ACCBD0",),
0x80ACCC98:("func_80ACCC98",),
0x80ACCE4C:("func_80ACCE4C",),
0x80ACCEB0:("func_80ACCEB0",),
0x80ACD088:("func_80ACD088",),
0x80ACD164:("func_80ACD164",),
0x80ACD1B0:("func_80ACD1B0",),
0x80ACD1F0:("func_80ACD1F0",),
0x80ACD2E4:("func_80ACD2E4",),
0x80ACD59C:("func_80ACD59C",),
0x80ACD610:("func_80ACD610",),
0x80ACD6A8:("func_80ACD6A8",),
0x80ACD6EC:("func_80ACD6EC",),
0x80ACCBD0:("EnElforg_TrappedByBubble",),
0x80ACCC98:("EnElforg_TurnInFairy",),
0x80ACCE4C:("EnElforg_QuicklyCircleFairyFountain",),
0x80ACCEB0:("EnElforg_FreeFloatingFairyFountain",),
0x80ACD088:("EnElforg_CirclePlayer",),
0x80ACD164:("EnElforg_FairyCollected",),
0x80ACD1B0:("EnElforg_SetupFairyCollected",),
0x80ACD1F0:("EnElforg_ClockTownFairyCollected",),
0x80ACD2E4:("EnElforg_FreeFloating",),
0x80ACD59C:("EnElforg_GetHoldingEnemy",),
0x80ACD610:("EnElforg_TrappedByEnemy",),
0x80ACD6A8:("EnElforg_SetupTrappedByEnemy",),
0x80ACD6EC:("EnElforg_HiddenByCollider",),
0x80ACD798:("EnElforg_Update",),
0x80ACD878:("func_80ACD878",),
0x80ACD878:("EnElforg_OverrideLimbDraw",),
0x80ACD8C0:("EnElforg_Draw",),
0x80ACDCD0:("EnElfbub_Init",),
0x80ACDE34:("EnElfbub_Destroy",),