Game-Decompilation/mzm
1
0
Fork 0
mirror of https://github.com/YohannDR/mzm.git synced 2024-10-06 18:13:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix charge beam defines

Browse Source
This commit is contained in:
YohannDR 2024-05-20 17:35:45 +02:00
parent 5ff6bd1e78
commit d2bb84b24c
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/constants/projectile.h
View File

@ -115,6 +115,7 @@
#define POWER_BOMB_DAMAGE 50
#define CHARGE_BEAM_START_THRESHOLD 16
#define CHARGE_BEAM_UNCHARGED_THRESHOLD 25
#define CHARGE_BEAM_THRESHOLD 64
#define CHARGE_BEAM_MAX_THRESHOLD (CHARGE_BEAM_THRESHOLD + 15)

2
src/particle.c
View File

@ -1762,7 +1762,7 @@ void ParticleChargingBeam(struct ParticleEffect* pParticle)
pParticle->yPosition = gArmCannonY;
pParticle->xPosition = gArmCannonX;
if (gSamusWeaponInfo.chargeCounter < 16)
if (gSamusWeaponInfo.chargeCounter < CHARGE_BEAM_START_THRESHOLD)
{
pParticle->status = 0;
ParticleStopBeginToChargeSound();

2
src/projectile_util.c
View File

@ -173,7 +173,7 @@ void ProjectileUpdate(void)
gArmCannonY = PIXEL_TO_SUB_PIXEL(SUB_PIXEL_TO_PIXEL(gSamusData.yPosition) + gSamusPhysics.armCannonYPositionOffset);
gArmCannonX = PIXEL_TO_SUB_PIXEL(SUB_PIXEL_TO_PIXEL(gSamusData.xPosition) + gSamusPhysics.armCannonXPositionOffset);
if (gSamusWeaponInfo.chargeCounter == 16 && gEquipment.suitType != SUIT_SUITLESS)
if (gSamusWeaponInfo.chargeCounter == CHARGE_BEAM_START_THRESHOLD && gEquipment.suitType != SUIT_SUITLESS)
{
checks = FALSE;

2
src/samus.c
View File

@ -7526,7 +7526,7 @@ void SamusUpdatePalette(struct SamusData* pData)
s32 tmp; // Needed to produce matching ASM.
chargeCounter = (tmp = pWeapon->chargeCounter);
limit = 64;
limit = CHARGE_BEAM_THRESHOLD;
if (chargeCounter >= limit)
{
offset = (chargeCounter - limit) >> 2;