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

Use SOUND_BALLSPARKING in sprite_util.c

Browse Source
This commit is contained in:
YohannDR 2024-02-19 18:31:48 +01:00
parent 132b91feb7
commit c3c8594b0f
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/block.c
View File

@ -1472,7 +1472,7 @@ void BlockProcessBombChains(void)
// Update each bomb chain every 4 frames
pChain = gBombChains;
pChain += (gFrameCounter8Bit & 3);
if (pChain->currentOffset == 0)
return;

8
src/data/block_data.c
View File

@ -91,8 +91,8 @@ const u16 sClipdataAffectingActionDamageTypes[MAX_AMOUNT_OF_CAA] = {
[CAA_NONE] = CAA_DAMAGE_TYPE_NONE,
[CAA_REMOVE_SOLID] = CAA_DAMAGE_TYPE_NONE,
[CAA_MAKE_SOLID_GRIPPABLE] = CAA_DAMAGE_TYPE_NONE,
[CAA_MAKE_STOP_ENEMY] = CAA_DAMAGE_TYPE_NONE,
[CAA_MAKE_NON_POWER_GRIP] = CAA_DAMAGE_TYPE_NONE,
[CAA_MAKE_STOP_ENEMY] = CAA_DAMAGE_TYPE_NONE,
[CAA_MAKE_NON_POWER_GRIP] = CAA_DAMAGE_TYPE_NONE,
[CAA_BOMB_CHAIN_UNUSED] = CAA_DAMAGE_TYPE_NONE,
[CAA_BEAM] = CAA_DAMAGE_TYPE_BEAM,
[CAA_BOMB_PISTOL] = CAA_DAMAGE_TYPE_BOMB_PISTOL,
@ -221,7 +221,9 @@ const struct BlockBehavior sBlockBehaviors[MAX_AMOUNT_OF_BLOCKS] = {
[BEHAVIOR_TO_BLOCK(CLIP_BEHAVIOR_SUPER_MISSILE_BLOCK_NO_REFORM)] = {
.lifeType = BLOCK_LIFE_TYPE_NO_NEVER_REFORM,
.subType = BLOCK_SUB_TYPE_REFORM,
.type = BLOCK_TYPE_SUPER_MISSILE_NO_REFORM
.type = BLOCK_TYPE_SUPER_MISSILE_NO_REFORM,
.isSpeedboost = FALSE,
.isBombChain = FALSE
},
[BEHAVIOR_TO_BLOCK(CLIP_BEHAVIOR_SPEEDBOOST_BLOCK_NO_REFORM)] = {
.lifeType = BLOCK_LIFE_TYPE_NO_NEVER_REFORM,

4
src/sprite_util.c
View File

@ -7,6 +7,7 @@
#include "sprites_AI/acid_worm.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/game_state.h"
#include "constants/samus.h"
@ -652,7 +653,8 @@ void SpriteUtilSamusAndSpriteCollision(void)
break;
case SPOSE_BALLSPARKING:
SoundStop(0x8F);
SoundStop(SOUND_BALLSPARKING);
case SPOSE_MORPH_BALL_MIDAIR:
pData->yPosition = pSprite->yPosition + 0x3C;
pData->xPosition = pSprite->xPosition;