mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-20 22:11:16 +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

16
src/overlays/actors/ovl_En_Gb/z_en_gb.c
View file

@ -56,8 +56,8 @@ static ColliderCylinderInitType1 sCylinderInit = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
TOUCH_NONE,
BUMP_NONE,
ATELEM_NONE,
ACELEM_NONE,
OCELEM_ON,
},
{ 40, 75, 0, { 0, 0, 0 } },
@ -76,8 +76,8 @@ static ColliderCylinderInitType1 sBottlesCylindersInit[] = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
TOUCH_NONE,
BUMP_NONE,
ATELEM_NONE,
ACELEM_NONE,
OCELEM_ON,
},
{ 4, 20, 0, { 0, 0, 0 } },
@ -94,8 +94,8 @@ static ColliderCylinderInitType1 sBottlesCylindersInit[] = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
TOUCH_NONE,
BUMP_NONE,
ATELEM_NONE,
ACELEM_NONE,
OCELEM_ON,
},
{ 4, 20, 0, { 0, 0, 0 } },
@ -112,8 +112,8 @@ static ColliderCylinderInitType1 sBottlesCylindersInit[] = {
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
TOUCH_NONE,
BUMP_NONE,
ATELEM_NONE,
ACELEM_NONE,
OCELEM_ON,
},
{ 10, 20, 0, { 0, 0, 0 } },