mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 22:44:30 +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

11
data/z_collision_btltbls.data.s
View file

@ -1,11 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .data
glabel D_8011DB20
.incbin "baserom.z64", 0xB94CC0, 0x2E0

113
data/z_collision_check.data.s
View file

@ -1,113 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purposee registers
.section .data
glabel D_8011DE00
.incbin "baserom.z64", 0xB94FA0, 0x18
glabel D_8011DE18
.incbin "baserom.z64", 0xB94FB8, 0x8
glabel D_8011DE20
.incbin "baserom.z64", 0xB94FC0, 0xC
glabel D_8011DE2C
.incbin "baserom.z64", 0xB94FCC, 0x28
glabel D_8011DE54
.incbin "baserom.z64", 0xB94FF4, 0x18
glabel D_8011DE6C
.incbin "baserom.z64", 0xB9500C, 0xC
glabel D_8011DE78
.incbin "baserom.z64", 0xB95018, 0x34
glabel D_8011DEAC
.incbin "baserom.z64", 0xB9504C, 0x40
glabel D_8011DEEC
.incbin "baserom.z64", 0xB9508C, 0xC
glabel D_8011DEF8
.incbin "baserom.z64", 0xB95098, 0x10
glabel D_8011DF08
.incbin "baserom.z64", 0xB950A8, 0x10
glabel D_8011DF18
.incbin "baserom.z64", 0xB950B8, 0x10
glabel D_8011DF28
.incbin "baserom.z64", 0xB950C8, 0x18
glabel D_8011DF40
.incbin "baserom.z64", 0xB950E0, 0x1
glabel D_8011DF41
.incbin "baserom.z64", 0xB950E1, 0x1B
glabel D_8011DF5C
.incbin "baserom.z64", 0xB950FC, 0x10
glabel D_8011DF6C
.incbin "baserom.z64", 0xB9510C, 0x40
glabel D_8011DFAC
.incbin "baserom.z64", 0xB9514C, 0x40
glabel D_8011DFEC
.incbin "baserom.z64", 0xB9518C, 0x1C
glabel D_8011E008
.incbin "baserom.z64", 0xB951A8, 0x10
glabel D_8011E018
.incbin "baserom.z64", 0xB951B8, 0x10
glabel D_8011E028
.incbin "baserom.z64", 0xB951C8, 0x2
glabel D_8011E02A
.incbin "baserom.z64", 0xB951CA, 0x2
glabel D_8011E02C
.incbin "baserom.z64", 0xB951CC, 0x2
glabel D_8011E02E
.incbin "baserom.z64", 0xB951CE, 0x28
glabel D_8011E056
.incbin "baserom.z64", 0xB951F6, 0x2
glabel D_8011E058
.incbin "baserom.z64", 0xB951F8, 0x2
glabel D_8011E05A
.incbin "baserom.z64", 0xB951FA, 0xE
glabel D_8011E068
.incbin "baserom.z64", 0xB95208, 0x2
glabel D_8011E06A
.incbin "baserom.z64", 0xB9520A, 0x2
glabel D_8011E06C
.incbin "baserom.z64", 0xB9520C, 0x2
glabel D_8011E06E
.incbin "baserom.z64", 0xB9520E, 0x28
glabel D_8011E096
.incbin "baserom.z64", 0xB95236, 0x2
glabel D_8011E098
.incbin "baserom.z64", 0xB95238, 0x2
glabel D_8011E09A
.incbin "baserom.z64", 0xB9523A, 0x16