mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-18 05:44:53 +00:00
Code Issues Projects Releases Wiki Activity

fixup rename hitBacklash (#2638)

Browse source
This commit is contained in:
Dragorn421 2025-06-17 14:01:13 +02:00 • committed by GitHub
parent e8c59385bc
commit bc5839a32c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/collision_check.h
View file

@ -100,7 +100,7 @@ typedef struct ColliderElementDamageInfoAC {
typedef struct ColliderElementDamageInfoACInit { typedef struct ColliderElementDamageInfoACInit {
/* 0x00 */ u32 dmgFlags; // Damage types that may affect this collider element as AC. /* 0x00 */ u32 dmgFlags; // Damage types that may affect this collider element as AC.
/* 0x04 */ u8 effect; // Damage Effect (Knockback, Fire, etc.) /* 0x04 */ u8 hitBacklash; // The hit backlash type applied to any attacker hurting this AC collider.
/* 0x05 */ u8 defense; // Damage Resistance /* 0x05 */ u8 defense; // Damage Resistance
} ColliderElementDamageInfoACInit; // size = 0x08 } ColliderElementDamageInfoACInit; // size = 0x08

2
src/code/z_collision_check.c
View file

@ -194,7 +194,7 @@ s32 Collider_DestroyElementDamageInfoAC(PlayState* play, ColliderElementDamageIn
s32 Collider_SetElementDamageInfoAC(PlayState* play, ColliderElementDamageInfoAC* acDmgInfo, s32 Collider_SetElementDamageInfoAC(PlayState* play, ColliderElementDamageInfoAC* acDmgInfo,
ColliderElementDamageInfoACInit* init) { ColliderElementDamageInfoACInit* init) {
acDmgInfo->dmgFlags = init->dmgFlags; acDmgInfo->dmgFlags = init->dmgFlags;
acDmgInfo->hitBacklash = init->effect; acDmgInfo->hitBacklash = init->hitBacklash;
acDmgInfo->defense = init->defense; acDmgInfo->defense = init->defense;
return true; return true;
} }