diff --git a/src/st/collect_heart_vessel.h b/src/st/collect_heart_vessel.h index d43fb4f2c..a67abfca1 100644 --- a/src/st/collect_heart_vessel.h +++ b/src/st/collect_heart_vessel.h @@ -3,7 +3,7 @@ void CollectHeartVessel(void) { g_api.PlaySfx(NA_SE_PL_COLLECT_HEART); g_Status.hearts += HEART_VESSEL_RICHTER; - if (g_Status.heartsMax < g_Status.hearts) { + if (g_Status.hearts > g_Status.heartsMax) { g_Status.hearts = g_Status.heartsMax; } } else { diff --git a/src/st/wrp_psp/e_collect.c b/src/st/wrp_psp/e_collect.c index 1385ef8de..03121c6b9 100644 --- a/src/st/wrp_psp/e_collect.c +++ b/src/st/wrp_psp/e_collect.c @@ -121,20 +121,7 @@ void CollectSubweapon(u16 subWeaponIdx) { DestroyEntity(g_CurrentEntity); } -void CollectHeartVessel(void) { - if (g_PlayableCharacter != PLAYER_ALUCARD) { - g_api.PlaySfx(NA_SE_PL_COLLECT_HEART); - g_Status.hearts += HEART_VESSEL_RICHTER; - - if (g_Status.hearts > g_Status.heartsMax) { - g_Status.hearts = g_Status.heartsMax; - } - } else { - g_api.PlaySfx(NA_SE_PL_COLLECT_HEART); - g_api.func_800FE044(HEART_VESSEL_INCREASE, 0x4000); - } - DestroyEntity(g_CurrentEntity); -} +#include "../collect_heart_vessel.h" void CollectLifeVessel(void) { g_api.PlaySfx(NA_SE_PL_COLLECT_HEART);