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

EnSi OK (#1174)

Browse Source 
* [decomp,actor] Decompile Init,Destroy & unnamed functions (func_8098CA20 is WIP)

* [ovl_En_Si] Match func_8098CA20 function

* [0vl_En_Si] Comment data in spec

* [ovl_En_Si] Start documentation & cleanup

* [ovl_En_Si] Clang format

* [spec] Update ovl_En_Si reloc target

* Style fixes & adjust fanfare parameter

* Remove goto & styling fixes

* Styling fixes

* Remove unnecessary function declarations & dead code

* Styling fixes & doc (MR suggestions)

* Move GET_CHEST_FLAG macro to header file

* Rename colliderSphere variable to collider

* Rename func_8098CA20 to EnSi_UpdateCollision

* Rename func_8098CBDC to EnSi_DraggedByHookshot

* Rename func_8098CAD0 to EnSi_GiveToken

* Rename func_8098CB70 to EnSi_Wait

* Styling adjustment

* Update tools/disasm/function.txt with new function names

---------

Co-authored-by: Francis <francis.jeanneau@sparkmicro.com>
This commit is contained in:
Francis Jeanneau
2023-03-01 22:17:30 -03:00
committed by GitHub
co-authored by Francis
parent c70ccf14d9
commit 263fca77c3
5 changed files with 98 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/disasm/functions.txt
+4 -4
View File
@@ -8354,10 +8354,10 @@
0x8098BFB8:("EnDg_OverrideLimbDraw",),
0x8098BFD4:("EnDg_PostLimbDraw",),
0x8098C06C:("EnDg_Draw",),
0x8098CA20:("func_8098CA20",),
0x8098CAD0:("func_8098CAD0",),
0x8098CB70:("func_8098CB70",),
0x8098CBDC:("func_8098CBDC",),
0x8098CA20:("EnSi_UpdateCollision",),
0x8098CAD0:("EnSi_GiveToken",),
0x8098CB70:("EnSi_Wait",),
0x8098CBDC:("EnSi_DraggedByHookshot",),
0x8098CC18:("EnSi_Init",),
0x8098CC98:("EnSi_Destroy",),
0x8098CCC4:("EnSi_Update",),
tools/disasm/variables.txt
+3 -3
View File
@@ -9189,9 +9189,9 @@
0x8098C498:("D_8098C498","f32","",0x4),
0x8098C49C:("jtbl_8098C49C","UNK_PTR","",0x4),
0x8098CD60:("En_Si_InitVars","UNK_TYPE1","",0x1),
0x8098CD80:("D_8098CD80","UNK_TYPE1","",0x1),
0x8098CDAC:("D_8098CDAC","UNK_PTR","",0x4),
0x8098CDB8:("D_8098CDB8","UNK_TYPE1","",0x1),
0x8098CD80:("sSphereInit","UNK_TYPE1","",0x1),
0x8098CDAC:("sColChkInfoInit","UNK_PTR","",0x4),
0x8098CDB8:("sDamageTable","UNK_TYPE1","",0x1),
0x8098E420:("Obj_Comb_InitVars","UNK_TYPE1","",0x1),
0x8098E440:("D_8098E440","UNK_TYPE1","",0x1),
0x8098E464:("D_8098E464","UNK_TYPE1","",0x1),