6 Commits

Author SHA1 Message Date
Yanis002
6587b1fc59 Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-06-30 23:34:06 +02:00
Dragorn421
88f452af10 Reevaluate player hit response names (#2640)
* PlayerHitResponseType

* PLAYER_HIT_RESPONSE_ICE_TRAP -> FROZEN

* PLAYER_KNOCKBACK_LARGE_SHOCK, PLAYER_HIT_RESPONSE_ELECTRIC_SHOCK -> PLAYER_KNOCKBACK_LARGE_ELECTRIFIED, PLAYER_HIT_RESPONSE_ELECTRIFIED

* damageResponseType -> hitResponseType
2025-06-27 04:45:44 +09:00
Yanis002
80a59efe6a Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-06-10 10:57:26 +02:00
Dragorn421
39de1e0204 WeaponInfo docs (#1596)
* WeaponInfo docs

* format

* disasm metadata

* merge fixup

* Add MELEE_WEAPON_INFO_TIP and _BASE

* format

* Offset
2025-06-07 23:37:13 -04:00
Yanis002
70137e99d7 Merge remote-tracking branch 'decomp/main' into decomp_merge 2025-06-07 02:21:20 +02:00
fig02
28cc9d68cf Remove "z64" prefix from all headers (#2518)
* z64 - a

* z64 - b

* z64 - c

* z64 - d

* z64 - e

* z64 - f

* z64 - g

* z64 - h

* z64 - i

* z64 - l

* z64 - m

* z64 - o

* z64 - p

* z64 - q

* z64 - r

* z64 - s

* z64 - t

* z64 - v

* restore file

* fix merge

* fix merge

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
2025-06-04 14:38:33 -04:00