Game-Decompilation/sotn-decomp
1
0
Fork 0
mirror of https://github.com/Xeeynamo/sotn-decomp.git synced 2024-10-07 10:33:37 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Factor out CollectHeartVessel (#1216)

Browse Source
This commit is contained in:
sozud 2024-05-30 15:27:00 -07:00 committed by GitHub
parent 385ad23949
commit 4ba815e4ef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/st/collect_heart_vessel.h
View File

@ -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 {

15
src/st/wrp_psp/e_collect.c
View File

@ -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);