mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-14 19:59:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 26-02-27-allocator-isolation

Browse Source
This commit is contained in:
PJB3005
2026-03-05 00:15:09 +01:00
parent 038ef4216f 3c6552dbd2
commit 3ffc3266d7
5530 changed files with 252979 additions and 26830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_ww.cpp
+3 -2
View File
@@ -11,6 +11,7 @@
#include "d/d_cc_uty.h"
#include "f_op/f_op_actor_enemy.h"
#include "Z2AudioLib/Z2Instances.h"
#include <cstring>
enum E_ww_RES_File_ID {
/* BCK */
@@ -320,9 +321,9 @@ void daE_WW_c::damage_check() {
mAtInfo.mpCollider = var_r29;
if (mAtInfo.mpCollider->ChkAtType(AT_TYPE_IRON_BALL) != 0) {
if (fopAcM_GetName(dCc_GetAc(mAtInfo.mpCollider->GetAc())) == PROC_Obj_Carry) {
health += (s16) 150;
S16_ADD(health, 150);
} else if (dComIfGp_checkPlayerStatus0(0, 0x400) != 0) {
health += (s16) 180;
S16_ADD(health, 180);
} else {
health = 0;
}