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

EnGe2 (Gerudo in Purple) OK and documented, object_gla documented (#1071)

Browse Source 
* OK, data imported

* Permuter settings

* Name data, a few functions and variables, cleanup

* Small amount of cleanup on some related actors

* Oops

* Document object

* Type and other macros

* Some cutscene stuff and temporary function names

* Proper path function names

* Name a couple more functions

* A couple more function names

* Name PathStatus enum

* Name rest of functions and formalise the documentation a bit

* Apply suggestions from code review

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* limbs

* Format

* Review

* format

* weekeventregconvert and format

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
This commit is contained in:
EllipticEllipsis
2023-02-24 11:59:17 -03:00
committed by GitHub
co-authored by Derek Hensley angie
parent 3e257354c1
commit 69f7540e33
15 changed files with 993 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+28 -28
View File
@@ -14704,33 +14704,33 @@
0x80B8A718:("EnKaizoku_Draw",),
0x80B8B2D0:("EnGe2_Init",),
0x80B8B504:("EnGe2_Destroy",),
0x80B8B514:("func_80B8B514",),
0x80B8B5AC:("func_80B8B5AC",),
0x80B8B6B4:("func_80B8B6B4",),
0x80B8B7A8:("func_80B8B7A8",),
0x80B8B848:("func_80B8B848",),
0x80B8B90C:("func_80B8B90C",),
0x80B8BA40:("func_80B8BA40",),
0x80B8BB3C:("func_80B8BB3C",),
0x80B8BC1C:("func_80B8BC1C",),
0x80B8BC78:("func_80B8BC78",),
0x80B8BCEC:("func_80B8BCEC",),
0x80B8BD38:("func_80B8BD38",),
0x80B8BD90:("func_80B8BD90",),
0x80B8BE08:("func_80B8BE08",),
0x80B8BF04:("func_80B8BF04",),
0x80B8BFC8:("func_80B8BFC8",),
0x80B8C048:("func_80B8C048",),
0x80B8C0B0:("func_80B8C0B0",),
0x80B8C13C:("func_80B8C13C",),
0x80B8C45C:("func_80B8C45C",),
0x80B8C59C:("func_80B8C59C",),
0x80B8C644:("func_80B8C644",),
0x80B8C9B8:("func_80B8C9B8",),
0x80B8B514:("EnGe2_DetectPlayer",),
0x80B8B5AC:("EnGe2_LookForPlayer",),
0x80B8B6B4:("EnGe2_SetupPath",),
0x80B8B7A8:("EnGe2_GetNextPath",),
0x80B8B848:("EnGe2_SetupBlownAwayPath",),
0x80B8B90C:("EnGe2_FollowPath",),
0x80B8BA40:("EnGe2_FollowPathWithoutGravity",),
0x80B8BB3C:("EnGe2_SpawnEffects",),
0x80B8BC1C:("EnGe2_Scream",),
0x80B8BC78:("EnGe2_ThrowPlayerOut",),
0x80B8BCEC:("EnGe2_TurnToPlayerFast",),
0x80B8BD38:("EnGe2_CapturePlayer",),
0x80B8BD90:("EnGe2_SetupCapturePlayer",),
0x80B8BE08:("EnGe2_Charge",),
0x80B8BF04:("EnGe2_SetupCharge",),
0x80B8BFC8:("EnGe2_SetupLookAround",),
0x80B8C048:("EnGe2_Stunned",),
0x80B8C0B0:("EnGe2_KnockedOut",),
0x80B8C13C:("EnGe2_PatrolDuties",),
0x80B8C45C:("EnGe2_LookAround",),
0x80B8C59C:("EnGe2_Walk",),
0x80B8C644:("EnGe2_PerformCutsceneActions",),
0x80B8C9B8:("EnGe2_GuardStationary",),
0x80B8CAA8:("EnGe2_Update",),
0x80B8CC0C:("func_80B8CC0C",),
0x80B8CCB4:("func_80B8CCB4",),
0x80B8CCFC:("func_80B8CCFC",),
0x80B8CC0C:("EnGe2_ValidatePictograph",),
0x80B8CCB4:("EnGe2_OverrideLimbDraw",),
0x80B8CCFC:("EnGe2_PostLimbDraw",),
0x80B8CD3C:("EnGe2_Draw",),
0x80B8D030:("EnMaYts_UpdateEyes",),
0x80B8D0BC:("EnMaYts_ChangeAnim",),
@@ -14960,9 +14960,9 @@
0x80B9AF50:("func_80B9AF50",),
0x80B9AFE0:("ObjBoat_Init",),
0x80B9B0F0:("ObjBoat_Destroy",),
0x80B9B124:("func_80B9B124",),
0x80B9B124:("ObjBoat_SetRotations",),
0x80B9B1B8:("ObjBoat_Update",),
0x80B9B428:("func_80B9B428",),
0x80B9B428:("ObjBoat_UpdateCutscene",),
0x80B9B628:("ObjBoat_Draw",),
0x80B9B6E0:("func_80B9B6E0",),
0x80B9B74C:("func_80B9B74C",),
tools/disasm/variables.txt
+7 -7
View File
@@ -15182,13 +15182,13 @@
0x80B8ADB0:("D_80B8ADB0","f32","",0x4),
0x80B8ADB4:("D_80B8ADB4","f32","",0x4),
0x80B8CE20:("En_Ge2_InitVars","UNK_TYPE1","",0x1),
0x80B8CE40:("D_80B8CE40","UNK_TYPE1","",0x1),
0x80B8CE6C:("D_80B8CE6C","UNK_TYPE1","",0x1),
0x80B8CE78:("D_80B8CE78","UNK_TYPE1","",0x1),
0x80B8CE84:("D_80B8CE84","UNK_TYPE1","",0x1),
0x80B8CE88:("D_80B8CE88","UNK_TYPE1","",0x1),
0x80B8CE8C:("D_80B8CE8C","UNK_TYPE1","",0x1),
0x80B8CE98:("D_80B8CE98","UNK_TYPE1","",0x1),
0x80B8CE40:("sCylinderInit","ColliderCylinderInit","",0x2C),
0x80B8CE6C:("effectVelocity","Vec3f","",0xC),
0x80B8CE78:("effectAccel","Vec3f","",0xC),
0x80B8CE84:("effectPrimColor","Color_RGBA8","",0x4),
0x80B8CE88:("effectEnvColor","Color_RGBA8","",0x4),
0x80B8CE8C:("sFocusOffset","Vec3f","",0x1),
0x80B8CE98:("sEyeTextures","TexturePtr","[3]",0xC),
0x80B8CEB0:("jtbl_80B8CEB0","UNK_PTR","",0x4),
0x80B8E150:("En_Ma_Yts_InitVars","UNK_TYPE1","",0x1),
0x80B8E170:("D_80B8E170","ColliderCylinderInit","",0x2C),