mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00
Code Issues Projects Releases Wiki Activity

z_collision_check.c (#73)

Browse source 
* func_8005B280 ok

* func_8005B65C OK

* split out func_8005BD50

* func_8005B7C0 OK

* func_8005B7F4 OK

* func_8005B824 OK

* func_8005B860 ok

* improve sanity

* func_8005B6B0 ok, ColliderInit_Actor structs added

* func_8005B884 ok

* func_8005BBF8 ok, split out func_8005BF50

* split more stuff out of func_8005C050.s

* func_8005C050 OK

* func_8005BA30 fakish OK, func_8005BAD8 real OK

* func_8005BB48 OK, func_8005BA84 almost decomp'd, but type issues

* func_8005BB10 Ok

* func_8005BF50 OK

* func_8005BE50 OK

* func_8005BD50 OK

* func_8005BCC8 Ok

* func_8005BC28

* func_8005BB8C func_8005BBB0 func_8005BBD4 Ok

* save my work commit

* func_8005C2BC fake OK

* func_8005C5B0 ok

* func_8005C608 ok

* func_8005C6C0 ok

* func_8005C6F8 ok

* func_8005C730 ok

* func_8005C774 func_8005C798 func_8005C7BC OK

* func_8005C7E0 ok, func_8005C810 split

* func_8005C810 OK

* func_8005C8C8 ok

* func_8005C964 OK

* func_8005CA88 ok

* func_8005CBAC ok

* func_8005C124 func_8005C1AC func_8005C234 func_8005CC98 OK

* func_8005CD34 func_8005CDD0 Ok

* func_8005CE6C ok

* func_8005CEC4 ok

* func_8005CEDC ok

* func_8005CF90 Ok

* standardize type names/vars more

* func_8005D3BC ok

* func_8005D40C OK, z64.h CollisionCheckContext

* func_8005D4B4 func_8005D4C8 ok

* partial data section migration

* improve function documentation, OT->OC

* Actor_CollisionCheck_SetOC ok

* Actor_CollisionCheck_SetAT Actor_CollisionCheck_SetAC Ok

* func_8005BA84 ok

* func_800611A0 ok

* func_80061274 ok

* clean up func_80061274

* func_8006139C ok

* func_8005E9C0 and dependencies OK

* minor cleanup to func_8005E9C0

* func_8005EC6C OK!

* func_8005E81C ok

* func_8005E604 ok

* func_8005E2EC func_8005E4F8 OK

* func_8005DE9C OK func_8005D8AC disassembled

* func_8006146C func_8006268C ok

* func_8005EEE0 ok

* func_8005F17C

* func_8005F39C ok

* func_8005F5B0 decompiled, not matching

* func_8005F7D0 decomp, func_8005D218 and func_8005D324 OK

* func_8005FA30 ok, split more functions

* func_8005FC04 ok

* func_8005FDCC k

* func_8005FF90 OK OK OK

* func_80060204 dead

* func_800604B0 ok

* func_80060704 func_80060994 ok, func_80060C2C somewhat disassembled. AT to AC matrix doneish

* func_800635D0 ok, func_80062ECC not so much

* OcLine oks

* D_8011DF28 functions disassembled

* D_8011DF5C functions OK

* setAT_SAC. setAC_SAC, setOC_SAC OK

* func_80061C98 decompiled, func_80061BF4, func_80061C18 OK

* func_800617D4 ok, func_800614A4 disassembled

* CollisionCheck_OC D_8011DFAC functions OK

* func_80062530 ok

* CollisionCheck_generalLineOcCheck subfunctions OK

* func_800622E4 ok

* after a long fought battle, func_80061F64 has fallen.

* func_800628A4 disassembled

* func_800627A0 func_8006285C OK

* ActorCollider_Cylinder_Update, func_80062718, func_80062734 ok

* func_80062CD4 decompiled, import EffShield/EffSpark types from MM

* various SubActor98 struct functions OK

* func_8005D4DC func_8005D62C ok

* .data section migrated, more OKs, fix NON_MATCHINGs to use effect structs

* func_80060C2C ok

* minor code tweaks

* func_80061C98 ok somehow

* Attempt to fix some unknowns, move types out of z64actor, add set3 ColliderInit types

* Apply changes

* formatting

* tweak a couple function names

* krim changes, func naming

* missed some things

* function renames

* Implement GenColliderInit.py utility

* Implement pr changes, GenColliderInit.py, DamageTable.py, z_collision_btltbls.c fully matching

* func_800614A4 ok

* Implement Roman's fixes, name Collider unknowns, rename COLTYPE -> COLSHAPE and define new COLTYPE

* collisionCheckCtx -> colChkCtx, fix small things
This commit is contained in:
mzxrules 2020-04-25 22:43:35 -04:00 • committed by GitHub
parent f9bdb1d58a
commit aa91a7ee32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
873 changed files with 6121 additions and 10660 deletions
Download patch file Download diff file Expand all files Collapse all files

4
asm/non_matchings/code/z_en_item00/En_Item00_Init.s
View file

@ -154,13 +154,13 @@ glabel En_Item00_Init
/* A94B5C 8001D9BC E7A20034 */ swc1 $f2, 0x34($sp)
/* A94B60 8001D9C0 26050160 */ addiu $a1, $s0, 0x160
/* A94B64 8001D9C4 AFA50020 */ sw $a1, 0x20($sp)
/* A94B68 8001D9C8 0C0170D9 */ jal ActorCollider_AllocCylinder
/* A94B68 8001D9C8 0C0170D9 */ jal Collider_InitCylinder
/* A94B6C 8001D9CC 8FA40044 */ lw $a0, 0x44($sp)
/* A94B70 8001D9D0 3C078011 */ lui $a3, %hi(D_801154E0) # $a3, 0x8011
/* A94B74 8001D9D4 8FA50020 */ lw $a1, 0x20($sp)
/* A94B78 8001D9D8 24E754E0 */ addiu $a3, %lo(D_801154E0) # addiu $a3, $a3, 0x54e0
/* A94B7C 8001D9DC 8FA40044 */ lw $a0, 0x44($sp)
/* A94B80 8001D9E0 0C01712B */ jal ActorCollider_InitCylinder
/* A94B80 8001D9E0 0C01712B */ jal Collider_SetCylinder
/* A94B84 8001D9E4 02003025 */ move $a2, $s0
/* A94B88 8001D9E8 9609001C */ lhu $t1, 0x1c($s0)
/* A94B8C 8001D9EC C7A20034 */ lwc1 $f2, 0x34($sp)

4
asm/non_matchings/code/z_en_item00/En_Item00_Update.s
View file

@ -212,13 +212,13 @@ glabel En_Item00_Update
.L8001E958:
/* A95AF8 8001E958 00C02825 */ move $a1, $a2
/* A95AFC 8001E95C AFA60028 */ sw $a2, 0x28($sp)
/* A95B00 8001E960 0C0189B7 */ jal ActorCollider_Cylinder_Update
/* A95B00 8001E960 0C0189B7 */ jal Collider_CylinderUpdate
/* A95B04 8001E964 02002025 */ move $a0, $s0
/* A95B08 8001E968 3C010001 */ li $at, 0x00010000 # 0.000000
/* A95B0C 8001E96C 34211E60 */ ori $at, (0x00011E60 & 0xFFFF) # ori $at, $at, 0x1e60
/* A95B10 8001E970 8FA60028 */ lw $a2, 0x28($sp)
/* A95B14 8001E974 02212821 */ addu $a1, $s1, $at
/* A95B18 8001E978 0C01767D */ jal Actor_CollisionCheck_SetAC
/* A95B18 8001E978 0C01767D */ jal CollisionCheck_SetAC
/* A95B1C 8001E97C 02202025 */ move $a0, $s1
/* A95B20 8001E980 8603001C */ lh $v1, 0x1c($s0)
/* A95B24 8001E984 24010015 */ li $at, 21