mirror of
https://github.com/zeldaret/mm.git
synced 2026-08-22 06:19:54 -04:00
Obj_Kibako2 OK (#249)
* Data migrated and ObjKibako2_Init OK * ObjKibako2_Destroy OK * func_8098EC68 OK * Commit what I have on Update as I figure it out * Name skulltulaNoiseTimer and get a little closer to matching Update * Wrap Update in NON_MATCHING for now * Get this ready to push up * func_8098ED20 OK (but it's not an actionFunc???) * ObjKibako2_Draw OK * func_8098E9C4 OK * Turns out globalCtx *is* needed * func_8098E8A8 OK * Save my progress on func_8098E5C0 for now * func_8098E900 OK * func_8098EB78 OK * Clean up some if-conditionals * Delete pointless forward declaration * ObjKibako2_Break OK * Update names to match OoT equivalent * func_8098E5C0 OK (though a little weird) * ObjKibako2_Update OK * Clean, document, and name ObjKibako2_ShouldBreak * Clean and name ObjKibako2_ContainsSkulltula * Some more cleanup * Why did I mix snake case with camel case lol * Update spec now that everything matches * Actually rename the data * sn/cs -> sin/cos * Use true/false in ObjKibako2_ShouldBreak * Use the AC_HIT macro and don't use the temp where it isn't needed * Use macro and enum for contents * Get rid of fake temp in Init * Macros for collectible ID/Flag * 0xFFFD -> ~AC_HIT * In macros, x -> this * Just kidding, use thisx for macros * Add description to the top of C file * Run ./format.sh after installing clang-format-11 * char -> UNK_TYPE1 * Remove unnecessary struct padding * Initialize thisPos at the same time it's declared * Clean up parentheses for bitwise operations to make it clearer what they do * Clean up control flow in ObjKibako2_Idle * Remove extraneous parentheses * Move instantialization up in ObjKibako2_ContainsSkulltula * Move tempRand instantiation up in ObjKibako2_Break * Move collectible instantiation up in ObjKibako2_SpawnCollectible * Remove extra brackets * Remove extra brackets (again) * Move contents instantiation up in ObjKibako2_Init
This commit is contained in:
@@ -8385,16 +8385,16 @@
|
||||
0x8098E0B8:("func_8098E0B8",),
|
||||
0x8098E15C:("ObjComb_Update",),
|
||||
0x8098E2F8:("ObjComb_Draw",),
|
||||
0x8098E5C0:("func_8098E5C0",),
|
||||
0x8098E62C:("func_8098E62C",),
|
||||
0x8098E8A8:("func_8098E8A8",),
|
||||
0x8098E900:("func_8098E900",),
|
||||
0x8098E9C4:("func_8098E9C4",),
|
||||
0x8098E5C0:("ObjKibako2_ContainsSkulltula",),
|
||||
0x8098E62C:("ObjKibako2_Break",),
|
||||
0x8098E8A8:("ObjKibako2_SpawnCollectible",),
|
||||
0x8098E900:("ObjKibako2_SpawnSkulltula",),
|
||||
0x8098E9C4:("ObjKibako2_SpawnContents",),
|
||||
0x8098EA08:("ObjKibako2_Init",),
|
||||
0x8098EB30:("ObjKibako2_Destroy",),
|
||||
0x8098EB78:("func_8098EB78",),
|
||||
0x8098EC68:("func_8098EC68",),
|
||||
0x8098ED20:("func_8098ED20",),
|
||||
0x8098EB78:("ObjKibako2_ShouldBreak",),
|
||||
0x8098EC68:("ObjKibako2_Idle",),
|
||||
0x8098ED20:("ObjKibako2_Kill",),
|
||||
0x8098ED4C:("ObjKibako2_Update",),
|
||||
0x8098EE0C:("ObjKibako2_Draw",),
|
||||
0x8098EF60:("EnHs2_Init",),
|
||||
|
||||
Reference in New Issue
Block a user