mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Colliders: change "touch, bump" to AT and AC (elems) (#1637)

Browse source 
* toucherFlags, bumperFlags -> atElemFlags, acElemFlags

* TOUCH_ -> ATELEM_

* BUMP_ -> ACELEM_

* ColliderElementTouch,Bump -> ColliderElementDamageInfoAT,AC

* toucher,bumper -> atDmgInfo,acDmgInfo

* Update docs and zcolchk funcs names

* run formatter

* remove the last mentions of "bump" for colliders

* Update renamed functions in disasm
This commit is contained in:
Dragorn421 2024-03-05 01:33:08 +01:00 • committed by GitHub
parent bf37ad1368
commit 68a86d2d00
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
253 changed files with 1509 additions and 1509 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tools/disasm/gc-eu-mq/functions.txt
View file

@ -900,13 +900,13 @@ Collider_SetBase = 0x80049B10; // type:func
Collider_ResetATBase = 0x80049B54; // type:func
Collider_ResetACBase = 0x80049B70; // type:func
Collider_ResetOCBase = 0x80049B8C; // type:func
Collider_InitElementTouch = 0x80049BB4; // type:func
Collider_DestroyElementTouch = 0x80049BDC; // type:func
Collider_SetElementTouch = 0x80049BF0; // type:func
Collider_InitElementDamageInfoAT = 0x80049BB4; // type:func
Collider_DestroyElementDamageInfoAT = 0x80049BDC; // type:func
Collider_SetElementDamageInfoAT = 0x80049BF0; // type:func
Collider_ResetATElement_Unk = 0x80049C18; // type:func
Collider_InitElementBump = 0x80049C28; // type:func
Collider_DestroyElementBump = 0x80049C58; // type:func
Collider_SetElementBump = 0x80049C6C; // type:func
Collider_InitElementDamageInfoAC = 0x80049C28; // type:func
Collider_DestroyElementDamageInfoAC = 0x80049C58; // type:func
Collider_SetElementDamageInfoAC = 0x80049C6C; // type:func
Collider_InitElement = 0x80049C94; // type:func
Collider_DestroyElement = 0x80049D14; // type:func
Collider_SetElement = 0x80049D54; // type:func
@ -991,8 +991,8 @@ CollisionCheck_SetAC_SAC = 0x8004BBE0; // type:func
CollisionCheck_SetOC = 0x8004BCF0; // type:func
CollisionCheck_SetOC_SAC = 0x8004BDD0; // type:func
CollisionCheck_SetOCLine = 0x8004BEE0; // type:func
CollisionCheck_SkipElementTouch = 0x8004BF6C; // type:func
CollisionCheck_SkipElementBump = 0x8004BF90; // type:func
CollisionCheck_IsElementNotAT = 0x8004BF6C; // type:func
CollisionCheck_IsElementNotAC = 0x8004BF90; // type:func
CollisionCheck_NoSharedFlags = 0x8004BFB4; // type:func
CollisionCheck_NoBlood = 0x8004BFDC; // type:func
CollisionCheck_BlueBlood = 0x8004BFF0; // type:func
@ -10599,7 +10599,7 @@ EnReeba_Surface = 0x80AC5628; // type:func
EnReeba_Move = 0x80AC5848; // type:func
EnReeba_SetupMoveBig = 0x80AC5964; // type:func
EnReeba_MoveBig = 0x80AC5988; // type:func
EnReeba_Bumped = 0x80AC5BF8; // type:func
EnReeba_Recoiled = 0x80AC5BF8; // type:func
EnReeba_SetupSink = 0x80AC5C64; // type:func
EnReeba_Sink = 0x80AC5CBC; // type:func
EnReeba_SetupDamaged = 0x80AC5DCC; // type:func