hackern64/HackerOoT
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerOoT.git synced 2026-01-21 10:37:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup extracted colliders 3: Use HIT_SPECIAL_EFFECT_, HIT_BACKLASH_ names (#2646)

Browse Source 
* Cleanup extracted colliders 3: Use `HIT_SPECIAL_EFFECT_`, `HIT_BACKLASH_` names

* revert removing FLARE_DANCER_BODY_DMG (oops)
This commit is contained in:
Dragorn421
2025-06-28 23:06:42 +01:00
committed by GitHub
parent b5f980570c
commit d45353ee33
241 changed files with 1029 additions and 1026 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/collision_check.h
View File

@@ -85,7 +85,10 @@ typedef enum HitSpecialEffect {
HIT_SPECIAL_EFFECT_FIRE,
HIT_SPECIAL_EFFECT_ICE,
HIT_SPECIAL_EFFECT_ELECTRIC,
HIT_SPECIAL_EFFECT_KNOCKBACK
HIT_SPECIAL_EFFECT_KNOCKBACK,
HIT_SPECIAL_EFFECT_7 = 7, // Same effect as `HIT_SPECIAL_EFFECT_NONE`
HIT_SPECIAL_EFFECT_8, // Same effect as `HIT_SPECIAL_EFFECT_NONE`
HIT_SPECIAL_EFFECT_9 // Same effect as `HIT_SPECIAL_EFFECT_NONE`
} HitSpecialEffect;
typedef struct ColliderElementDamageInfoAT {

4
src/code/z_en_a_keep.c
View File

@@ -50,8 +50,8 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_ON,

6
src/code/z_en_item00.c
View File

@@ -64,9 +64,9 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000010, 0x00, 0x00 },
ATELEM_NONE | ATELEM_SFX_NORMAL,
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00000010, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,
},

4
src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View File

@@ -46,8 +46,8 @@ static ColliderQuadInit sQuadInit = {
},
{
ELEM_MATERIAL_UNK2,
{ 0x00000080, 0x00, 0x01 },
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x00000080, HIT_SPECIAL_EFFECT_NONE, 0x01 },
{ 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_NEAREST | ATELEM_SFX_NORMAL,
ACELEM_NONE,
OCELEM_NONE,

4
src/overlays/actors/ovl_Bg_Bdan_Objects/z_bg_bdan_objects.c
View File

@@ -80,8 +80,8 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 },
{ 0x00000000, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_SFX_HARD,
ACELEM_NONE,
OCELEM_NONE,

4
src/overlays/actors/ovl_Bg_Bdan_Switch/z_bg_bdan_switch.c
View File

@@ -71,8 +71,8 @@ static ColliderJntSphElementInit sJntSphElementsInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0xEFC1FFFE, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0xEFC1FFFE, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_ON,

12
src/overlays/actors/ovl_Bg_Bombwall/z_bg_bombwall.c
View File

@@ -33,8 +33,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000048, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x40000048, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,
@@ -44,8 +44,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000048, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x40000048, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,
@@ -55,8 +55,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000048, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x40000048, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,

4
src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
View File

@@ -63,8 +63,8 @@ static ColliderQuadInit sQuadInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0x00000048, 0x00, 0x00 },
{ 0x00000048, 0x00, 0x00 },
{ 0x00000048, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00000048, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,

4
src/overlays/actors/ovl_Bg_Ddan_Kd/z_bg_ddan_kd.c
View File

@@ -52,8 +52,8 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,

8
src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
View File

@@ -61,8 +61,8 @@ static ColliderCylinderInit sMainColliderCylinderInit = {
},
{
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,
@@ -81,8 +81,8 @@ static ColliderCylinderInit sLeftRightColliderCylinderInit = {
},
{
ELEM_MATERIAL_UNK2,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00000000, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_NONE,
OCELEM_ON,

4
src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
View File

@@ -53,8 +53,8 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x00020800, 0x00, 0x00 },
{ 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00020800, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,

20
src/overlays/actors/ovl_Bg_Haka_Sgami/z_bg_haka_sgami.c
View File

@@ -51,8 +51,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK2,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
{ 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 },
{ 0x00000000, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
ACELEM_NONE,
OCELEM_NONE,
@@ -62,8 +62,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK2,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
{ 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 },
{ 0x00000000, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
ACELEM_NONE,
OCELEM_NONE,
@@ -73,8 +73,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK2,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
{ 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 },
{ 0x00000000, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
ACELEM_NONE,
OCELEM_NONE,
@@ -84,8 +84,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK2,
{ 0x20000000, 0x00, 0x04 },
{ 0x00000000, 0x00, 0x00 },
{ 0x20000000, HIT_SPECIAL_EFFECT_NONE, 0x04 },
{ 0x00000000, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
ACELEM_NONE,
OCELEM_NONE,
@@ -118,8 +118,8 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00000000, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_NONE,
OCELEM_ON,

12
src/overlays/actors/ovl_Bg_Haka_Trap/z_bg_haka_trap.c
View File

@@ -64,8 +64,8 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0xFFCFFFFF, 0x00, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0xFFCFFFFF, HIT_SPECIAL_EFFECT_NONE, 0x04 },
{ 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_SFX_NORMAL,
ACELEM_ON,
OCELEM_ON,
@@ -77,8 +77,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00020000, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00020000, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,
@@ -88,8 +88,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00020000, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00020000, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,

8
src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
View File

@@ -53,8 +53,8 @@ static ColliderCylinderInit sPotColliderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00000008, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,
@@ -73,8 +73,8 @@ static ColliderCylinderInit sFlamesColliderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0x00000008, 0x00, 0x00 },
{ 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 },
{ 0x00000008, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
ACELEM_NONE,
OCELEM_ON,

4
src/overlays/actors/ovl_Bg_Haka_Zou/z_bg_haka_zou.c
View File

@@ -53,8 +53,8 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00000008, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,

4
src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
View File

@@ -53,8 +53,8 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 },
{ 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
ACELEM_NONE,
OCELEM_ON,

16
src/overlays/actors/ovl_Bg_Hidan_Dalm/z_bg_hidan_dalm.c
View File

@@ -44,8 +44,8 @@ static ColliderTrisElementInit sTrisElementInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000040, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00000040, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK,
OCELEM_NONE,
@@ -55,8 +55,8 @@ static ColliderTrisElementInit sTrisElementInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000040, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00000040, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK,
OCELEM_NONE,
@@ -66,8 +66,8 @@ static ColliderTrisElementInit sTrisElementInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000040, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00000040, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK,
OCELEM_NONE,
@@ -77,8 +77,8 @@ static ColliderTrisElementInit sTrisElementInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000040, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x00000040, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON | ACELEM_NO_AT_INFO | ACELEM_NO_DAMAGE | ACELEM_NO_SWORD_SFX | ACELEM_NO_HITMARK,
OCELEM_NONE,

4
src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
View File

@@ -54,8 +54,8 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 },
{ 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
ACELEM_NONE,
OCELEM_ON,

4
src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
View File

@@ -67,8 +67,8 @@ static ColliderCylinderInit sCylinderInit = {
},
{
ELEM_MATERIAL_UNK0,
{ 0x20000000, 0x01, 0x04 },
{ 0xFFCFFFFF, 0x00, 0x00 },
{ 0x20000000, HIT_SPECIAL_EFFECT_FIRE, 0x04 },
{ 0xFFCFFFFF, HIT_BACKLASH_NONE, 0x00 },
ATELEM_ON | ATELEM_SFX_NONE,
ACELEM_NONE,
OCELEM_ON,

8
src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
View File

@@ -45,8 +45,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000040, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x40000040, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,
@@ -56,8 +56,8 @@ static ColliderTrisElementInit sTrisElementsInit[] = {
{
{
ELEM_MATERIAL_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x40000040, 0x00, 0x00 },
{ 0x00000000, HIT_SPECIAL_EFFECT_NONE, 0x00 },
{ 0x40000040, HIT_BACKLASH_NONE, 0x00 },
ATELEM_NONE,
ACELEM_ON,
OCELEM_NONE,

Some files were not shown because too many files have changed in this diff Show More