Game-Decompilation/mzm
1
0
Fork 0
mirror of https://github.com/YohannDR/mzm.git synced 2024-11-23 04:59:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Create alias for every sound

Browse Source
This commit is contained in:
YohannDR 2024-08-31 16:49:29 +02:00
parent fbaa31835a
commit 16ec9c3c40
106 changed files with 1639 additions and 935 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1029
include/constants/audio.h
View File

File diff suppressed because it is too large Load Diff

35
include/constants/menus/file_select.h
View File

@ -1,3 +1,6 @@
#ifndef FILE_SELECT_CONSTANTS_H
#define FILE_SELECT_CONSTANTS_H
#define FILE_SELECT_TILE_TWO_DOTS_HIGH 0x1CA
#define FILE_SELECT_TILE_TWO_DOTS_LOW 0x1EA
#define FILE_SELECT_TILE_MINUS_HIGH 0x1CB
@ -204,19 +207,23 @@
// Sound request ids for FileSelectPlayMenuSound
#define MENU_SOUND_REQUEST_SUB_MENU_CURSOR 0
#define MENU_SOUND_REQUEST_ACCEPT_CONFIRM_MENU 1
#define MENU_SOUND_REQUEST_CURSOR 2
#define MENU_SOUND_REQUEST_FILE_SELECT 3
#define MENU_SOUND_REQUEST_START_GAME 4
#define MENU_SOUND_REQUEST_OPEN_SUB_MENU 5
#define MENU_SOUND_REQUEST_CLOSE_SUB_MENU 6
#define MENU_SOUND_REQUEST_CLOSE_SUB_MENU2 7
#define MENU_SOUND_REQUEST_COPY_DELETE 8
#define MENU_SOUND_REQUEST_COPY_DELETE_MOVING 9
#define MENU_SOUND_REQUEST_COPY_CONFIRM 10
#define MENU_SOUND_REQUEST_GAME_OVER_MENU_CURSOR 11
#define MENU_SOUND_REQUEST_GAME_OVER_START_GAME 12
enum MenuSoundRequest {
MENU_SOUND_REQUEST_SUB_MENU_CURSOR,
MENU_SOUND_REQUEST_ACCEPT_CONFIRM_MENU,
MENU_SOUND_REQUEST_CURSOR,
MENU_SOUND_REQUEST_FILE_SELECT,
MENU_SOUND_REQUEST_START_GAME,
MENU_SOUND_REQUEST_OPEN_SUB_MENU,
MENU_SOUND_REQUEST_CLOSE_SUB_MENU,
MENU_SOUND_REQUEST_CLOSE_SUB_MENU2,
MENU_SOUND_REQUEST_COPY_DELETE,
MENU_SOUND_REQUEST_COPY_DELETE_MOVING,
MENU_SOUND_REQUEST_COPY_CONFIRM,
MENU_SOUND_REQUEST_GAME_OVER_MENU_CURSOR,
MENU_SOUND_REQUEST_GAME_OVER_START_GAME,
MENU_SOUND_REQUEST_END
};
// Enabled menus flags
@ -226,3 +233,5 @@
#define MENU_FLAG_COPY 0x8
#define MENU_FLAG_ERASE 0x10
#define MENU_FLAG_OPTIONS 0x20
#endif /* FILE_SELECT_CONSTANTS_H */

5
include/data/menus/internal_file_select_data.h
View File

@ -2,6 +2,9 @@
#define INTERNAL_FILE_SELECT_MENU_DATA_H
#include "types.h"
#include "constants/menus/file_select.h"
#include "structs/menus/file_select.h"
extern const s8 sSaveFileAreasId[12];
@ -21,6 +24,6 @@ extern const u16 sOptionsOptionsTilemapOffsets[8];
extern const struct OptionsSubroutineInfo sOptionsSubroutineInfo[9];
extern const u8 sFileSelectDefaultPassword[8];
extern const u16 sMenuSounds[13];
extern const u16 sMenuSounds[MENU_SOUND_REQUEST_END];
#endif /* INTERNAL_FILE_SELECT_MENU_DATA_H */

9
include/macros.h
View File

@ -148,6 +148,15 @@
*/
#define FRACT_MUL(value, num, den) ((value) * (num) / (den))
/**
* @brief Multiplies a number by a floating point using a fraction. The float value must only have one floating digit.
*
* @param value Value
* @param f Floating point value
*
*/
#define FLOAT_MUL(value, f) ((value) * ((s32)((f) * 10)) / 10)
/**
* @brief Performs a semi-modulo (value & mod) operation on a value using the and operation (WARNING only use a value for mod that is a power of 2)
* This creates a cyclic value of the modulo, that swaps every "mod" times.

2
include/sprites_AI/metroid.h
View File

@ -16,7 +16,7 @@ void MetroidMove(u16 samusY, u16 samusX, u8 speedY, u8 speedX, u8 speedDivisor);
u8 MetroidBombDetection(void);
void MetroidCheckBouncingOnMetroid(u16 movement);
u8 MetroidCheckSamusGrabbed(void);
void MetroidPlaySound(void);
void MetroidPlayMovingSound(void);
void MetroidInit(void);
void MetroidCheckSpawn(void);
void MetroidSpawning(void);

2
include/structs/menus/pause_screen.h
View File

@ -269,7 +269,7 @@ struct PauseScreenData {
u8 padding_D9[16];
s8 easySleepTextState;
u8 unk_EA;
u8 notPlayingEnablingNormalItemSound;
struct BossFlameData bossFlameData[2];

2
include/structs/scroll.h
View File

@ -44,7 +44,7 @@ enum ScrollSubData {
#define BG3_SCROLLING_TYPE_QUARTERED 3
#define SCROLL_X_ANCHOR (SCREEN_SIZE_X_SUB_PIXEL / 2)
#define SCROLL_Y_ANCHOR (FRACT_MUL(SCREEN_SIZE_Y_SUB_PIXEL, 3, 5))
#define SCROLL_Y_ANCHOR ((s32)(SCREEN_SIZE_Y_SUB_PIXEL * .6f))
struct Scroll {
u8 within;

11
src/block.c
View File

@ -5,6 +5,7 @@
#include "data/block_data.h"
#include "data/engine_pointers.h"
#include "constants/audio.h"
#include "constants/block.h"
#include "constants/clipdata.h"
#include "constants/samus.h"
@ -542,7 +543,7 @@ u32 BlockDestroySquareBlock(struct ClipdataBlockData* pClipBlock)
// Play sound
if (gCurrentClipdataAffectingAction != CAA_SPEEDBOOSTER)
SoundPlayNotAlreadyPlaying(0x137);
SoundPlayNotAlreadyPlaying(SOUND_SQUARE_BLOCK_DESTROYED);
return TRUE;
}
@ -869,7 +870,7 @@ u32 BlockApplyCcaa(u16 yPosition, u16 xPosition, u16 trueClip)
case CAA_SPEEDBOOSTER_ON_GROUND:
if (BlockCheckCcaa(&clipBlock))
{
SoundPlayNotAlreadyPlaying(0x135);
SoundPlayNotAlreadyPlaying(SOUND_BLOCK_DESTROYED_WITH_SPEEDBOOSTER);
result = TRUE;
}
break;
@ -877,7 +878,7 @@ u32 BlockApplyCcaa(u16 yPosition, u16 xPosition, u16 trueClip)
case CAA_SCREW_ATTACK:
if (BlockCheckCcaa(&clipBlock))
{
SoundPlayNotAlreadyPlaying(0x139);
SoundPlayNotAlreadyPlaying(SOUND_BLOCK_DESTROYED_WITH_SCREW_ATTACK);
result = TRUE;
}
break;
@ -1453,7 +1454,7 @@ u32 BlockStartBombChain(u8 type, u16 xPosition, u16 yPosition)
// Check play bomb chain sound
if (couldSpawn && gActiveBombChainTypes == sBombChainReverseData[type].typeFlag)
SoundPlayNotAlreadyPlaying(0x136);
SoundPlayNotAlreadyPlaying(SOUND_BOMB_CHAIN);
return couldSpawn;
}
@ -1595,7 +1596,7 @@ void BlockProcessBombChains(void)
// Fade sound if no bomb chains active
if (gActiveBombChainTypes == 0)
SoundFade(0x136, 10);
SoundFade(SOUND_BOMB_CHAIN, CONVERT_SECONDS(1.f / 6));
}
}

10
src/chozodia_escape.c
View File

@ -526,12 +526,12 @@ u8 ChozodiaEscapeShipLeaving(void)
switch (CHOZODIA_ESCAPE_DATA.timer++)
{
case 0:
SoundPlay(0x255);
SoundPlay(SOUND_CHOZODIA_ESCAPE_MOTHER_SHIP_DOOR_OPENING);
break;
case 160:
CHOZODIA_ESCAPE_DATA.oamTypes[CHOZODIA_ESCAPE_OAM_BLUE_SHIP]++;
SoundPlay(0x256);
SoundPlay(SOUND_CHOZODIA_ESCAPE_BLUE_SHIP_TAKING_OFF);
break;
case 294:
@ -629,7 +629,7 @@ u8 ChozodiaEscapeShipHeatingUp(void)
case 0:
CHOZODIA_ESCAPE_DATA.oamTypes[CHOZODIA_ESCAPE_OAM_MOTHER_SHIP_DOOR] = 1;
CHOZODIA_ESCAPE_DATA.oamTypes[CHOZODIA_ESCAPE_OAM_SHIP_EXTERIOR] = 1;
SoundPlay(0x257);
SoundPlay(SOUND_CHOZODIA_ESCAPE_MOTHER_SHIP_HEATING_UP);
break;
case 152:
@ -643,7 +643,7 @@ u8 ChozodiaEscapeShipHeatingUp(void)
BLDCNT_BG2_FIRST_TARGET_PIXEL | BLDCNT_BG3_FIRST_TARGET_PIXEL | BLDCNT_OBJ_FIRST_TARGET_PIXEL |
BLDCNT_BACKDROP_FIRST_TARGET_PIXEL | BLDCNT_BRIGHTNESS_INCREASE_EFFECT;
CHOZODIA_ESCAPE_DATA.unk_1++;
SoundPlay(0x28B);
SoundPlay(SOUND_CHOZODIA_ESCAPE_MOTHER_SHIP_BLOWING_AURA);
break;
case 224:
@ -788,7 +788,7 @@ u8 ChozodiaEscapeShipBlowingUp(void)
CHOZODIA_ESCAPE_DATA.oamTypes[3]++;
CHOZODIA_ESCAPE_DATA.oamXPositions[3] = BLOCK_SIZE * 2 - 8;
CHOZODIA_ESCAPE_DATA.oamYPositions[3] = BLOCK_SIZE + QUARTER_BLOCK_SIZE;
SoundPlay(0x28C);
SoundPlay(SOUND_CHOZODIA_ESCAPE_MOTHER_SHIP_BLOWING_UP);
break;
case 32:

29
src/connection.c
View File

@ -5,6 +5,7 @@
#include "data/empty_datatypes.h"
#include "data/hatch_data.h"
#include "constants/audio.h"
#include "constants/connection.h"
#include "constants/color_fading.h"
#include "constants/clipdata.h"
@ -51,21 +52,23 @@ void ConnectionUpdateHatches(void)
if (gHatchData[i].currentAnimationFrame == 0x0)
{
if (gHatchData[i].opening == TRUE)
SoundPlay(0x10C);
{
SoundPlay(SOUND_DOOR_OPENING);
}
else
{
switch (gHatchData[i].type)
{
case HATCH_LOCKED:
case HATCH_LOCKED_AND_LOCK_DESTINATION:
SoundPlay(0x117);
SoundPlay(SOUND_DOORS_LOCKING);
break;
case HATCH_NONE:
case HATCH_SUPER_MISSILE:
case HATCH_POWER_BOMB:
default:
SoundPlay(0x10D);
SoundPlay(SOUND_DOOR_CLOSING);
break;
}
}
@ -516,7 +519,7 @@ void ConnectionCheckUnlockDoors(void)
if (gDoorUnlockTimer == 0x0 && (gHatchesState.hatchesLockedWithTimer || gHatchesState.unk2))
{
// Timer done and has hatches to unlock
SoundPlay(0x116);
SoundPlay(SOUND_DOORS_UNLOCKING);
gHatchesState.unlocking = TRUE;
}
}
@ -957,7 +960,7 @@ void ConnectionCheckPlayCutsceneDuringTransition(u8 area, u8 dstRoomPlusOne)
else if (dstRoomPlusOne == 0xB && !EventFunction(EVENT_ACTION_CHECKING, EVENT_ENTER_MOTHERSHIP_DEMO_PLAYED))
{
if (gRainSoundEffect & RAIN_SOUND_PLAYING)
SoundFade(0x121, 0xA); // Rain sound
SoundFade(SOUND_RAIN, CONVERT_SECONDS(1.f / 6));
gCurrentCutscene = CUTSCENE_MECHA_RIDLEY_SEES_SAMUS;
}
break;
@ -986,8 +989,8 @@ void ConnectionCheckPlayCutsceneDuringElevator(void)
gCurrentCutscene = CUTSCENE_MOTHER_BRAIN_CLOSE_UP;
ColorFadingStart(COLOR_FADING_CANCEL);
SoundFade(0x10E, 0xA);
FadeMusic(0xA);
SoundFade(SOUND_ELEVATOR, CONVERT_SECONDS(1.f / 6));
FadeMusic(CONVERT_SECONDS(1.f / 6));
}
break;
@ -997,8 +1000,8 @@ void ConnectionCheckPlayCutsceneDuringElevator(void)
gCurrentCutscene = CUTSCENE_RIDLEY_IN_SPACE;
ColorFadingStart(COLOR_FADING_CANCEL);
SoundFade(0x10E, 0xA);
FadeMusic(0xA);
SoundFade(SOUND_ELEVATOR, CONVERT_SECONDS(1.f / 6));
FadeMusic(CONVERT_SECONDS(1.f / 6));
}
break;
@ -1008,8 +1011,8 @@ void ConnectionCheckPlayCutsceneDuringElevator(void)
gCurrentCutscene = CUTSCENE_RIDLEY_LANDING;
ColorFadingStart(COLOR_FADING_CANCEL);
SoundFade(0x10E, 0xA);
FadeMusic(0xA);
SoundFade(SOUND_ELEVATOR, CONVERT_SECONDS(1.f / 6));
FadeMusic(CONVERT_SECONDS(1.f / 6));
}
break;
@ -1019,8 +1022,8 @@ void ConnectionCheckPlayCutsceneDuringElevator(void)
gCurrentCutscene = CUTSCENE_ENTER_TOURIAN;
ColorFadingStart(COLOR_FADING_CANCEL);
SoundFade(0x10E, 0xA);
FadeMusic(0xA);
SoundFade(SOUND_ELEVATOR, CONVERT_SECONDS(1.f / 6));
FadeMusic(CONVERT_SECONDS(1.f / 6));
}
break;

8
src/cutscenes/cutscene_utils.c
View File

@ -81,10 +81,10 @@ void CutsceneUpdateMusicAfterSkip(void)
break;
case CUTSCENE_RIDLEY_SPAWNING:
SoundPlay(0x24C);
SoundPlay(SOUND_RIDLEY_SPAWN_ROAR);
}
FadeAllSounds(10);
FadeAllSounds(CONVERT_SECONDS(1.f / 6));
}
/**
@ -119,12 +119,12 @@ void CutsceneEnd(void)
case CUTSCENE_STATUE_OPENING:
if (gCurrentArea == AREA_KRAID)
{
SoundStop(0x1C);
SoundStop(MUSIC_STATUE_ROOM_OPENED);
unk_3bd0(MUSIC_KRAID_BATTLE_WITH_INTRO, 60);
}
else if (gCurrentArea == AREA_RIDLEY)
{
SoundStop(0x1C);
SoundStop(MUSIC_STATUE_ROOM_OPENED);
unk_3bd0(MUSIC_RIDLEY_BATTLE, 60);
}
}

6
src/cutscenes/enter_tourian.c
View File

@ -32,7 +32,7 @@ u8 EnterTourianAnimation(void)
case 0:
if (unk_61f44())
{
SoundPlay(0x295);
SoundPlay(SOUND_ENTER_TOURIAN_METROIDS_SUCKING);
CUTSCENE_DATA.timeInfo.timer = 0;
CUTSCENE_DATA.timeInfo.subStage++;
}
@ -61,7 +61,7 @@ u8 EnterTourianAnimation(void)
if (CUTSCENE_DATA.timeInfo.timer == 8)
{
CUTSCENE_DATA.oam[1].actions |= 2;
SoundPlay(0x296);
SoundPlay(SOUND_ENTER_TOURIAN_METROIDS_FLYING);
}
else if (CUTSCENE_DATA.timeInfo.timer == 90)
{
@ -101,7 +101,7 @@ u8 EnterTourianAnimation(void)
case 6:
if (CUTSCENE_DATA.timeInfo.timer > 60)
{
SoundPlay(0x297);
SoundPlay(SOUND_ENTER_TOURIAN_METROID_JUMPSCARE);
CUTSCENE_DATA.timeInfo.timer = 0;
CUTSCENE_DATA.timeInfo.subStage++;
}

5
src/cutscenes/mecha_sees_samus.c
View File

@ -7,6 +7,7 @@
#include "data/cutscenes/mecha_sees_samus_data.h"
#include "data/shortcut_pointers.h"
#include "constants/audio.h"
#include "constants/cutscene.h"
/**
@ -29,7 +30,7 @@ u8 MechaRidleySeesSamusEyeOpen(void)
case 1:
if (CUTSCENE_DATA.timeInfo.timer > 30)
{
SoundPlay(0x293);
SoundPlay(SOUND_MECHA_SEES_SAMUS_EYE_OPENING);
UpdateCutsceneOamDataID(&CUTSCENE_DATA.oam[0], 2);
CUTSCENE_DATA.timeInfo.timer = 0;
CUTSCENE_DATA.timeInfo.subStage++;
@ -47,7 +48,7 @@ u8 MechaRidleySeesSamusEyeOpen(void)
case 3:
if (CUTSCENE_DATA.timeInfo.timer > 4)
{
SoundPlay(0x294);
SoundPlay(SOUND_MECHA_SEES_SAMUS_EYE_FOCUSING);
UpdateCutsceneOamDataID(&CUTSCENE_DATA.oam[1], 4);
CUTSCENE_DATA.timeInfo.timer = 0;
CUTSCENE_DATA.timeInfo.subStage++;

4
src/cutscenes/ridley_in_space.c
View File

@ -100,10 +100,10 @@ u8 RidleyInSpaceShipLeaving(void)
case 1:
if (CUTSCENE_DATA.timeInfo.timer > 60)
{
SoundPlay(0x28E);
SoundPlay(SOUND_RIDLEY_IN_SPACE_MOTHER_SHIP_FLYING);
// Start mother ship animation
CUTSCENE_DATA.oam[RIDLEY_IN_SPACE_MOTHER_SHIP_SLOT].actions = SHIP_ACTION_MOVE_HORIZONTALLY | SHIP_ACTION_MOVE_VERTICALLY;
CUTSCENE_DATA.oam[RIDLEY_IN_SPACE_MOTHER_SHIP_SLOT].actions = MOTHER_SHIP_ACTION_MOVE_HORIZONTALLY | MOTHER_SHIP_ACTION_MOVE_VERTICALLY;
CUTSCENE_DATA.timeInfo.timer = 0;
CUTSCENE_DATA.timeInfo.subStage++;

8
src/cutscenes/ridley_landing.c
View File

@ -52,7 +52,7 @@ u8 RidleyLandingRidleyFlying(void)
case 1:
if (CUTSCENE_DATA.timeInfo.timer > 60)
{
SoundPlay(0x292);
SoundPlay(SOUND_RIDLEY_LANDING_RIDLEY_SCREAMING);
CUTSCENE_DATA.oam[1].actions |= (1 | 2);
CUTSCENE_DATA.timeInfo.timer = 0;
CUTSCENE_DATA.timeInfo.subStage++;
@ -171,7 +171,7 @@ u8 RidleyLandingShipLanding(void)
CUTSCENE_DATA.timeInfo.subStage++;
case 1:
SoundPlay(0x290);
SoundPlay(SOUND_RIDLEY_LANDING_SHIP_LOWERING);
CutsceneStartSpriteEffect(CUTSCENE_DATA.bldcnt, 0, 4, 1);
CutsceneStartBackgroundScrolling(sRidleyLandingScrollingInfo[0], sRidleyLandingPageData[1].bg);
@ -207,7 +207,7 @@ u8 RidleyLandingShipLanding(void)
case 3:
if (!CUTSCENE_DATA.oam[6].actions)
{
SoundPlay(0x291);
SoundPlay(SOUND_RIDLEY_LANDING_SHIP_LANDING);
CUTSCENE_DATA.timeInfo.timer = 0;
CUTSCENE_DATA.timeInfo.subStage++;
}
@ -433,7 +433,7 @@ u8 RidleyLandingInit(void)
UpdateCutsceneOamDataID(&CUTSCENE_DATA.oam[0], RIDLEY_LANDING_OAM_ID_MOTHER_SHIP_IN_SPACE);
PlayMusic(MUSIC_RIDLEY_LANDING, 0);
SoundPlay(0x28F);
SoundPlay(SOUND_RIDLEY_LANDING_SHIP_FLYING);
CUTSCENE_DATA.dispcnt = sRidleyLandingPageData[0].bg | DCNT_OBJ;
CUTSCENE_DATA.timeInfo.timer = 0;

2
src/cutscenes/ridley_spawn.c
View File

@ -98,7 +98,7 @@ void RidleySpawnUpdateRidley(struct CutsceneOamData* pOam)
}
else if (pOam->oamID != RIDLEY_SPAWN_OAM_ID_RIDLEY_SCREAMING && gCurrentOamScaling >= Q_8_8(1.44f))
{
SoundPlay(0x24C); // Ridley cutscene roar
SoundPlay(SOUND_RIDLEY_SPAWN_ROAR);
UpdateCutsceneOamDataID(pOam, RIDLEY_SPAWN_OAM_ID_RIDLEY_SCREAMING);
}
}

5
src/cutscenes/samus_in_blue_ship.c
View File

@ -4,6 +4,7 @@
#include "data/cutscenes/samus_in_blue_ship_data.h"
#include "data/cutscenes/internal_samus_in_blue_ship_data.h"
#include "constants/audio.h"
#include "constants/cutscene.h"
#include "structs/display.h"
@ -45,7 +46,7 @@ u8 SamusInBlueShipPoweringUp(void)
case 3:
if (CUTSCENE_DATA.timeInfo.timer > 30)
{
SoundPlay(0x254);
SoundPlay(SOUND_BLUE_SHIP_POWERING_UP);
CUTSCENE_DATA.graphicsData[0].active = TRUE;
CUTSCENE_DATA.graphicsData[0].timer = 0;
CUTSCENE_DATA.timeInfo.timer = 0;
@ -108,7 +109,7 @@ void SamusInBlueShipUpdateControlPanel(struct CutsceneOamData* pOam)
case 1:
UpdateCutsceneOamDataID(pOam, 2);
SoundPlay(0x253);
SoundPlay(SOUND_BLUE_SHIP_TURNING_ON);
gWrittenToBLDALPHA_L = 16;
gWrittenToBLDALPHA_H = 0;
pOam->actions++;

2
src/cutscenes/statue_opening.c
View File

@ -77,7 +77,7 @@ u8 StatueOpeningOpening(void)
else if (gCurrentArea == AREA_RIDLEY)
UpdateCutsceneOamDataID(&CUTSCENE_DATA.oam[1], STATUE_OPENING_OAM_ID_RIDLEY_ACTIVATING);
SoundPlay(0x231);
SoundPlay(SOUND_STATUE_OPENING_STATUE_ACTIVATING);
CUTSCENE_DATA.timeInfo.subStage++;
CUTSCENE_DATA.timeInfo.timer = 0;
}

3
src/cutscenes/story_text_cutscene.c
View File

@ -7,6 +7,7 @@
#include "data/cutscenes/story_text_cutscene_data.h"
#include "data/cutscenes/internal_story_text_cutscene_data.h"
#include "constants/audio.h"
#include "constants/cutscene.h"
#include "constants/text.h"
@ -186,7 +187,7 @@ u8 StoryTextCutsceneFadeIn(void)
// Check play landing sound effect (footsteps, running...)
if (gCurrentCutscene == CUTSCENE_INTRO_TEXT)
SoundPlay(0x233);
SoundPlay(SOUND_INTRO_TEXT_LANDING);
CUTSCENE_DATA.timeInfo.subStage++;
break;

3
src/data/animated_graphics_data.c
View File

@ -12,6 +12,7 @@
#include "data/tilesets/tilesets_set7.h"
#include "constants/animated_graphics.h"
#include "constants/audio.h"
const struct AnimatedGraphicsData sAnimatedGraphicsEntries[38] = {
@ -506,7 +507,7 @@ const struct BackgroundEffectColorData sBackgroundEffectColorData[9] = {
const u16 sBackgroundEffectBehavior_Lightning[34][3] = {
{ BACKGROUND_EFFECT_COMMAND_WAIT_FOR_TIMER_RANDOM, 60 * 5, 0 },
{ BACKGROUND_EFFECT_COMMAND_PLAY_SOUND, 0, 0xA6 }, // Thunder sound
{ BACKGROUND_EFFECT_COMMAND_PLAY_SOUND, 0, SOUND_THUNDER },
{ BACKGROUND_EFFECT_COMMAND_CHECK_APPLY_FIRST_COLOR, 0, 12 },
{ BACKGROUND_EFFECT_COMMAND_WAIT_FOR_TIMER_BEFORE, 3, 0 },
{ BACKGROUND_EFFECT_COMMAND_CHECK_APPLY_FIRST_COLOR, 0, 8 },

3
src/data/menus/erase_sram_data.c
View File

@ -1,5 +1,6 @@
#include "data/menus/erase_sram_data.h"
#include "macros.h"
#include "constants/audio.h"
#include "constants/menus/erase_sram.h"
const u16 sEraseSramMenuObjectsPal[7 * 16] = INCBIN_U16("data/menus/EraseSram/Objects.pal");
@ -324,7 +325,7 @@ const u8 sEraseSramConfirmWindowNoSelectedOamId = ERASE_SRAM_OAM_ID_CONFIRM_WIND
const u8 sEraseSramConfirmWindowYesSelectedOamId = ERASE_SRAM_OAM_ID_CONFIRM_WINDOW_YES_SELECTED;
const u16 sEraseSramMenuSoundsID[5] = {
0, 0x1FC, 0x208, 0x209, 0x1FA
0, SOUND_ACCEPT_CONFIRM_MENU, SOUND_YES_NO_CURSOR_SELECTING_YES, SOUND_REFUSE_MENU, SOUND_SUB_MENU_CURSOR
};
const u16 sEraseSramMenuCursorPosition[2][2] = {

28
src/data/menus/internal_file_select_data.c
View File

@ -270,18 +270,18 @@ const struct OptionsSubroutineInfo sOptionsSubroutineInfo[9] = {
const u8 sFileSelectDefaultPassword[8] = "--------";
const u16 sMenuSounds[13] = {
[MENU_SOUND_REQUEST_SUB_MENU_CURSOR] = 0x1FA,
[MENU_SOUND_REQUEST_ACCEPT_CONFIRM_MENU] = 0x1FC,
[MENU_SOUND_REQUEST_CURSOR] = 0x1F9,
[MENU_SOUND_REQUEST_FILE_SELECT] = 0x1FB,
[MENU_SOUND_REQUEST_START_GAME] = 0x1FF,
[MENU_SOUND_REQUEST_OPEN_SUB_MENU] = 0x1FD,
[MENU_SOUND_REQUEST_CLOSE_SUB_MENU] = 0x1FE,
[MENU_SOUND_REQUEST_CLOSE_SUB_MENU2] = 0x1FE,
[MENU_SOUND_REQUEST_COPY_DELETE] = 0x20A,
[MENU_SOUND_REQUEST_COPY_DELETE_MOVING] = 0x20B,
[MENU_SOUND_REQUEST_COPY_CONFIRM] = 0x20C,
[MENU_SOUND_REQUEST_GAME_OVER_MENU_CURSOR] = 0x1F9,
[MENU_SOUND_REQUEST_GAME_OVER_START_GAME] = 0x1FF,
const u16 sMenuSounds[MENU_SOUND_REQUEST_END] = {
[MENU_SOUND_REQUEST_SUB_MENU_CURSOR] = SOUND_SUB_MENU_CURSOR,
[MENU_SOUND_REQUEST_ACCEPT_CONFIRM_MENU] = SOUND_ACCEPT_CONFIRM_MENU,
[MENU_SOUND_REQUEST_CURSOR] = SOUND_MENU_CURSOR,
[MENU_SOUND_REQUEST_FILE_SELECT] = SOUND_FILE_SELECT,
[MENU_SOUND_REQUEST_START_GAME] = SOUND_START_GAME,
[MENU_SOUND_REQUEST_OPEN_SUB_MENU] = SOUND_OPEN_SUB_MENU,
[MENU_SOUND_REQUEST_CLOSE_SUB_MENU] = SOUND_CLOSE_SUB_MENU,
[MENU_SOUND_REQUEST_CLOSE_SUB_MENU2] = SOUND_CLOSE_SUB_MENU,
[MENU_SOUND_REQUEST_COPY_DELETE] = SOUND_FILE_SELECT_COPY_DELETE,
[MENU_SOUND_REQUEST_COPY_DELETE_MOVING] = SOUND_FILE_SELECT_COPY_MOVING,
[MENU_SOUND_REQUEST_COPY_CONFIRM] = SOUND_FILE_SELECT_COPY_CONFIRM,
[MENU_SOUND_REQUEST_GAME_OVER_MENU_CURSOR] = SOUND_MENU_CURSOR,
[MENU_SOUND_REQUEST_GAME_OVER_START_GAME] = SOUND_START_GAME,
};

2
src/data/rooms_data.c
View File

@ -17143,7 +17143,7 @@ const struct RoomEntryROM sChozodiaRoomEntries[99] = {
.mapY = 0,
.effect = EFFECT_NONE,
.effectY = UCHAR_MAX,
.musicTrack = MUSIC_UNKNOWN
.musicTrack = MUSIC_54
},
[73] = {
.tileset = 44,

4
src/in_game_cutscene.c
View File

@ -349,9 +349,9 @@ u32 InGameCutsceneUpgradingSuit(u8 cutsceneNumber, u8 cutsceneNumberNoFlag)
gSuitFlashEffect.timer = 0;
if (gCurrentItemBeingAcquired == ITEM_ACQUISITION_VARIA)
SoundPlay(0x222); // Varia upgrade sound
SoundPlay(SOUND_ACQUIRING_VARIA);
else if (gCurrentItemBeingAcquired == ITEM_ACQUISITION_GRAVITY)
SoundPlay(0x223); // Gravity upgrade sound
SoundPlay(SOUND_ACQUIRING_GRAVITY);
changeStage = TRUE;
break;

25
src/intro.c
View File

@ -7,6 +7,7 @@
#include "data/intro_data.h"
#include "data/internal_intro_data.h"
#include "constants/audio.h"
#include "constants/game_state.h"
#include "constants/intro.h"
#include "constants/text.h"
@ -248,7 +249,7 @@ u8 IntroProcessText(u8 action, u16 indent)
else
{
INTRO_DATA.charDrawerX += 8;
SoundPlay(0x226);
SoundPlay(SOUND_INTRO_TEXT_LETTER);
}
return 0;
@ -317,7 +318,7 @@ u8 IntroProcessText(u8 action, u16 indent)
}
if (previousY != INTRO_DATA.charDrawerX && action != INTRO_TEXT_ACTION_SPACE)
SoundPlay(0x226);
SoundPlay(SOUND_INTRO_TEXT_LETTER);
if (flag_unk3 != 0)
return 1;
@ -458,8 +459,8 @@ u8 IntroShipFlyingTowardsCamera(void)
case 1:
INTRO_DATA.dispcnt = DCNT_BG0 | DCNT_OBJ;
SoundPlay(4);
SoundPlay(0x227);
SoundPlay(MUSIC_INTRO);
SoundPlay(SOUND_INTRO_SHIP_FLYING_TOWARDS_CAMERA);
break;
case 0x20:
@ -505,12 +506,12 @@ u8 IntroSamusInHerShip(void)
case 3:
INTRO_DATA.dispcnt = DCNT_BG0;
SoundPlay(0x228);
SoundPlay(SOUND_INTRO_SHIP_INTERIOR);
break;
case 0x50:
INTRO_DATA.dispcnt = 0;
SoundFade(0x228, 0);
SoundFade(SOUND_INTRO_SHIP_INTERIOR, 0);
INTRO_DATA.stage++;
ended = TRUE;
}
@ -697,13 +698,13 @@ u8 IntroViewOfZebes(void)
write16(REG_BLDALPHA, C_16_2_8(7, 9));
INTRO_DATA.dispcnt = DCNT_BG0 | DCNT_OBJ;
INTRO_DATA.bldcnt = BLDCNT_ALPHA_BLENDING_EFFECT | BLDCNT_BG0_SECOND_TARGET_PIXEL | BLDCNT_OBJ_SECOND_TARGET_PIXEL;
SoundPlay(0x229);
SoundPlay(SOUND_INTRO_SHIP_FLYING_DOWN);
break;
case 80:
INTRO_DATA.dispcnt = 0;
INTRO_DATA.bldcnt = 0;
SoundFade(0x229, 0);
SoundFade(SOUND_INTRO_SHIP_FLYING_DOWN, 0);
INTRO_DATA.stage++;
ended = TRUE;
}
@ -810,12 +811,12 @@ u8 IntroMotherBrain(void)
case 3:
DMA_SET(3, sIntroMotherBrainPal, PALRAM_BASE, C_32_2_16(DMA_ENABLE, ARRAY_SIZE(sIntroMotherBrainPal)));
INTRO_DATA.dispcnt = DCNT_BG0;
SoundPlay(0x22A);
SoundPlay(0x39);
SoundPlay(SOUND_INTRO_MOTHER_BRAIN_JAR);
SoundPlay(MUSIC_INTRO_MOTHER_BRAIN);
break;
case 0xBF:
SoundFade(0x22A, 0);
SoundFade(SOUND_INTRO_MOTHER_BRAIN_JAR, 0);
break;
case 0xC0:
@ -889,7 +890,7 @@ u8 IntroFuzz(void)
return TRUE;
case 0:
SoundPlay(0x22B);
SoundPlay(SOUND_INTRO_FUZZ);
break;
case 1:

43
src/menus/file_select.c
View File

@ -516,7 +516,7 @@ void OptionsUpdateCursor(u8 cursorPose)
switch (cursorPose)
{
case CURSOR_OPTIONS_POSE_ENTERING:
SoundPlay(0x1FA);
SoundPlay(SOUND_SUB_MENU_CURSOR);
case CURSOR_OPTIONS_POSE_MOVING:
FILE_SELECT_DATA.optionsOam[OPTIONS_OAM_CURSOR].xPosition = sOptionsCursorPosition[gOptionsOptionSelected][0];
@ -533,7 +533,7 @@ void OptionsUpdateCursor(u8 cursorPose)
break;
case CURSOR_OPTIONS_POSE_SELECTING:
SoundPlay(0x1FC);
SoundPlay(SOUND_ACCEPT_CONFIRM_MENU);
case 4:
if (FILE_SELECT_DATA.optionsOam[OPTIONS_OAM_CURSOR].oamID != OPTIONS_OAM_ID_CURSOR_SELECTED)
@ -885,7 +885,7 @@ u32 FileSelectCopyFileSubroutine(void)
if (gSaveFilesInfo[FILE_SELECT_DATA.copySourceFile].timeAttack)
{
SoundPlay(0x209);
SoundPlay(SOUND_REFUSE_MENU);
unk_790cc(0, 4);
FILE_SELECT_DATA.subroutineStage = 9;
}
@ -920,7 +920,7 @@ u32 FileSelectCopyFileSubroutine(void)
}
else
{
SoundPlay(0x209);
SoundPlay(SOUND_REFUSE_MENU);
FileSelectUpdateCopyCursor(CURSOR_COPY_POSE_DEFAULT, FILE_SELECT_DATA.copySourceFile);
FileSelectUpdateCopyArrow(ARROW_COPY_POSE_KILL, FILE_SELECT_DATA.currentFile);
@ -1011,7 +1011,7 @@ u32 FileSelectCopyFileSubroutine(void)
break;
case 7:
SoundPlay(0x209);
SoundPlay(SOUND_REFUSE_MENU);
unk_7e3fc(4, 0x81);
FileSelectUpdateTilemap(TILEMAP_REQUEST_COPY_OVERRIDE_DESPAWN_INIT);
FILE_SELECT_DATA.subroutineStage++;
@ -1836,7 +1836,7 @@ u32 FileSelectEraseFileSubroutine(void)
}
else if (action == 2)
{
SoundPlay(0x210);
SoundPlay(SOUND_SELECTING_FILE_TO_DELETE);
FileSelectUpdateEraseCursor(CURSOR_ERASE_POSE_SELECTING_FILE, FILE_SELECT_DATA.eraseFile);
FileSelectUpdateTilemap(TILEMAP_REQUEST_ERASE_YES_NO_SPAWN_INIT);
FILE_SELECT_DATA.subroutineStage = 3;
@ -1864,7 +1864,7 @@ u32 FileSelectEraseFileSubroutine(void)
else
{
action = 0x80;
SoundPlay(0x20D);
SoundPlay(SOUND_FILE_DELETE);
FILE_SELECT_DATA.subroutineStage = 7;
}
}
@ -1897,7 +1897,7 @@ u32 FileSelectEraseFileSubroutine(void)
break;
case 5:
SoundPlay(0x209);
SoundPlay(SOUND_REFUSE_MENU);
unk_7e3fc(3, 0x81);
FileSelectUpdateTilemap(TILEMAP_REQUEST_ERASE_YES_NO_DESPAWN_INIT);
FILE_SELECT_DATA.subroutineStage++;
@ -2671,7 +2671,7 @@ u8 OptionsSubroutine(void)
if (gChangedInput & KEY_B)
{
// Set exiting
SoundPlay(0x209);
SoundPlay(SOUND_REFUSE_MENU);
FILE_SELECT_DATA.currentSubMenu = 4;
}
else if (gChangedInput & KEY_A)
@ -2921,7 +2921,7 @@ u8 OptionsStereoSubroutine(void)
if (gChangedInput & (KEY_A | KEY_B))
{
// Exit menu
SoundPlay(0x1FC);
SoundPlay(SOUND_ACCEPT_CONFIRM_MENU);
FILE_SELECT_DATA.subroutineStage++;
break;
}
@ -2948,7 +2948,7 @@ u8 OptionsStereoSubroutine(void)
break;
// Update OAM and apply new choice
SoundPlay(0x1FA);
SoundPlay(SOUND_SUB_MENU_CURSOR);
OptionsUpdateStereoOam(STEREO_UPDATE_FLAGS_SPEAKER_EFFECT);
FileSelectApplyStereo();
break;
@ -2989,7 +2989,7 @@ u8 OptionsSoundTestSubroutine(void)
// Draw number
OptionsSoundTestUpdateIdGfx();
SoundPlay(0x1FD);
SoundPlay(SOUND_OPEN_SUB_MENU);
// Spawn panel
UpdateMenuOamDataID(&FILE_SELECT_DATA.optionsOam[OPTIONS_OAM_SOUND_TEST_PANEL], OPTIONS_OAM_ID_SMALL_PANEL);
@ -3068,7 +3068,7 @@ u8 OptionsSoundTestSubroutine(void)
if (action)
{
SoundPlay(0x20E);
SoundPlay(SOUND_SOUND_TEST_CURSOR_MOVING);
// Play music and update number
PlaySoundTest(sSoundTestSoundIds[FILE_SELECT_DATA.soundTestId]);
OptionsSoundTestUpdateIdGfx();
@ -3109,7 +3109,7 @@ u8 OptionsSoundTestSubroutine(void)
break;
case 6:
SoundPlay(0x1FE);
SoundPlay(SOUND_CLOSE_SUB_MENU);
// Kill number and arrows
UpdateMenuOamDataID(&FILE_SELECT_DATA.optionsOam[OPTIONS_OAM_SOUND_TEST_ID], 0);
@ -3296,7 +3296,7 @@ u8 OptionsTimeAttackRecordsSubroutine(void)
UpdateMenuOamDataID(&FILE_SELECT_DATA.optionsOam[OPTIONS_OAM_HUGE_PANEL], OPTIONS_OAM_ID_HUGE_PANEL);
UpdateMenuOamDataID(&FILE_SELECT_DATA.optionsOam[OPTIONS_OAM_LARGE_PANEL], OPTIONS_OAM_ID_LARGE_PANEL);
SoundPlay(0x1FD);
SoundPlay(SOUND_OPEN_SUB_MENU);
FILE_SELECT_DATA.subroutineStage = 7;
break;
@ -3399,15 +3399,14 @@ u8 OptionsTimeAttackRecordsSubroutine(void)
FILE_SELECT_DATA.optionsOam[OPTIONS_OAM_TIME_ATTACK_LEFT_ARROW].notDrawn = TRUE;
FILE_SELECT_DATA.optionsOam[OPTIONS_OAM_TIME_ATTACK_RIGHT_ARROW].notDrawn = TRUE;
SoundPlay(0x211);
SoundPlay(SOUND_CHANGE_TIME_ATTACK_PANEL);
FILE_SELECT_DATA.dispcnt &= ~(DCNT_BG0 | DCNT_BG1);
FILE_SELECT_DATA.subroutineStage = 7;
break;
case 10:
SoundPlay(0x1FE);
SoundPlay(SOUND_CLOSE_SUB_MENU);
FILE_SELECT_DATA.optionsOam[OPTIONS_OAM_TIME_ATTACK_LEFT_ARROW].notDrawn = TRUE;
FILE_SELECT_DATA.optionsOam[OPTIONS_OAM_TIME_ATTACK_RIGHT_ARROW].notDrawn = TRUE;
@ -5311,7 +5310,7 @@ u8 FileSelectProcessFileSelection(void)
action = 0x80;
if (FILE_SELECT_DATA.fileSelectCursors.confirmOverwritingCompleted != 0)
SoundPlay(0x209);
SoundPlay(SOUND_REFUSE_MENU);
else
FileSelectPlayMenuSound(MENU_SOUND_REQUEST_ACCEPT_CONFIRM_MENU);
@ -5321,7 +5320,7 @@ u8 FileSelectProcessFileSelection(void)
{
FILE_SELECT_DATA.subroutineTimer = 0;
action = 0x81;
SoundPlay(0x209);
SoundPlay(SOUND_REFUSE_MENU);
FILE_SELECT_DATA.subroutineStage = 19;
}
else if (gChangedInput & KEY_LEFT)
@ -7931,7 +7930,7 @@ u32 FileSelectUpdateTilemap(u8 request)
break;
case 0x26:
SoundPlay(0x1FD);
SoundPlay(SOUND_OPEN_SUB_MENU);
FILE_SELECT_DATA.fileScreenOam[FILE_SELECT_OAM_MEDIUM_PANEL].xPosition = BLOCK_SIZE * 5;
FILE_SELECT_DATA.fileScreenOam[FILE_SELECT_OAM_MEDIUM_PANEL].yPosition = BLOCK_SIZE * 2 + HALF_BLOCK_SIZE;
@ -7959,7 +7958,7 @@ u32 FileSelectUpdateTilemap(u8 request)
break;
case 0x28:
SoundPlay(0x1FE);
SoundPlay(SOUND_CLOSE_SUB_MENU);
FILE_SELECT_DATA.dispcnt &= ~DCNT_BG0;
FILE_SELECT_DATA.fileScreenOam[FILE_SELECT_OAM_MEDIUM_PANEL].oamID = FILE_SELECT_OAM_ID_MEDIUM_PANEL + 1;
break;

5
src/menus/pause_screen.c
View File

@ -18,6 +18,7 @@
#include "data/menus/internal_pause_screen_data.h"
#include "data/menus/pause_screen_map_data.h"
#include "constants/audio.h"
#include "constants/connection.h"
#include "constants/event.h"
#include "constants/game_state.h"
@ -3160,7 +3161,7 @@ s32 PauseScreenStatusScreenInit(void)
// Update top overlay
PauseScreenUpdateTopVisorOverlay(OVERLAY_OAM_ID_R_PROMPT_PRESSED);
stage = UCHAR_MAX + 1;
SoundPlay(0x1F4);
SoundPlay(SOUND_OPENING_STATUS_SCREEN);
break;
case 2:
@ -3260,7 +3261,7 @@ s32 PauseScreenQuitStatusScreen(void)
switch (PAUSE_SCREEN_DATA.subroutineInfo.stage)
{
case 0:
SoundPlay(0x1F5);
SoundPlay(SOUND_LEAVING_STATUS_SCREEN);
PAUSE_SCREEN_DATA.miscOam[0].oamID = 0;
PauseScreenUpdateTopVisorOverlay(0);
stage = UCHAR_MAX + 1;

14
src/menus/pause_screen_map.c
View File

@ -8,6 +8,7 @@
#include "data/menus/pause_screen_map_data.h"
#include "data/menus/internal_pause_screen_data.h"
#include "constants/audio.h"
#include "constants/block.h"
#include "constants/connection.h"
#include "constants/minimap.h"
@ -997,9 +998,9 @@ void MapScreenSubroutine(void)
{
// Play movement sound
if (PAUSE_SCREEN_DATA.onWorldMap)
SoundPlay(0x201);
SoundPlay(SOUND_MOVING_MAP_MUFFLED);
else
SoundPlay(0x200);
SoundPlay(SOUND_MOVING_MAP);
}
else if (action == 0)
{
@ -1013,7 +1014,7 @@ void MapScreenSubroutine(void)
else if (gChangedInput & KEY_L)
{
// Easy sleep
SoundPlay(0x205);
SoundPlay(SOUND_OPENING_EASY_SLEEP_SCREEN);
PAUSE_SCREEN_DATA.subroutineInfo.currentSubroutine = PAUSE_SCREEN_SUBROUTINE_EASY_SLEEP_INIT;
action = 2;
}
@ -1027,7 +1028,6 @@ void MapScreenSubroutine(void)
MapScreenTogglehWorldMap(TRUE);
}
}
}
if (action != 0)
@ -1080,7 +1080,7 @@ void MapScreenTogglehWorldMap(u8 forceOff)
// Setup oam
PauseScreenUpdateWorldMap(TRUE);
SoundPlay(0x202);
SoundPlay(SOUND_OPENING_WORLD_MAP);
}
else
{
@ -1091,7 +1091,7 @@ void MapScreenTogglehWorldMap(u8 forceOff)
DmaTransfer(3, &sMinimapTilesPal[1], PALRAM_BASE + 2, sizeof(sMinimapTilesPal) - 2, 16);
if (!forceOff)
SoundPlay(0x203);
SoundPlay(SOUND_CLOSING_WORLD_MAP);
}
PauseScreenUpdateBottomVisorOverlay(1, 0);
@ -1152,7 +1152,7 @@ void MapScreenChangeMap(void)
// Disable samus icon
PAUSE_SCREEN_DATA.samusIconOam[0].exists = FALSE;
PAUSE_SCREEN_DATA.bg3cnt = PAUSE_SCREEN_DATA.unk_6E;
SoundPlay(0x204);
SoundPlay(SOUND_MAP_SCREEN_CHANGE_MAP);
PAUSE_SCREEN_DATA.changingMinimapStage++;
break;

13
src/menus/pause_screen_sub_menus.c
View File

@ -10,6 +10,7 @@
#include "data/menus/pause_screen_sub_menus_data.h"
#include "data/menus/internal_pause_screen_sub_menus_data.h"
#include "constants/audio.h"
#include "constants/connection.h"
#include "constants/event.h"
#include "constants/menus/pause_screen.h"
@ -33,13 +34,13 @@ u32 PauseScreenEasySleepSubroutine(void)
// On NO option
if (gChangedInput & KEY_A)
{
SoundPlay(0x209);
SoundPlay(SOUND_REFUSE_MENU);
action = 2;
}
else if (gChangedInput & KEY_LEFT)
{
// Goto YES option
SoundPlay(0x207);
SoundPlay(SOUND_YES_NO_CURSOR_MOVING);
PAUSE_SCREEN_DATA.subroutineInfo.stage = 1;
PAUSE_SCREEN_DATA.miscOam[1].xPosition = BLOCK_SIZE * 3 + QUARTER_BLOCK_SIZE;
}
@ -54,14 +55,14 @@ u32 PauseScreenEasySleepSubroutine(void)
// On YES option
if (gChangedInput & KEY_A)
{
SoundPlay(0x208);
SoundPlay(SOUND_YES_NO_CURSOR_SELECTING_YES);
PAUSE_SCREEN_DATA.subroutineInfo.stage = 2;
PAUSE_SCREEN_DATA.subroutineInfo.timer = 0;
}
else if (gChangedInput & KEY_RIGHT)
{
// Goto NO option
SoundPlay(0x207);
SoundPlay(SOUND_YES_NO_CURSOR_MOVING);
PAUSE_SCREEN_DATA.subroutineInfo.stage = 0;
PAUSE_SCREEN_DATA.miscOam[1].xPosition = BLOCK_SIZE * 8 + QUARTER_BLOCK_SIZE;
}
@ -116,7 +117,7 @@ u32 PauseScreenEasySleepSubroutine(void)
break;
case 5:
if (gButtonInput == 0)
if (gButtonInput == KEY_NONE)
PAUSE_SCREEN_DATA.subroutineInfo.stage = 0;
break;
}
@ -127,7 +128,7 @@ u32 PauseScreenEasySleepSubroutine(void)
PAUSE_SCREEN_DATA.subroutineInfo.timer = 0;
if (action == 1)
SoundPlay(0x206);
SoundPlay(SOUND_CLOSING_EASY_SLEEP_SCREEN);
}
return action;

27
src/menus/status_screen.c
View File

@ -7,6 +7,7 @@
#include "data/menus/internal_pause_screen_data.h"
#include "data/menus/internal_status_screen_data.h"
#include "constants/audio.h"
#include "constants/connection.h"
#include "constants/demo.h"
#include "constants/samus.h"
@ -1108,7 +1109,7 @@ u32 StatusScreenSuitlessItems(void)
case ITEM_ACQUISITION_GRAVITY:
case ITEM_ACQUISITION_SPACE_JUMP:
// Play unknown item sound
SoundPlay(0x20F);
SoundPlay(SOUND_UNKNOWN_ITEM_ACQUISITION);
break;
case ITEM_ACQUISITION_MISSILES:
@ -1120,7 +1121,7 @@ u32 StatusScreenSuitlessItems(void)
default:
// Play normal item sound
SoundPlay(0x1F7);
SoundPlay(SOUND_TOGGLING_ITEM_ON);
break;
}
@ -1368,7 +1369,7 @@ u32 StatusScreenFullyPoweredItems(void)
if (PAUSE_SCREEN_DATA.subroutineInfo.timer > 30)
{
PAUSE_SCREEN_DATA.statusScreenData.currentStatusSlot = 1;
PAUSE_SCREEN_DATA.unk_EA = TRUE;
PAUSE_SCREEN_DATA.notPlayingEnablingNormalItemSound = TRUE;
PAUSE_SCREEN_DATA.subroutineInfo.timer = 0;
PAUSE_SCREEN_DATA.subroutineInfo.stage++;
}
@ -1379,8 +1380,8 @@ u32 StatusScreenFullyPoweredItems(void)
if (result == 2)
{
PAUSE_SCREEN_DATA.statusScreenData.currentStatusSlot = 1;
if (!PAUSE_SCREEN_DATA.unk_EA)
SoundFade(0x215, 15);
if (!PAUSE_SCREEN_DATA.notPlayingEnablingNormalItemSound)
SoundFade(SOUND_ENABLING_NORMAL_ITEM, CONVERT_SECONDS(.25f));
}
// If it found an unknown item, it'll stay on this stage, if it found a normal item it'll go to stage 3,
@ -1407,10 +1408,10 @@ u32 StatusScreenFullyPoweredItems(void)
PAUSE_SCREEN_DATA.statusScreenData.previousLeftStatusSlot = PAUSE_SCREEN_DATA.statusScreenData.currentStatusSlot;
// Check play sound
if (PAUSE_SCREEN_DATA.unk_EA)
if (PAUSE_SCREEN_DATA.notPlayingEnablingNormalItemSound)
{
SoundPlay(0x215);
PAUSE_SCREEN_DATA.unk_EA = FALSE;
SoundPlay(SOUND_ENABLING_NORMAL_ITEM);
PAUSE_SCREEN_DATA.notPlayingEnablingNormalItemSound = FALSE;
}
// Goto next slot
@ -1456,7 +1457,7 @@ u32 StatusScreenFullyPoweredItems(void)
PAUSE_SCREEN_DATA.statusScreenData.currentStatusSlot].group][2] + 1) * HALF_BLOCK_SIZE;
StatusScreenUpdateUnknownItemPalette(0);
SoundPlay(0x214);
SoundPlay(SOUND_ENABLING_UNKNOWN_ITEM);
PAUSE_SCREEN_DATA.subroutineInfo.stage++;
PAUSE_SCREEN_DATA.subroutineInfo.timer = 0;
break;
@ -1478,7 +1479,7 @@ u32 StatusScreenFullyPoweredItems(void)
// Update cursor
StatusScreenUpdateCursorPosition(PAUSE_SCREEN_DATA.statusScreenData.currentStatusSlot);
UpdateMenuOamDataID(&PAUSE_SCREEN_DATA.miscOam[0], MISC_OAM_ID_ITEM_CURSOR_FOCUSING);
SoundPlay(0x1F7);
SoundPlay(SOUND_TOGGLING_ITEM_ON);
if (PAUSE_SCREEN_DATA.statusScreenData.currentStatusSlot >= 8)
PAUSE_SCREEN_DATA.statusScreenData.previousRightStatusSlot = PAUSE_SCREEN_DATA.statusScreenData.currentStatusSlot;
@ -1591,9 +1592,9 @@ void StatusScreenSubroutine(void)
// Play result sound
if (toggleResult == TRUE)
SoundPlay(0x1F7); // Turning item ON
SoundPlay(SOUND_TOGGLING_ITEM_ON);
else if (toggleResult == FALSE)
SoundPlay(0x1F8); // Turning item OFF
SoundPlay(SOUND_TOGGLING_ITEM_OFF);
}
else
{
@ -2075,7 +2076,7 @@ void StatusScreenMoveCursor(void)
StatusScreenUpdateCursorPosition(statusSlot);
StatusScreenToggleItem(PAUSE_SCREEN_DATA.statusScreenData.currentStatusSlot, ITEM_TOGGLE_CHECKING);
UpdateMenuOamDataID(&PAUSE_SCREEN_DATA.miscOam[0], MISC_OAM_ID_ITEM_CURSOR_FOCUSING);
SoundPlay(0x1F6);
SoundPlay(SOUND_STATUS_SCREEN_CURSOR_MOVING);
}
}

2
src/menus/title_screen.c
View File

@ -936,7 +936,7 @@ u32 TitleScreenSubroutine(void)
UpdateMusicPriority(4);
else
{
SoundPlay(0x213);
SoundPlay(SOUND_TITLE_SCREEN_PRESSING_START);
TITLE_SCREEN_DATA.animatedPalettes[2] = sTitleScreenAnimatedPaletteTemplates[3];
}
gGameModeSub1 = 3;

4
src/music_wrappers.c
View File

@ -257,7 +257,7 @@ void CheckSetNewMusicTrack(u16 musicTrack)
pTrack = sMusicTrackDataRom[0].pTrack;
if (musicTrack == 0)
musicTrack = 0xA9;
musicTrack = SOUND_A9;
newTrack = DetermineNewMusicTrack(musicTrack);
@ -841,7 +841,7 @@ void PlayCurrentMusicTrack(void)
*/
void DecreaseMusicVolume(void)
{
SoundPlay(0x63);
SoundPlay(SOUND_63);
unk_34ac(FALSE);
gMusicInfo.volumeDownFlag |= (1 << 7);

46
src/projectile.c
View File

@ -266,7 +266,7 @@ u32 ProjectileCheckWaveBeamHittingBlocks(struct ProjectileData* pProj)
u8 nbrBlocks;
u8 caa;
const u32 hitboxOffset = BLOCK_SIZE;
const u32 hitboxDiagOffset = FRACT_MUL(hitboxOffset, 7, 10) + ONE_SUB_PIXEL;
const u32 hitboxDiagOffset = hitboxOffset * .7f + ONE_SUB_PIXEL;
nbrBlocks = 0;
caa = CAA_BEAM;
@ -405,10 +405,10 @@ void ProjectileProcessWaveBeam(struct ProjectileData* pProj)
pProj->status |= PROJ_STATUS_Y_FLIP;
case ACD_DIAGONALLY_UP:
pProj->pOam = sWaveBeamOam_Diagonal;
pProj->hitboxTop = -FRACT_MUL(WAVE_BEAM_HITBOX_LEFT, 8, 10);
pProj->hitboxBottom = FRACT_MUL(WAVE_BEAM_HITBOX_RIGHT, 32, 10);
pProj->hitboxLeft = -FRACT_MUL(WAVE_BEAM_HITBOX_TOP, 5, 8);
pProj->hitboxRight = FRACT_MUL(WAVE_BEAM_HITBOX_BOTTOM, 5, 8);
pProj->hitboxTop = -(WAVE_BEAM_HITBOX_LEFT * .8f);
pProj->hitboxBottom = (WAVE_BEAM_HITBOX_RIGHT * 3.2f);
pProj->hitboxLeft = -(WAVE_BEAM_HITBOX_TOP * .625f);
pProj->hitboxRight = (WAVE_BEAM_HITBOX_BOTTOM * .625f);
break;
case ACD_DOWN:
@ -497,10 +497,10 @@ void ProjectileProcessPlasmaBeam(struct ProjectileData* pProj)
if (hasWave)
{
pProj->pOam = sPlasmaBeamOam_Diagonal_Wave;
pProj->hitboxTop = -FRACT_MUL(WAVE_BEAM_HITBOX_LEFT, 8, 10);
pProj->hitboxBottom = FRACT_MUL(WAVE_BEAM_HITBOX_RIGHT, 32, 10);
pProj->hitboxLeft = -FRACT_MUL(WAVE_BEAM_HITBOX_TOP, 3, 4);
pProj->hitboxRight = FRACT_MUL(WAVE_BEAM_HITBOX_BOTTOM, 3, 4);
pProj->hitboxTop = -(WAVE_BEAM_HITBOX_LEFT * .8f);
pProj->hitboxBottom = WAVE_BEAM_HITBOX_RIGHT * 3.2f;
pProj->hitboxLeft = -(WAVE_BEAM_HITBOX_TOP * .75f);
pProj->hitboxRight = (WAVE_BEAM_HITBOX_BOTTOM * .75f);
}
else
{
@ -514,8 +514,8 @@ void ProjectileProcessPlasmaBeam(struct ProjectileData* pProj)
if (hasWave)
{
pProj->pOam = sPlasmaBeamOam_Vertical_Wave;
pProj->hitboxTop = -FRACT_MUL(WAVE_BEAM_HITBOX_LEFT, 16, 10);
pProj->hitboxBottom = FRACT_MUL(WAVE_BEAM_HITBOX_RIGHT, 16, 10);
pProj->hitboxTop = -(WAVE_BEAM_HITBOX_LEFT * 1.6f);
pProj->hitboxBottom = (WAVE_BEAM_HITBOX_RIGHT * 1.6f);
pProj->hitboxLeft = -WAVE_BEAM_HITBOX_TOP;
pProj->hitboxRight = WAVE_BEAM_HITBOX_BOTTOM;
}
@ -532,8 +532,8 @@ void ProjectileProcessPlasmaBeam(struct ProjectileData* pProj)
pProj->pOam = sPlasmaBeamOam_Horizontal_Wave;
pProj->hitboxTop = -WAVE_BEAM_HITBOX_TOP;
pProj->hitboxBottom = WAVE_BEAM_HITBOX_BOTTOM;
pProj->hitboxLeft = -FRACT_MUL(WAVE_BEAM_HITBOX_LEFT, 16, 10);
pProj->hitboxRight = FRACT_MUL(WAVE_BEAM_HITBOX_RIGHT, 16, 10);
pProj->hitboxLeft = -(WAVE_BEAM_HITBOX_LEFT * 1.6f);
pProj->hitboxRight = (WAVE_BEAM_HITBOX_RIGHT * 1.6f);
}
else
{
@ -900,10 +900,10 @@ void ProjectileProcessChargedWaveBeam(struct ProjectileData* pProj)
case ACD_DIAGONALLY_UP:
pProj->pOam = sChargedWaveBeamOam_Diagonal;
pProj->hitboxTop = -FRACT_MUL(CHARGED_WAVE_BEAM_HITBOX_TOP, 10, 45);
pProj->hitboxTop = -(CHARGED_WAVE_BEAM_HITBOX_TOP / 4.5f);
pProj->hitboxBottom = CHARGED_WAVE_BEAM_HITBOX_BOTTOM;
pProj->hitboxLeft = -FRACT_MUL(CHARGED_WAVE_BEAM_HITBOX_LEFT, 24, 10);
pProj->hitboxRight = FRACT_MUL(CHARGED_WAVE_BEAM_HITBOX_RIGHT, 24, 10);
pProj->hitboxLeft = -(CHARGED_WAVE_BEAM_HITBOX_LEFT * 2.4f);
pProj->hitboxRight = (CHARGED_WAVE_BEAM_HITBOX_RIGHT * 2.4f);
break;
case ACD_DOWN:
@ -1006,10 +1006,10 @@ void ProjectileProcessChargedPlasmaBeam(struct ProjectileData* pProj)
{
pProj->pOam = sChargedPlasmaBeamOam_Diagonal_Wave;
pProj->hitboxTop = -FRACT_MUL(CHARGED_WAVE_BEAM_HITBOX_TOP, 10, 45);
pProj->hitboxTop = -(CHARGED_WAVE_BEAM_HITBOX_TOP / 4.5f);
pProj->hitboxBottom = CHARGED_WAVE_BEAM_HITBOX_BOTTOM;
pProj->hitboxLeft = -FRACT_MUL(CHARGED_WAVE_BEAM_HITBOX_LEFT, 28, 10);
pProj->hitboxRight = FRACT_MUL(CHARGED_WAVE_BEAM_HITBOX_RIGHT, 28, 10);
pProj->hitboxLeft = -(CHARGED_WAVE_BEAM_HITBOX_LEFT * 2.8f);
pProj->hitboxRight = (CHARGED_WAVE_BEAM_HITBOX_RIGHT * 2.8f);
}
else
{
@ -1024,8 +1024,8 @@ void ProjectileProcessChargedPlasmaBeam(struct ProjectileData* pProj)
{
pProj->pOam = sChargedPlasmaBeamOam_Vertical_Wave;
pProj->hitboxTop = -FRACT_MUL(CHARGED_WAVE_BEAM_HITBOX_LEFT, 18, 10);
pProj->hitboxBottom = FRACT_MUL(CHARGED_WAVE_BEAM_HITBOX_LEFT, 18, 10);
pProj->hitboxTop = -(CHARGED_WAVE_BEAM_HITBOX_LEFT * 1.8f);
pProj->hitboxBottom = (CHARGED_WAVE_BEAM_HITBOX_LEFT * 1.8f);
pProj->hitboxLeft = -CHARGED_WAVE_BEAM_HITBOX_TOP;
pProj->hitboxRight = CHARGED_WAVE_BEAM_HITBOX_BOTTOM;
}
@ -1043,8 +1043,8 @@ void ProjectileProcessChargedPlasmaBeam(struct ProjectileData* pProj)
pProj->hitboxTop = -CHARGED_WAVE_BEAM_HITBOX_TOP;
pProj->hitboxBottom = CHARGED_WAVE_BEAM_HITBOX_BOTTOM;
pProj->hitboxLeft = -FRACT_MUL(CHARGED_WAVE_BEAM_HITBOX_LEFT, 18, 10);
pProj->hitboxRight = FRACT_MUL(CHARGED_WAVE_BEAM_HITBOX_LEFT, 18, 10);
pProj->hitboxLeft = -(CHARGED_WAVE_BEAM_HITBOX_LEFT * 1.8f);
pProj->hitboxRight = (CHARGED_WAVE_BEAM_HITBOX_LEFT * 1.8f);
}
else
{

8
src/projectile_util.c
View File

@ -838,8 +838,10 @@ void ProjectileMove(struct ProjectileData* pProj, u8 distance)
return;
case ACD_DIAGONALLY_UP:
distance = FRACT_MUL(distance, 7, 10);
distance = FLOAT_MUL(distance, .7f);
pProj->yPosition -= distance;
if (pProj->status & PROJ_STATUS_X_FLIP)
pProj->xPosition += distance;
else
@ -847,8 +849,10 @@ void ProjectileMove(struct ProjectileData* pProj, u8 distance)
break;
case ACD_DIAGONALLY_DOWN:
distance = FRACT_MUL(distance, 7, 10);
distance = FLOAT_MUL(distance, .7f);
pProj->yPosition += distance;
if (pProj->status & PROJ_STATUS_X_FLIP)
pProj->xPosition += distance;
else

4
src/room.c
View File

@ -148,13 +148,13 @@ void RoomLoad(void)
{
if (!(gRainSoundEffect & RAIN_SOUND_ENABLED))
{
SoundFade(0x121, 0xA); // Rain
SoundFade(SOUND_RAIN, CONVERT_SECONDS(1.f / 6));
gRainSoundEffect &= ~RAIN_SOUND_PLAYING;
}
}
else if (gRainSoundEffect & RAIN_SOUND_ENABLED)
{
SoundPlayNotAlreadyPlaying(0x121); // Rain
SoundPlayNotAlreadyPlaying(SOUND_RAIN);
gRainSoundEffect |= RAIN_SOUND_PLAYING;
}
}

2
src/samus.c
View File

@ -5579,7 +5579,7 @@ u8 SamusUsingAnElevator(struct SamusData* pData)
pData->currentAnimationFrame++;
pData->animationDurationCounter = 0;
pData->yVelocity = 0;
SoundFade(0x10E, 10);
SoundFade(SOUND_ELEVATOR, CONVERT_SECONDS(1.f / 6));
}
return SPOSE_NONE;

8
src/sprite_util.c
View File

@ -133,17 +133,17 @@ u8 SpriteUtilTakeDamageFromSprite(u8 kbFlag, struct SpriteData* pSprite, u16 dmg
if ((flags & SMF_ALL_SUITS) == SMF_ALL_SUITS)
{
// Multiply damage by 0.5
damage = FRACT_MUL(damage, 1, 2);
damage /= 2;
}
else if (flags & SMF_GRAVITY_SUIT)
{
// Multiply damage by 0.7
damage = FRACT_MUL(damage, 7, 10);
damage = FLOAT_MUL(damage, .7f);
}
else if (flags & SMF_VARIA_SUIT)
{
// Multiply damage by 0.8
damage = FRACT_MUL(damage, 8, 10);
damage = FLOAT_MUL(damage, .8f);
}
// Apply changes based on difficuly
@ -846,7 +846,7 @@ void SpriteUtilSamusAndSpriteCollision(void)
pSprite->samusCollision = SSC_NONE;
gIgnoreSamusAndSpriteCollision = TRUE;
SamusSetPose(SPOSE_MIDAIR);
SoundPlay(0x1E3);
SoundPlay(SOUND_RIDLEY_GRABBING_SAMUS);
}
else
{

66
src/sprites_AI/acid_worm.c
View File

@ -236,12 +236,12 @@ void AcidWormPlayRetractingSound(void)
if (gSubSpriteData1.workVariable3 == FALSE)
{
// Extended into block
SoundPlay(0x1B0);
SoundPlay(SOUND_ACID_WORM_RETRACT);
}
else
{
// Extended above block
SoundPlay(0x1AC);
SoundPlay(SOUND_ACID_WORM_RETRACT_FROM_SPIT);
}
}
@ -402,11 +402,11 @@ void AcidWormSpawnStart(void)
// Destroy bottom
AcidWormChangeBigBlockDownCcaa(CAA_REMOVE_SOLID);
ScreenShakeStartVertical(60, 0x80 | 1);
ScreenShakeStartHorizontal(60, 0x80 | 1);
ScreenShakeStartVertical(CONVERT_SECONDS(1.f), 0x80 | 1);
ScreenShakeStartHorizontal(CONVERT_SECONDS(1.f), 0x80 | 1);
SoundPlay(0x1A7);
SoundPlay(0x1A8);
SoundPlay(SOUND_ACID_WORM_DESTROYING_BLOCKS);
SoundPlay(SOUND_ACID_WORM_STRAIGHT_EXTEND);
PlayMusic(MUSIC_WORMS_BATTLE, 0);
}
@ -423,20 +423,20 @@ void AcidWormSpawnExtending(void)
oldY = gCurrentSprite.yPosition;
// Check if extended 7 blocks
if (gCurrentSprite.yPosition < gCurrentSprite.yPositionSpawn - (BLOCK_SIZE * 7))
if (gCurrentSprite.yPosition < gCurrentSprite.yPositionSpawn - BLOCK_SIZE * 7)
{
gCurrentSprite.pose = ACID_WORM_POSE_SPAWN_ON_TOP;
gCurrentSprite.pOam = sAcidWormOam_SpawnOnTop;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
SoundPlay(0x1AA);
SoundPlay(SOUND_ACID_WORM_SCREAM);
}
else
{
// Go up and play going out of acid effect
gCurrentSprite.yPosition -= QUARTER_BLOCK_SIZE;
if (SpriteUtilCheckOutOfRoomEffect(oldY, gCurrentSprite.yPosition, gCurrentSprite.xPosition, SPLASH_HUGE))
SoundPlay(0x1BB);
SoundPlay(SOUND_ACID_WORM_SPLASHING);
// Lower acid
gEffectYPositionOffset++;
@ -462,7 +462,7 @@ void AcidWormSpawnStayingOnTop(void)
gCurrentSprite.pOam = sAcidWormOam_MouthClosed;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
SoundPlay(0x1A9);
SoundPlay(SOUND_ACID_WORM_STRAIGHT_GOING_DOWN);
}
}
@ -496,7 +496,7 @@ void AcidWormSpawnRetracting(void)
// Go down
gCurrentSprite.yPosition += QUARTER_BLOCK_SIZE;
if (SpriteUtilCheckInRoomEffect(oldY, gCurrentSprite.yPosition, gCurrentSprite.xPosition, SPLASH_HUGE))
SoundPlay(0x1BB);
SoundPlay(SOUND_ACID_WORM_SPLASHING);
// Check should rise liquid
if (gEffectYPosition > gSubSpriteData1.health)
@ -564,7 +564,7 @@ void AcidWormIdle(void)
gCurrentSprite.pose = ACID_WORM_POSE_CHECK_WARNING_ENDED;
SpriteUtilMakeSpriteFaceSamusDirection();
gCurrentSprite.status &= ~SPRITE_STATUS_FACING_DOWN;
SoundPlay(0x1B5);
SoundPlay(SOUND_ACID_WORM_OPENING_MOUTH);
}
/**
@ -614,14 +614,14 @@ void AcidWormExtend(void)
if (!gSubSpriteData1.workVariable3)
{
if (gCurrentSprite.health <= spawnHealth / 4)
SoundPlay(0x1AF);
SoundPlay(SOUND_ACID_WORM_EXTEND_FAST);
else if (gCurrentSprite.health <= spawnHealth / 2)
SoundPlay(0x1AE);
SoundPlay(SOUND_ACID_WORM_EXTEND_NORMAL);
else
SoundPlay(0x1AD);
SoundPlay(SOUND_ACID_WORM_EXTEND_SLOW);
}
else
SoundPlay(0x1AB);
SoundPlay(SOUND_ACID_WORM_EXTEND_TO_SPIT);
}
return;
@ -683,7 +683,7 @@ void AcidWormExtend(void)
AcidWormHandleRotation();
if (SpriteUtilCheckOutOfRoomEffect(yPosition, gCurrentSprite.yPosition, gCurrentSprite.xPosition, SPLASH_HUGE))
SoundPlay(0x1BB);
SoundPlay(SOUND_ACID_WORM_SPLASHING);
if (!AcidWormCollidingWithSamusWhenExtending() && checks == 3) // Everything done
{
@ -714,7 +714,7 @@ void AcidWormExtend(void)
SpriteDebrisInit(0x0, 0x12, yPosition + 0x40, xPosition);
ParticleSet(yPosition + 0x20, xPosition, PE_SPRITE_EXPLOSION_SINGLE_THEN_BIG);
gCurrentSprite.work0 = 0x78; // Timer to stay
SoundPlay(0x1B3);
SoundPlay(SOUND_ACID_WORM_CRASHING_FAST);
}
else if (gCurrentSprite.health <= spawnHealth / 2)
{
@ -726,7 +726,7 @@ void AcidWormExtend(void)
SpriteDebrisInit(0x0, 0x4, yPosition + 0x20, xPosition + 0x20);
ParticleSet(yPosition + 0x20, xPosition, PE_SPRITE_EXPLOSION_BIG);
gCurrentSprite.work0 = 0x8C; // Timer to stay
SoundPlay(0x1B2);
SoundPlay(SOUND_ACID_WORM_CRASHING_NORMAL);
}
else
{
@ -736,7 +736,7 @@ void AcidWormExtend(void)
SpriteDebrisInit(0x0, 0x4, yPosition + 0x20, xPosition + 0x20);
ParticleSet(yPosition + 0x20, xPosition, PE_SPRITE_EXPLOSION_MEDIUM);
gCurrentSprite.work0 = 0xA0; // Timer to stay
SoundPlay(0x1B1);
SoundPlay(SOUND_ACID_WORM_CRASHING_SLOW);
}
// Update timer based on difficulty
@ -776,7 +776,7 @@ void AcidWormExtended(void)
if (!AcidWormCollidingWithSamusWhenExtending())
{
if (MOD_AND(gCurrentSprite.work1, 32) == 0)
SoundPlay(0x1B4);
SoundPlay(SOUND_ACID_WORM_HOOKED_ON_BLOCK);
gCurrentSprite.work1++;
@ -799,9 +799,9 @@ void AcidWormExtended(void)
finishedThrowing++;
if (gCurrentSprite.currentAnimationFrame == 1 && gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x1B6);
SoundPlay(SOUND_ACID_WORM_OPENING_MOUTH_TO_SPIT);
else if (gCurrentSprite.currentAnimationFrame == 2 && gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x1B7);
SoundPlay(SOUND_ACID_WORM_SPITTING);
else if (gCurrentSprite.currentAnimationFrame == 5 && gCurrentSprite.animationDurationCounter == 1)
{
// First spit
@ -933,7 +933,7 @@ void AcidWormRetracting(void)
AcidWormHandleRotation();
if (SpriteUtilCheckInRoomEffect(spriteY, gCurrentSprite.yPosition, gCurrentSprite.xPosition, SPLASH_HUGE))
SoundPlay(0x1BB);
SoundPlay(SOUND_ACID_WORM_SPLASHING);
samusY = gSamusData.yPosition;
spriteY = gCurrentSprite.yPosition;
@ -954,7 +954,7 @@ void AcidWormRetracting(void)
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.work0 = 40;
SoundPlay(0x1B9);
SoundPlay(SOUND_ACID_WORM_RAISING_ACID);
}
else
{
@ -994,7 +994,7 @@ void AcidWormRaiseAcid(void)
if (gEffectYPosition < gCurrentSprite.yPositionSpawn - BLOCK_SIZE * 5)
{
gCurrentSprite.pose = ACID_WORM_POSE_BRINGING_DOWN_ACID;
SoundPlay(0x1BA);
SoundPlay(SOUND_ACID_WORM_LOWERING_ACID);
}
}
@ -1112,15 +1112,15 @@ void AcidWormDying(void)
gCurrentSprite.work0--;
if (gCurrentSprite.work0 == 0)
SoundPlay(0x1BE);
SoundPlay(SOUND_ACID_WORM_DEAD);
}
else
{
gEffectYPositionOffset++;
if (MOD_AND(gFrameCounter8Bit, 16) == 0)
{
ScreenShakeStartVertical(10, 0x80 | 1);
ScreenShakeStartHorizontal(10, 0x80 | 1);
ScreenShakeStartVertical(CONVERT_SECONDS(1.f / 6), 0x80 | 1);
ScreenShakeStartHorizontal(CONVERT_SECONDS(1.f / 6), 0x80 | 1);
}
}
}
@ -1322,7 +1322,7 @@ void AcidWormBodyMainLoop(void)
gCurrentSprite.pose = 0x67;
gCurrentSprite.samusCollision = SSC_NONE;
gCurrentSprite.health = health;
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
return;
}
@ -1376,7 +1376,7 @@ void AcidWormBodyMainLoop(void)
else if (gSpriteData[slot].health <= DIV_SHIFT(GET_PSPRITE_HEALTH(gSpriteData[slot].spriteId), 2))
gSpriteData[slot].absolutePaletteRow = 1;
SoundPlay(0x1BC);
SoundPlay(SOUND_ACID_WORM_HURT);
}
else
{
@ -1388,7 +1388,7 @@ void AcidWormBodyMainLoop(void)
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
gCurrentSprite.ignoreSamusCollisionTimer = DELTA_TIME;
SoundPlay(0x1BD);
SoundPlay(SOUND_ACID_WORM_DYING);
return;
}
}
@ -1577,7 +1577,7 @@ void AcidWormSpitExplodingGfxInit(void)
gCurrentSprite.pose = 0x43;
gCurrentSprite.bgPriority = MOD_AND(gIoRegistersBackup.BG1CNT, 4);
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
SoundPlay(0x1B8);
SoundPlay(SOUND_ACID_WORM_SPIT_EXPLODING);
}
/**

13
src/sprites_AI/atomic.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/atomic.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/game_state.h"
#include "constants/sprite.h"
@ -293,7 +294,7 @@ void AtomicCheckShootElectricity(void)
{
gCurrentSprite.rotation = sAtomicDynamicPaletteData[offset][1];
if (offset == 0x10 && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x260);
SoundPlayNotAlreadyPlaying(SOUND_260);
}
else
{
@ -624,7 +625,7 @@ void AtomicElectriciytInit(void)
}
/**
* @brief 3c1fc | 1ac |
* @brief 3c1fc | 1ac | Handles an atomic electricy spawning
*
*/
void AtomicElectricitySpawn(void)
@ -651,7 +652,7 @@ void AtomicElectricitySpawn(void)
{
// Charging done, set moving behavior
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x261);
SoundPlayNotAlreadyPlaying(SOUND_ATOMIC_ELECTRICITY_SHOOTING);
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
@ -672,7 +673,7 @@ void AtomicElectricitySpawn(void)
else
gCurrentSprite.status |= SPRITE_STATUS_FACING_DOWN;
if ((spriteY + BLOCK_SIZE) > samusY && (spriteY - BLOCK_SIZE) < samusY)
if (spriteY + BLOCK_SIZE > samusY && spriteY - BLOCK_SIZE < samusY)
{
// Shooting horizontally
gCurrentSprite.pOam = sAtomicElectricityOAM_MovingHorizontal;
@ -786,7 +787,7 @@ void AtomicElectricityMove(void)
else
gCurrentSprite.pOam = sAtomicElectricityOAM_ExplodingDiagonal;
SoundPlay(0x262);
SoundPlay(SOUND_ATOMIC_ELECTRICITY_EXPLODING);
}
}
@ -833,7 +834,7 @@ void Atomic(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x263);
SoundPlayNotAlreadyPlaying(SOUND_ATOMIC_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

13
src/sprites_AI/black_space_pirate.c
View File

@ -5,6 +5,7 @@
#include "data/sprite_data.h"
#include "data/sprites/space_pirate.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/projectile.h"
@ -669,7 +670,7 @@ void BlackSpacePirateJumping(void)
}
if (gCurrentSprite.work3 == 0 && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x166);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_JUMPING);
if (gCurrentSprite.work1 == 1)
{
@ -718,7 +719,7 @@ void BlackSpacePirateJumping(void)
gCurrentSprite.currentAnimationFrame = 0;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x167);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_LANDING);
}
}
else
@ -824,7 +825,7 @@ void BlackSpacePirateWalkingAlerted(void)
if (gCurrentSprite.animationDurationCounter > 5 && (gCurrentSprite.currentAnimationFrame & 3) == 0 && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
{
SoundPlayNotAlreadyPlaying(0x165);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_FOOTSTEPS);
}
}
}
@ -838,7 +839,7 @@ void BlackSpacePirateWalkingAlerted(void)
void BlackSpacePirateDeath(u8 playSound)
{
if (playSound && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x16A);
SoundPlay(SOUND_SPACE_PIRATE_DYING);
SpriteUtilSpriteDeath(DEATH_NORMAL, gCurrentSprite.yPosition - (BLOCK_SIZE + HALF_BLOCK_SIZE),
gCurrentSprite.xPosition, TRUE, PE_SPRITE_EXPLOSION_SINGLE_THEN_BIG);
@ -851,7 +852,7 @@ void BlackSpacePirateDeath(u8 playSound)
void BlackSpacePirateHitByLaserInit(void)
{
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x16A);
SoundPlay(SOUND_SPACE_PIRATE_DYING);
gCurrentSprite.pose = SPACE_PIRATE_POSE_HIT_BY_LASER;
gCurrentSprite.health = 0;
@ -1178,5 +1179,5 @@ void BlackSpacePirate(void)
}
if (!alerted && (gCurrentSprite.status & (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_FACING_DOWN | SPRITE_STATUS_IGNORE_PROJECTILES)) == (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_FACING_DOWN))
SoundPlayNotAlreadyPlaying(0x169);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_GETTING_ALERTED);
}

11
src/sprites_AI/boss_statues.c
View File

@ -3,6 +3,7 @@
#include "data/sprites/boss_statues.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/event.h"
#include "constants/game_state.h"
@ -193,7 +194,7 @@ void KraidStatueCheckBackgroundLocked(void)
u16 distance;
if (gCurrentSprite.currentAnimationFrame == 0 && gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x12A);
SoundPlay(SOUND_BOSS_STATUES_EYE_TURNING_ON);
spriteX = gCurrentSprite.xPosition + HALF_BLOCK_SIZE;
spriteX = SUB_PIXEL_TO_PIXEL(spriteX);
@ -214,7 +215,7 @@ void KraidStatueCheckBackgroundLocked(void)
gCurrentSprite.work1 = 0;
gCurrentSprite.work2 = 0;
SoundPlay(0x12B);
SoundPlay(SOUND_BOSS_STATUES_KRAID_STATUE_OPENING);
BossStatusSetWallBehindSamusCollision(CAA_MAKE_NON_POWER_GRIP);
}
@ -419,7 +420,7 @@ void RidleyStatueCheckBackgroundLocked(void)
u16 distance;
if (gCurrentSprite.currentAnimationFrame == 0 && gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x12A);
SoundPlay(SOUND_BOSS_STATUES_EYE_TURNING_ON);
spriteX = gCurrentSprite.xPosition + HALF_BLOCK_SIZE;
spriteX = SUB_PIXEL_TO_PIXEL(spriteX);
@ -456,7 +457,7 @@ void RidleyStatueOpening(void)
if (gCurrentSprite.work0 != 0)
{
if (gCurrentSprite.currentAnimationFrame == 0 && gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x12A);
SoundPlay(SOUND_BOSS_STATUES_EYE_TURNING_ON);
APPLY_DELTA_TIME_DEC(gCurrentSprite.work0);
if (gCurrentSprite.work0 == 0)
@ -468,7 +469,7 @@ void RidleyStatueOpening(void)
gCurrentSprite.work1 = 0;
gCurrentSprite.work2 = 0;
SoundPlay(0x21C);
SoundPlay(SOUND_BOSS_STATUES_RIDLEY_STATUE_OPENING);
}
}
else

2
src/sprites_AI/chozo_statue.c
View File

@ -531,7 +531,7 @@ void ChozoStatueSittingInit(void)
gSubSpriteData1.currentAnimationFrame = 0;
ChozoStatueStandingChangeCcaa(CAA_REMOVE_SOLID, CAA_REMOVE_SOLID);
SoundPlay(0x11C);
SoundPlay(SOUND_CHOZO_STATUE_SITTING_DOWN);
gSlowScrollingTimer = CONVERT_SECONDS(1.f);
}

42
src/sprites_AI/deorem.c
View File

@ -262,7 +262,7 @@ u8 DeoremCheckLeaving(u8 ramSlot)
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.hitboxBottom = 0x40;
gSpriteData[ramSlot].status |= SPRITE_STATUS_IGNORE_PROJECTILES;
SoundPlay(0x199);
SoundPlay(SOUND_DEOREM_CLOSING_JAW);
}
return TRUE;
@ -459,7 +459,7 @@ void DeoremSpawnGoingDown(void)
SpriteSpawnSecondary(SSPRITE_DEOREM_SEGMENT, 0, gfxRow, ramSlot, yPosition, xPosition, 0);
ScreenShakeStartVertical(0x28, 0x81);
SoundPlay(0x193);
SoundPlay(SOUND_DEOREM_MOVING);
DeoremChangeLeftCcaa(CAA_MAKE_SOLID_GRIPPABLE);
DeoremChangeRightCcaa(CAA_MAKE_SOLID_GRIPPABLE);
@ -497,8 +497,8 @@ void DeoremSpawnGoingDownAnim(void)
if (timer == 0)
{
ParticleSet(yPosition + BLOCK_SIZE, xPosition, PE_TWO_MEDIUM_DUST);
SoundPlay(0x191);
SoundPlay(0x19C);
SoundPlay(SOUND_DEOREM_SPAWN_GOING_DOWN);
SoundPlay(SOUND_DEOREM_SCREAMING);
PlayMusic(MUSIC_WORMS_BATTLE, 0x0);
}
}
@ -520,7 +520,7 @@ void DeoremSpawnGoingDownAnim(void)
}
ScreenShakeStartVertical(0x28, 0x81);
SoundPlay(0x193);
SoundPlay(SOUND_DEOREM_MOVING);
}
}
@ -552,7 +552,7 @@ void DeoremSpawnGoingUp(void)
SpriteSpawnSecondary(SSPRITE_DEOREM_SEGMENT, 0x7, gfxSlot, ramSlot, yPosition, xPosition, 0x0);
SpriteSpawnSecondary(SSPRITE_DEOREM_SEGMENT, 0x6, gfxSlot, ramSlot, yPosition, xPosition, 0x0);
ScreenShakeStartVertical(0x28, 0x81);
SoundPlay(0x193);
SoundPlay(SOUND_DEOREM_MOVING);
}
}
@ -607,7 +607,7 @@ void DeoremSpawnGoingUpAnim(void)
}
ScreenShakeStartVertical(0x28, 0x81);
SoundPlay(0x193);
SoundPlay(SOUND_DEOREM_MOVING);
}
}
@ -694,7 +694,7 @@ void DeoremAfterSpawn(void)
gSpriteData[ramSlot].status &= ~SPRITE_STATUS_IGNORE_PROJECTILES;
SoundPlay(0x198);
SoundPlay(SOUND_DEOREM_OPENING_JAW);
}
}
}
@ -740,7 +740,7 @@ void DeoremMainLoop(void)
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.status &= ~SPRITE_STATUS_MOSAIC;
SoundPlay(0x19D);
SoundPlay(SOUND_DEOREM_WARNING);
gCurrentSprite.rotation = 0;
if (health == 60)
@ -771,7 +771,7 @@ void DeoremMainLoop(void)
gCurrentSprite.hitboxBottom = BLOCK_SIZE;
gSpriteData[spriteOffset].status |= SPRITE_STATUS_IGNORE_PROJECTILES;
SoundPlay(0x199);
SoundPlay(SOUND_DEOREM_CLOSING_JAW);
}
}
}
@ -828,9 +828,9 @@ void DeoremMainLoop(void)
gCurrentSprite.rotation += 1;
if (8 < movement)
SoundPlay(0x194);
SoundPlay(SOUND_DEOREM_MOVEMENT_SMALL);
else
SoundPlay(0x19E);
SoundPlay(SOUND_DEOREM_MOVEMENT_LONG);
}
else
{
@ -842,7 +842,7 @@ void DeoremMainLoop(void)
gCurrentSprite.hitboxBottom = 0;
gSpriteData[spriteOffset].status &= ~SPRITE_STATUS_IGNORE_PROJECTILES;
SoundPlay(0x198);
SoundPlay(SOUND_DEOREM_OPENING_JAW);
}
}
}
@ -878,7 +878,7 @@ void DeoremRetracting(void)
else if (gCurrentSprite.work0 == 0)
{
gCurrentSprite.status &= ~SPRITE_STATUS_FACING_DOWN;
SoundPlay(0x195);
SoundPlay(SOUND_DEOREM_RETRACTED);
}
}
else
@ -940,7 +940,7 @@ void DeoremThrowingThorns(void)
}
if (!(gCurrentSprite.rotation & 15))
SoundPlay(0x196);
SoundPlay(SOUND_DEOREM_THROWING_THORNS);
gCurrentSprite.rotation++;
@ -953,7 +953,7 @@ void DeoremThrowingThorns(void)
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.hitboxBottom = BLOCK_SIZE;
gSpriteData[spriteOffset].status |= SPRITE_STATUS_IGNORE_PROJECTILES;
SoundPlay(0x199);
SoundPlay(SOUND_DEOREM_CLOSING_JAW);
}
else if (gCurrentSprite.pOam == sDeoremOam_Closing
&& SpriteUtilCheckEndCurrentSpriteAnim())
@ -1017,7 +1017,7 @@ void DeoremDying(void)
EventFunction(EVENT_ACTION_SETTING, EVENT_DEOREM_KILLED_AT_SECOND_LOCATION);
}
SoundPlay(0x19B);
SoundPlay(SOUND_DEOREM_DYING);
FadeCurrentMusicAndQueueNextMusic(0x32, MUSIC_BRINSTAR, 0);
}
@ -1143,7 +1143,7 @@ void DeoremLeaving(void)
EventFunction(EVENT_ACTION_CLEARING, EVENT_DEOREM_ENCOUNTERED_AT_FIRST_LOCATION_OR_KILLED);
EventFunction(EVENT_ACTION_SETTING, EVENT_DEOREM_ENCOUNTERED_AT_SECOND_LOCATION_OR_KILLED);
}
SoundPlay(0x192);
SoundPlay(SOUND_DEOREM_LEAVING);
FadeCurrentMusicAndQueueNextMusic(0x32, MUSIC_BRINSTAR, 0);
}
}
@ -2324,7 +2324,7 @@ void DeoremEyeDyingMovingAnim(void)
{
gCurrentSprite.status = 0;
DeoremSpawnChargeBeam(gCurrentSprite.yPosition, gCurrentSprite.xPosition);
SoundPlay(0x221);
SoundPlay(SOUND_DEOREM_SPAWNING_CHARGE_BEAM);
}
}
}
@ -2390,7 +2390,7 @@ void DeoremThornSpawning(void)
if (gCurrentSprite.work3 == 0)
{
gCurrentSprite.pose = 0x23; // TODO: Pose names
SoundPlay(0x197);
SoundPlay(SOUND_DEOREM_THORN_EJECTING);
}
arrayOffset = gCurrentSprite.work3;
@ -2688,7 +2688,7 @@ void DeoremEye(void)
if (gCurrentSprite.health < 0x15)
gSpriteData[ramSlot].absolutePaletteRow = 0x2;
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
SoundPlay(0x19A);
SoundPlay(SOUND_DEOREM_CLOSING_JAW_FAST);
}
}
}

17
src/sprites_AI/dessgeega.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/dessgeega.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/event.h"
#include "constants/particle.h"
@ -131,7 +132,7 @@ void DessgeegaJumpingInit(void)
gCurrentSprite.work2 = FALSE; // High
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x15A);
SoundPlayNotAlreadyPlaying(SOUND_DESSGEEGA_JUMPING);
}
/**
@ -146,7 +147,7 @@ void DessgeegaLandingInit(void)
gCurrentSprite.pOam = sDessgeegaOAM_Landing;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x15B);
SoundPlayNotAlreadyPlaying(SOUND_DESSGEEGA_LANDING);
}
/**
@ -173,7 +174,7 @@ void DessgeegaIdleInit(void)
{
gCurrentSprite.pOam = sDessgeegaOAM_Screaming;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x15C);
SoundPlayNotAlreadyPlaying(SOUND_DESSGEEGA_SCREAMING);
}
}
}
@ -621,7 +622,7 @@ void DessgeegaIdleGround(void)
else
{
if (gCurrentSprite.pOam == sDessgeegaOAM_Screaming && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x15C);
SoundPlayNotAlreadyPlaying(SOUND_DESSGEEGA_SCREAMING);
}
}
}
@ -644,7 +645,7 @@ void DessgeegaIdleCeiling(void)
else
{
if (gCurrentSprite.pOam == sDessgeegaOAM_Screaming && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x15C);
SoundPlayNotAlreadyPlaying(SOUND_DESSGEEGA_SCREAMING);
}
}
}
@ -705,7 +706,7 @@ void DessgeegaLongBeamDetectSamus(void)
SpriteDebrisInit(0x0, 0x7, yPosition + 0x10, xPosition + 0x1A);
SpriteDebrisInit(0x0, 0x8, yPosition + 0x40, xPosition - 0x5A);
SpriteDebrisInit(0x0, 0x6, yPosition + 0x20, xPosition - 0x10);
SoundPlay(0x220);
SoundPlay(SOUND_DESSGEEGA_LONG_BEAM_SPAWNING);
}
}
@ -754,7 +755,7 @@ void DessgeegaLongBeamSpawning(void)
SpriteDebrisInit(0x0, 0x12, yPosition - 0x20, xPosition + 0x3E);
SpriteDebrisInit(0x0, 0x13, yPosition - 0x28, xPosition - 0x5C);
SpriteDebrisInit(0x0, 0x4, yPosition - 0x48, xPosition + 0x1E);
SoundPlay(0x13A);
SoundPlay(SOUND_DESSGEEGA_DESTROYING_FLOOR);
}
else
{
@ -778,7 +779,7 @@ void Dessgeega(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x15D);
SoundPlayNotAlreadyPlaying(SOUND_DESSGEEGA_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

2
src/sprites_AI/dragon.c
View File

@ -326,7 +326,7 @@ void DragonFireballInit(void)
gCurrentSprite.scaling = Q_8_8(1.f);
gCurrentSprite.work3 = 0;
SoundPlay(0x14C);
SoundPlay(SOUND_DRAGON_SPITTING);
}
/**

5
src/sprites_AI/elevator_statue.c
View File

@ -3,6 +3,7 @@
#include "data/sprites/elevator_statue.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/sprite.h"
#include "constants/event.h"
@ -154,7 +155,7 @@ void KraidElevatorStatueDelayBeforeFalling(void)
// Play effects
ScreenShakeStartHorizontal(10, 0x80 | 1);
SoundPlay(0x11E);
SoundPlay(SOUND_KRAID_ELEVATOR_STATUE_CRUMBLING);
}
}
@ -326,7 +327,7 @@ void RidleyElevatorStatueDelayBeforeFalling(void)
// Play effects
ScreenShakeStartHorizontal(10, 0x80 | 1);
SoundPlay(0x11F);
SoundPlay(SOUND_RIDLEY_ELEVATOR_STATUE_CRUMBLING);
}
}

13
src/sprites_AI/enemy_drop.c
View File

@ -3,6 +3,7 @@
#include "data/sprites/enemy_drop.h"
#include "constants/audio.h"
#include "constants/sprite.h"
#include "structs/display.h"
@ -106,7 +107,7 @@ void EnemyDropIdle(void)
if (gEquipment.currentEnergy > gEquipment.maxEnergy)
gEquipment.currentEnergy = gEquipment.maxEnergy;
SoundPlay(0x86);
SoundPlay(SOUND_GETTING_SMALL_ENERGY_DROP);
break;
case SSC_LARGE_ENERGY_DROP:
@ -115,7 +116,7 @@ void EnemyDropIdle(void)
if (gEquipment.currentEnergy > gEquipment.maxEnergy)
gEquipment.currentEnergy = gEquipment.maxEnergy;
SoundPlay(0x87);
SoundPlay(SOUND_GETTING_LARGE_ENERGY_DROP);
break;
case SSC_MISSILE_DROP:
@ -124,7 +125,7 @@ void EnemyDropIdle(void)
if (gEquipment.currentMissiles > gEquipment.maxMissiles)
gEquipment.currentMissiles = gEquipment.maxMissiles;
SoundPlay(0x88);
SoundPlay(SOUND_GETTING_MISSILE_DROP);
break;
case SSC_SUPER_MISSILE_DROP:
@ -133,7 +134,7 @@ void EnemyDropIdle(void)
if (gEquipment.currentSuperMissiles > gEquipment.maxSuperMissiles)
gEquipment.currentSuperMissiles = gEquipment.maxSuperMissiles;
SoundPlay(0x89);
SoundPlay(SOUND_GETTING_SUPER_MISSILE_DROP);
break;
case SSC_POWER_BOMB_DROP:
@ -142,7 +143,7 @@ void EnemyDropIdle(void)
if (gEquipment.currentPowerBombs > gEquipment.maxPowerBombs)
gEquipment.currentPowerBombs = gEquipment.maxPowerBombs;
SoundPlay(0x8A);
SoundPlay(SOUND_GETTING_POWER_BOMB_DROP);
break;
case SSC_MULTIPLE_LARGE_ENERGY_DROP:
@ -151,7 +152,7 @@ void EnemyDropIdle(void)
if (gEquipment.currentEnergy > gEquipment.maxEnergy)
gEquipment.currentEnergy = gEquipment.maxEnergy;
SoundPlay(0x87);
SoundPlay(SOUND_GETTING_LARGE_ENERGY_DROP);
break;
}

3
src/sprites_AI/escape_gate.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/escape_gate.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -138,7 +139,7 @@ void EscapeGate(void)
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.pose = ESCAPE_GATE_POSE_OPENING;
SoundPlay(0x24D);
SoundPlay(SOUND_ESCAPE_GATE_OPENING);
}
break;

15
src/sprites_AI/escape_ship.c
View File

@ -3,10 +3,11 @@
#include "data/sprites/escape_ship.h"
#include "constants/audio.h"
#include "constants/color_fading.h"
#include "constants/event.h"
#include "constants/particle.h"
#include "constants/samus.h"
#include "constants/event.h"
#include "constants/color_fading.h"
#include "constants/sprite.h"
#include "structs/samus.h"
@ -239,7 +240,7 @@ void EscapeShip(void)
SpriteSpawnPrimary(PSPRITE_ESCAPE_SHIP_SPACE_PIRATE, gCurrentSprite.roomSlot,
0x0, gCurrentSprite.yPosition - 4, gCurrentSprite.xPosition + (BLOCK_SIZE * 2 - QUARTER_BLOCK_SIZE), 0);
SoundPlay(0x24E);
SoundPlay(SOUND_ESCAPE_SHIP_OPENING);
}
break;
@ -286,7 +287,7 @@ void EscapeShip(void)
gCurrentSprite.pOam = sEscapeShipOAM_Closing;
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.animationDurationCounter = 0;
SoundPlay(0x24F);
SoundPlay(SOUND_ESCAPE_SHIP_CLOSING);
}
break;
@ -322,7 +323,7 @@ void EscapeShip(void)
{
SpriteSpawnSecondary(SSPRITE_ESCAPE_SHIP_PART, ESCAPE_SHIP_PART_FLAMES,
gCurrentSprite.spritesetGfxSlot, gCurrentSprite.primarySpriteRamSlot, yPosition, xPosition, 0x0);
SoundPlay(0x250);
SoundPlay(SOUND_ESCAPE_SHIP_FLYING);
break;
}
@ -382,7 +383,7 @@ void EscapeShip(void)
gCurrentSprite.pOam = sEscapeShipOAM_Flying;
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.animationDurationCounter = 0;
SoundPlay(0x251);
SoundPlay(SOUND_ESCAPE_SHIP_SHUTTER_OPENING);
}
else if (gCurrentSprite.work0 == 60 + 60 / 3 * 2)
gSubSpriteData1.workVariable3 = 2;
@ -397,7 +398,7 @@ void EscapeShip(void)
gCurrentSprite.pose = ESCAPE_SHIP_POSE_ESCAPING;
gCurrentSprite.yPositionSpawn = 60 * 3 + 60 / 3;
gCurrentSprite.work1 = 4;
SoundPlay(0x252);
SoundPlay(SOUND_ESCAPE_SHIP_FLYING_FAST);
}
}

3
src/sprites_AI/escape_ship_pirate.c
View File

@ -5,6 +5,7 @@
#include "data/sprite_data.h"
#include "data/sprites/space_pirate.h"
#include "constants/audio.h"
#include "constants/sprite.h"
#include "constants/samus.h"
@ -404,5 +405,5 @@ void EscapeShipSpacePirate(void)
}
if (!alerted && (gCurrentSprite.status & (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_FACING_DOWN | SPRITE_STATUS_IGNORE_PROJECTILES)) == (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_FACING_DOWN))
SoundPlayNotAlreadyPlaying(0x169);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_GETTING_ALERTED);
}

20
src/sprites_AI/explosion_zebes_escape.c
View File

@ -1,7 +1,11 @@
#include "sprites_AI/explosion_zebes_escape.h"
#include "data/sprites/enemy_drop.h"
#include "constants/AUDIO.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "structs/bg_clip.h"
#include "structs/sprite.h"
#include "structs/samus.h"
@ -73,13 +77,13 @@ void ExplosionZebesEscape(void)
{
ParticleSet(yPosition - (BLOCK_SIZE * 3 + QUARTER_BLOCK_SIZE + 12) + rngParam1 * 8,
xPosition + (BLOCK_SIZE * 2 + HALF_BLOCK_SIZE) + (rngParam1 << rngParam2), PE_SPRITE_EXPLOSION_HUGE);
SoundPlayNotAlreadyPlaying(0xA4);
SoundPlayNotAlreadyPlaying(SOUND_ZEBES_ESCAPE_EXPLOSION_1);
}
else
{
ParticleSet(yPosition - (BLOCK_SIZE * 3 + HALF_BLOCK_SIZE + 6) + rngParam1 * 8,
xPosition + (rngParam1 << rngParam2), PE_SPRITE_EXPLOSION_SINGLE_THEN_BIG);
SoundPlayNotAlreadyPlaying(0x276);
SoundPlayNotAlreadyPlaying(SOUND_ZEBES_ESCAPE_EXPLOSION_3);
}
}
else
@ -88,13 +92,13 @@ void ExplosionZebesEscape(void)
{
ParticleSet(yPosition - (BLOCK_SIZE * 3 + QUARTER_BLOCK_SIZE + 12) + rngParam1 * 8,
xPosition - (rngParam1 << rngParam2), PE_SPRITE_EXPLOSION_HUGE);
SoundPlayNotAlreadyPlaying(0xA4);
SoundPlayNotAlreadyPlaying(SOUND_ZEBES_ESCAPE_EXPLOSION_1);
}
else
{
ParticleSet(yPosition - (BLOCK_SIZE * 3 + HALF_BLOCK_SIZE + 6) + rngParam1 * 8,
xPosition - (BLOCK_SIZE * 2 + HALF_BLOCK_SIZE) - (rngParam1 << rngParam2), PE_SPRITE_EXPLOSION_BIG);
SoundPlayNotAlreadyPlaying(0x276);
SoundPlayNotAlreadyPlaying(SOUND_ZEBES_ESCAPE_EXPLOSION_3);
}
}
}
@ -109,13 +113,13 @@ void ExplosionZebesEscape(void)
{
ParticleSet(yPosition - (BLOCK_SIZE * 5) + rngParam1 * 16,
xPosition + (BLOCK_SIZE * 3) + (rngParam1 << rngParam2), PE_TWO_MEDIUM_DUST);
SoundPlayNotAlreadyPlaying(0xA5);
SoundPlayNotAlreadyPlaying(SOUND_ZEBES_ESCAPE_EXPLOSION_2);
}
else
{
ParticleSet(yPosition - (BLOCK_SIZE * 4 + QUARTER_BLOCK_SIZE + 8) + rngParam1 * 16,
xPosition + (rngParam1 << rngParam2), PE_MEDIUM_DUST);
SoundPlayNotAlreadyPlaying(0x277);
SoundPlayNotAlreadyPlaying(SOUND_ZEBES_ESCAPE_EXPLOSION_4);
}
}
else
@ -124,13 +128,13 @@ void ExplosionZebesEscape(void)
{
ParticleSet(yPosition - (BLOCK_SIZE * 5 + HALF_BLOCK_SIZE + 8) + rngParam1 * 16,
xPosition - (BLOCK_SIZE * 3) - (rngParam1 << rngParam2), PE_MEDIUM_DUST);
SoundPlayNotAlreadyPlaying(0x277);
SoundPlayNotAlreadyPlaying(SOUND_ZEBES_ESCAPE_EXPLOSION_4);
}
else
{
ParticleSet(yPosition - (BLOCK_SIZE * 4 + HALF_BLOCK_SIZE + 12) + rngParam1 * 16,
xPosition - (rngParam1 << rngParam2), PE_TWO_MEDIUM_DUST);
SoundPlayNotAlreadyPlaying(0xA5);
SoundPlayNotAlreadyPlaying(SOUND_ZEBES_ESCAPE_EXPLOSION_2);
}
}
}

7
src/sprites_AI/falling_chozo_pillar.c
View File

@ -3,6 +3,7 @@
#include "data/sprites/falling_chozo_pillar.h"
#include "constants/audio.h"
#include "constants/particle.h"
#include "constants/sprite.h"
@ -58,7 +59,7 @@ void FallingChozoPillar(void)
{
// Start falling when on screen
gCurrentSprite.pose = FALLING_CHOZO_PILLAR_POSE_FALLING;
SoundPlay(0x10B);
SoundPlay(SOUND_CHOZO_PILLAR_FALLING);
}
break;
@ -95,8 +96,8 @@ void FallingChozoPillar(void)
{
// Unknown, AI doesn't handle this case, most likely removed code
gCurrentSprite.pose = 0x29;
SoundPlay(0xA7);
SoundPlay(SOUND_CHOZO_PILLAR_FELL);
}
break;
}
}
}

13
src/sprites_AI/gadora.c
View File

@ -5,11 +5,12 @@
#include "data/sprites/enemy_drop.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/event.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
#include "constants/event.h"
#include "structs/display.h"
#include "structs/sprite.h"
@ -148,7 +149,7 @@ void GadoraCheckWarningAnimEnded(void)
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
SoundPlay(0x25A);
SoundPlay(SOUND_GADORA_OPENING_EYE);
}
}
@ -199,7 +200,7 @@ void GadoraEyeOpened(void)
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
SoundPlay(0x25B);
SoundPlay(SOUND_GADORA_CLOSING_EYE);
return;
}
@ -371,7 +372,7 @@ void GadoraEye(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x25E);
SoundPlay(SOUND_GADORA_EYE_DAMAGED);
}
ramSlot = gCurrentSprite.primarySpriteRamSlot;
@ -486,7 +487,7 @@ void GadoraBeam(void)
{
gCurrentSprite.work0--;
if (gCurrentSprite.work0 == 0)
SoundPlay(0x25C);
SoundPlay(SOUND_GADORA_BEAM_EMERGING);
}
else
{
@ -500,7 +501,7 @@ void GadoraBeam(void)
PE_SPRITE_EXPLOSION_BIG);
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x25D);
SoundPlay(SOUND_GADORA_BEAM_MOVING);
gCurrentSprite.status = 0;
}

9
src/sprites_AI/gamet.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/gamet.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -101,7 +102,7 @@ void GametIdle(void)
SpriteUtilMakeSpriteFaceSamusXFlip();
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x179);
SoundPlay(SOUND_GAMET_RISING);
if (gCurrentSprite.spriteId == PSPRITE_GAMET_BLUE_LEADER)
{
@ -215,7 +216,7 @@ void GametMove(void)
if (gCurrentSprite.work0 == 0x0)
{
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x17A);
SoundPlay(SOUND_GAMET_MOVING);
gCurrentSprite.work1 = 0x0;
}
@ -247,7 +248,7 @@ void GametMove(void)
}
if (!(gCurrentSprite.work1 & 0xF) && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x17A);
SoundPlay(SOUND_GAMET_MOVING);
}
}
@ -261,7 +262,7 @@ void Gamet(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x17B);
SoundPlayNotAlreadyPlaying(SOUND_GAMET_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

9
src/sprites_AI/geega.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/geega.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -102,7 +103,7 @@ void GeegaIdle(void)
SpriteUtilMakeSpriteFaceSamusXFlip();
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x183);
SoundPlay(SOUND_GEEGA_RISING);
if (gCurrentSprite.spriteId == PSPRITE_GEEGA_LEADER)
{
@ -200,7 +201,7 @@ void GeegaMove(void)
if (gCurrentSprite.work0 == 0x0)
{
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x184);
SoundPlay(SOUND_GEEGA_MOVING);
gCurrentSprite.work1 = 0x0;
}
@ -232,7 +233,7 @@ void GeegaMove(void)
}
if (!(gCurrentSprite.work1 & 0xF) && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x184);
SoundPlay(SOUND_GEEGA_MOVING);
}
}
@ -246,7 +247,7 @@ void Geega(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x185);
SoundPlayNotAlreadyPlaying(SOUND_GEEGA_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

9
src/sprites_AI/geron.c
View File

@ -4,9 +4,10 @@
#include "data/sprites/geron.h"
#include "constants/sprite.h"
#include "constants/event.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/event.h"
#include "constants/sprite.h"
#include "structs/sprite.h"
#include "structs/clipdata.h"
@ -165,7 +166,7 @@ void Geron(void)
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.work0 = 200;
SoundPlayNotAlreadyPlaying(0x26C);
SoundPlayNotAlreadyPlaying(SOUND_GERON_BREAKING);
}
else
{
@ -178,7 +179,7 @@ void Geron(void)
gCurrentSprite.pOam = sGeronOAM_Shaking;
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.animationDurationCounter = 0;
SoundPlayNotAlreadyPlaying(0x26B);
SoundPlayNotAlreadyPlaying(SOUND_GERON_SHAKING);
}
}
else

15
src/sprites_AI/geruta.c
View File

@ -4,8 +4,9 @@
#include "data/sprites/geruta.h"
#include "data/sprite_data.h"
#include "constants/particle.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -150,7 +151,7 @@ void GerutaWarningInit(void)
gCurrentSprite.pOam = sGerutaOAM_Warning;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x150);
SoundPlay(SOUND_GERUTA_WARNING);
}
/**
@ -184,7 +185,7 @@ void GerutaCheckLaunchingAnimEnded(void)
SpriteUtilMakeSpriteFaceSamusDirection();
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x14E);
SoundPlayNotAlreadyPlaying(SOUND_GERUTA_GOING_DOWN);
}
}
@ -224,8 +225,8 @@ void GerutaCheckBouncingAnimEnded(void)
gCurrentSprite.pOam = sGerutaOAM_GoingUp;
gCurrentSprite.status &= ~SPRITE_STATUS_SAMUS_COLLIDING;
if ((gCurrentSprite.status & SPRITE_STATUS_ONSCREEN))
SoundPlayNotAlreadyPlaying(0x14F);
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(SOUND_GERUTA_GOING_UP);
}
}
@ -239,7 +240,7 @@ void GerutaGoingUp(void)
if (GerutaYMovement(0xC))
{
gCurrentSprite.yPosition = (gCurrentSprite.yPosition & BLOCK_POSITION_FLAG);
gCurrentSprite.yPosition += 0x34;
gCurrentSprite.yPosition += 0x34;
gCurrentSprite.pose = GERUTA_POSE_BOUNCING_ON_CEILING;
gCurrentSprite.animationDurationCounter = 0x0;
@ -268,7 +269,7 @@ void Geruta(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x151);
SoundPlayNotAlreadyPlaying(SOUND_GERUTA_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

5
src/sprites_AI/glass_tube.c
View File

@ -2,6 +2,7 @@
#include "data/sprites/glass_tube.h"
#include "constants/audio.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/clipdata.h"
@ -116,7 +117,7 @@ void GlassTubeInit(void)
}
if (!EventFunction(EVENT_ACTION_CHECKING, EVENT_FULLY_POWERED_SUIT_OBTAINED))
SoundPlay(0x122);
SoundPlay(SOUND_RAIN_HITTING_GROUND);
}
/**
@ -179,7 +180,7 @@ void GlassTubeDelayBeforeBreaking(void)
gCurrentSprite.pOam = sGlassTubeOAM_Cracking;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x27A);
SoundPlay(SOUND_GLASS_TUBE_BREAKING);
}
}

39
src/sprites_AI/gunship.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/gunship.h"
#include "constants/audio.h"
#include "constants/color_fading.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -157,7 +158,7 @@ void GunshipInit(void)
{
introCutscene = TRUE;
gCurrentSprite.yPosition -= BLOCK_SIZE * 6;
SoundPlay(0x232);
SoundPlay(SOUND_GUNSHIP_LANDING);
}
gCurrentSprite.properties |= SP_ALWAYS_ACTIVE;
@ -305,15 +306,15 @@ void GunshipSamusEntering(void)
gSpriteData[ramSlot].currentAnimationFrame = 0x0;
gSpriteData[ramSlot].pose = GUNSHIP_PART_POSE_ENTRANCE_BACK_OPENING_CLOSING;
SoundPlay(0x119); // Gunship closing
SoundFade(0x11A, 0xA); // Gunship platform moving
SoundPlay(SOUND_GUNSHIP_CLOSING);
SoundFade(SOUND_GUNSHIP_PLATFORM_MOVING, CONVERT_SECONDS(1.f / 6));
}
}
}
else if (gCurrentSprite.work0 < 0x2C)
gSamusData.yPosition += 0x4; // move samus
else if (gCurrentSprite.work0 == 0x2C)
SoundPlay(0x11A); // Gunship platform moving
SoundPlay(SOUND_GUNSHIP_PLATFORM_MOVING);
}
/**
@ -330,7 +331,7 @@ void GunshipRefill(void)
gCurrentSprite.pOam = sGunshipOAM_Refilling;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x21E);
SoundPlay(SOUND_GUNSHIP_REFILL);
}
}
else if (gCurrentSprite.work0 == 0x5)
@ -390,7 +391,7 @@ void GunshipRefill(void)
gCurrentSprite.rotation = SpriteSpawnPrimary(PSPRITE_ITEM_BANNER, MESSAGE_WEAPONS_AND_ENERGY_RESTORED,
0x6, gCurrentSprite.yPosition, gCurrentSprite.xPosition, 0x0);
SoundFade(0x21E, 0xF);
SoundFade(SOUND_GUNSHIP_REFILL, CONVERT_SECONDS(.25f));
}
}
@ -423,7 +424,7 @@ void GunshipAfterRefill(void)
// Saving
gCurrentSprite.pose = GUNSHIP_POSE_SAVING;
gCurrentSprite.work0 = 0x1E;
SoundPlay(0x21F);
SoundPlay(SOUND_GUNSHIP_SAVING);
}
else
{
@ -479,7 +480,7 @@ void GunshipSamusLeave(void)
{
gCurrentSprite.pose = GUNSHIP_POSE_SAMUS_LEAVING;
gCurrentSprite.work0 = 0x2C;
SoundPlay(0x11A); // Gunship platform moving
SoundPlay(SOUND_GUNSHIP_PLATFORM_MOVING);
}
else if (gCurrentSprite.work0 == 0xA)
{
@ -502,7 +503,7 @@ void GunshipSamusLeave(void)
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x118); // Gunship opening
SoundPlay(SOUND_GUNSHIP_OPENING);
}
}
}
@ -524,7 +525,7 @@ void GunshipSamusLeaving(void)
}
else
gCurrentSprite.pose = GUNSHIP_POSE_RELEASE_SAMUS;
SoundFade(0x11A, 0xA);
SoundFade(SOUND_GUNSHIP_PLATFORM_MOVING, CONVERT_SECONDS(1.f / 6));
}
else
gSamusData.yPosition -= 0x4;
@ -585,7 +586,7 @@ void GunshipCheckEscapeZebes(void)
// Set event and update minimap
EventFunction(EVENT_ACTION_SETTING, EVENT_ESCAPED_ZEBES);
MinimapUpdateChunk(EVENT_ESCAPED_ZEBES);
SoundFade(0x120, 0x3C);
SoundFade(SOUND_ESCAPE_BEEP, CONVERT_SECONDS(1.f));
UpdateMusicPriority(0x0);
}
}
@ -625,8 +626,8 @@ void GunshipSamusEnteringWhenEscaping(void)
{
gSpriteData[ramSlot].status = 0x0;
SoundPlay(0x119); // Gunship closing
SoundFade(0x11A, 0xA); // Gunship platform moving
SoundPlay(SOUND_GUNSHIP_CLOSING);
SoundFade(SOUND_GUNSHIP_PLATFORM_MOVING, CONVERT_SECONDS(1.f / 6));
}
}
}
@ -634,7 +635,7 @@ void GunshipSamusEnteringWhenEscaping(void)
else if (gCurrentSprite.work0 < 0x2C)
gSamusData.yPosition += 0x4;
else if (gCurrentSprite.work0 == 0x2C)
SoundPlay(0x11A); // Gunship platform moving
SoundPlay(SOUND_GUNSHIP_PLATFORM_MOVING);
}
/**
@ -660,7 +661,7 @@ void GunshipStartEscaping(void)
gCurrentSprite.pOam = sGunshipOAM_Flying;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x234);
SoundPlay(SOUND_GUNSHIP_FLYING_OFF);
}
}
@ -1031,7 +1032,7 @@ void GunshipPartEntranceBackIdle(void)
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x118); // Ship opening
SoundPlay(SOUND_GUNSHIP_OPENING);
}
else if (gCurrentSprite.pOam == sGunshipPartOAM_EntranceBackOpening)
{
@ -1049,7 +1050,7 @@ void GunshipPartEntranceBackIdle(void)
gCurrentSprite.pOam = sGunshipPartOAM_EntranceBackOpening;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x118); // Ship opening
SoundPlay(SOUND_GUNSHIP_OPENING);
}
}
}
@ -1060,7 +1061,7 @@ void GunshipPartEntranceBackIdle(void)
gCurrentSprite.pOam = sGunshipPartOAM_EntranceBackClosing;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x119); // Ship closing
SoundPlay(SOUND_GUNSHIP_CLOSING);
}
else if (gCurrentSprite.pOam == sGunshipPartOAM_EntranceBackClosing)
{
@ -1078,7 +1079,7 @@ void GunshipPartEntranceBackIdle(void)
gCurrentSprite.pOam = sGunshipPartOAM_EntranceBackClosing;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x119); // Ship closing
SoundPlay(SOUND_GUNSHIP_CLOSING);
}
}
}

13
src/sprites_AI/hive.c
View File

@ -4,9 +4,10 @@
#include "data/sprites/hive.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/event.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/event.h"
#include "constants/sprite_util.h"
#include "structs/bg_clip.h"
@ -131,7 +132,7 @@ void HivePhase1(void)
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.pose = 0x23;
SoundPlayNotAlreadyPlaying(0x160);
SoundPlayNotAlreadyPlaying(SOUND_HIVE_SHRINKING);
HiveSpawnParticle();
}
}
@ -155,7 +156,7 @@ void HivePhase2(void)
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.pose = 0x25;
SoundPlayNotAlreadyPlaying(0x160);
SoundPlayNotAlreadyPlaying(SOUND_HIVE_SHRINKING);
HiveSpawnParticle();
}
}
@ -226,7 +227,7 @@ void HiveDying(void)
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.samusCollision = SSC_NONE;
SoundPlayNotAlreadyPlaying(0x161);
SoundPlayNotAlreadyPlaying(SOUND_HIVE_DEAD);
HiveSpawnParticle();
}
}
@ -706,7 +707,7 @@ void MellowMove(struct SpriteData* pSprite)
{
pSprite->scaling = 32;
if (pSprite->status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x15E);
SoundPlayNotAlreadyPlaying(SOUND_MELLOW_MOVING);
}
}
#else
@ -1351,7 +1352,7 @@ void Mellow(void)
{
pSprite->properties &= ~SP_DAMAGED;
if (pSprite->status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x15F);
SoundPlayNotAlreadyPlaying(SOUND_MELLOW_DAMAGED);
}
if (pSprite->freezeTimer != 0x0)

9
src/sprites_AI/holtz.c
View File

@ -4,8 +4,9 @@
#include "data/sprites/holtz.h"
#include "data/sprite_data.h"
#include "constants/particle.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -229,7 +230,7 @@ void HoltzCheckWarningAnimEnded(void)
gCurrentSprite.work0 = 0x0;
gCurrentSprite.work2 = 0x2; // Initial X speed
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x186);
SoundPlayNotAlreadyPlaying(SOUND_HOLTZ_GOING_DOWN);
}
}
@ -286,7 +287,7 @@ void HoltzGoingUpMove(void)
(gCurrentSprite.currentAnimationFrame == 0x0 || gCurrentSprite.currentAnimationFrame == 0x3)
&& gCurrentSprite.animationDurationCounter == 0x1)
{
SoundPlayNotAlreadyPlaying(0x187);
SoundPlayNotAlreadyPlaying(SOUND_HOLTZ_GOING_UP);
}
// Gradually decrease X movement
@ -342,7 +343,7 @@ void Holtz(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x188);
SoundPlayNotAlreadyPlaying(SOUND_HOLTZ_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

38
src/sprites_AI/imago.c
View File

@ -835,7 +835,7 @@ void ImagoChargeThroughWall(void)
ClipdataProcess(yPosition + BLOCK_SIZE * 8, xPosition + BLOCK_SIZE * 1);
ParticleSet(yPosition + BLOCK_SIZE * 7, xPosition + BLOCK_SIZE * 1, PE_SPRITE_EXPLOSION_HUGE);
SoundPlay(0xC4);
SoundPlay(SOUND_IMAGO_DESTROYING_WALL);
}
else
gSubSpriteData1.xPosition -= 0x10; // Move
@ -1028,7 +1028,7 @@ void ImagoDying(void)
ParticleSet(gSubSpriteData1.yPosition + QUARTER_BLOCK_SIZE, gSubSpriteData1.xPosition - 0xAC, PE_SPRITE_EXPLOSION_HUGE);
gCurrentSprite.pose = IMAGO_POSE_SET_EVENT;
gCurrentSprite.status |= (SPRITE_STATUS_NOT_DRAWN | SPRITE_STATUS_IGNORE_PROJECTILES);
SoundPlay(0xC5);
SoundPlay(SOUND_IMAGO_DYING);
PlayMusic(MUSIC_BOSS_KILLED, 0);
}
}
@ -1217,7 +1217,7 @@ void Imago(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0xC3);
SoundPlayNotAlreadyPlaying(SOUND_IMAGO_DAMAGED);
}
if (!(gFrameCounter8Bit & 15))
@ -1238,21 +1238,21 @@ void Imago(void)
if (!(gCurrentSprite.status & SPRITE_STATUS_ONSCREEN) || yDistance > BLOCK_SIZE * 8 - QUARTER_BLOCK_SIZE + 4)
{
gSamusData.yPosition += 0; // Needed to produce matching ASM.
SoundPlay(0xB5);
SoundPlay(SOUND_IMAGO_BUZZING_FAR_RIGHT);
if (health == 0)
SoundPlay(0xBB);
SoundPlay(SOUND_IMAGO_BURNING_FAR_RIGHT);
}
else if (xDistance < BLOCK_SIZE * 4 - QUARTER_BLOCK_SIZE + 10)
{
SoundPlay(0xB9);
SoundPlay(SOUND_IMAGO_BUZZING_CLOSE_RIGHT);
if (health == 0)
SoundPlay(0xBF);
SoundPlay(SOUND_IMAGO_BURNING_CLOSE_RIGHT);
}
else
{
SoundPlay(0xB7);
SoundPlay(SOUND_IMAGO_BUZZING_NEAR_RIGHT);
if (health == 0)
SoundPlay(0xBD);
SoundPlay(SOUND_IMAGO_BURNING_NEAR_RIGHT);
}
}
else
@ -1260,21 +1260,21 @@ void Imago(void)
xDistance = gSamusData.xPosition - gSubSpriteData1.xPosition;
if (!(gCurrentSprite.status & SPRITE_STATUS_ONSCREEN) || yDistance > BLOCK_SIZE * 8 - QUARTER_BLOCK_SIZE + 4)
{
SoundPlay(0xB4);
SoundPlay(SOUND_IMAGO_BUZZING_FAR_LEFT);
if (health == 0)
SoundPlay(0xBA);
SoundPlay(SOUND_IMAGO_BURNING_FAR_LEFT);
}
else if (xDistance < BLOCK_SIZE * 4 - QUARTER_BLOCK_SIZE + 10)
{
SoundPlay(0xB8);
SoundPlay(SOUND_IMAGO_BUZZING_CLOSE_LEFT);
if (health == 0)
SoundPlay(0xBE);
SoundPlay(SOUND_IMAGO_BURNING_CLOSE_LEFT);
}
else
{
SoundPlay(0xB6);
SoundPlay(SOUND_IMAGO_BUZZING_NEAR_LEFT);
if (health == 0)
SoundPlay(0xBC);
SoundPlay(SOUND_IMAGO_BURNING_NEAR_LEFT);
}
}
}
@ -1506,7 +1506,7 @@ void ImagoNeedle(void)
gCurrentSprite.samusCollision = SSC_HURTS_SAMUS_STOP_DIES_WHEN_HIT;
gCurrentSprite.pose = IMAGO_NEEDLE_POSE_MOVING;
SoundPlay(0xC0);
SoundPlay(SOUND_IMAGO_NEEDLE_SHOT);
break;
case IMAGO_NEEDLE_POSE_MOVING:
@ -1568,7 +1568,7 @@ void ImagoDamagedStinger(void)
gCurrentSprite.work0 = 0;
gCurrentSprite.work2 = 0xA;
gCurrentSprite.work3 = 0;
SoundPlay(0xC1);
SoundPlay(SOUND_IMAGO_DAMAGED_STINGER_DETACHING);
case IMAGO_DAMAGED_STINGER_POSE_FALLING:
if (!(gCurrentSprite.work0 & 0x7))
@ -1605,7 +1605,7 @@ void ImagoDamagedStinger(void)
{
ParticleSet(gCurrentSprite.yPosition - HALF_BLOCK_SIZE, gCurrentSprite.xPosition, PE_SPRITE_EXPLOSION_SINGLE_THEN_BIG);
gCurrentSprite.status = 0;
SoundPlay(0xC2);
SoundPlay(SOUND_IMAGO_DAMAGED_STINGER_EXPLODING);
}
else if (gCurrentSprite.work0 < 0x29 && !(gCurrentSprite.work0 & 0x3))
{
@ -1659,7 +1659,7 @@ void ImagoEgg(void)
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
gCurrentSprite.health = 0;
SoundPlay(0xB3);
SoundPlay(SOUND_IMAGO_EGG_BREAKING);
// Set last egg broken flag
if (gCurrentSprite.roomSlot == IMAGO_EGG_PART_LAST)
gSubSpriteData1.workVariable3 = TRUE;

28
src/sprites_AI/imago_cocoon.c
View File

@ -333,9 +333,9 @@ void ImagoCocoonIdle(void)
{
switch (caf)
{
case 0x0:
case 0x2:
SoundPlay(0x19F);
case 0:
case 2:
SoundPlay(SOUND_IMAGO_COCOON_IDLE);
}
}
@ -368,7 +368,7 @@ void ImagoCocoonIdle(void)
// Set falling
EventFunction(EVENT_ACTION_SETTING, EVENT_IMAGO_COCOON_KILLED);
SoundPlay(0x1A3);
SoundPlay(SOUND_IMAGO_COCOON_VINES_CRACKING);
}
}
@ -394,13 +394,13 @@ void ImagoCocoonFallingBeforeBlocks(void)
SpriteUtilCheckCollisionAtPosition(yPosition, xPosition);
if (gPreviousCollisionCheck & 0xF0) // Check for solid collision
{
ImagoCocoonChangeOneCcaa(CAA_REMOVE_SOLID); // Remove middile block
ImagoCocoonChangeOneCcaa(CAA_REMOVE_SOLID); // Remove middle block
// Set falling after blocks
gCurrentSprite.pose = IMAGO_COCOON_POSE_FALLING_AFTER_BLOCKS;
gCurrentSprite.work0 = 0x0;
ScreenShakeStartVertical(0x28, 0x81);
SoundPlay(0x1A4);
SoundPlay(SOUND_IMAGO_COCOON_DESTROYING_BLOCKS);
}
}
else
@ -487,7 +487,7 @@ void ImagoCocoonFallingAfterBlocks(void)
gCurrentSprite.work0 = 0x5A;
ScreenShakeStartVertical(0x28, 0x81);
SoundPlay(0x1A5);
SoundPlay(SOUND_IMAGO_COCOON_CRASHING);
gCurrentSprite.scaling = Q_8_8(1.f);
gCurrentSprite.work2 = FALSE;
@ -535,7 +535,7 @@ void ImagoCocoonInGround(void)
else
{
gCurrentSprite.work2 = FALSE;
SoundPlay(0x1A6);
SoundPlay(SOUND_IMAGO_COCOON_IN_GROUND);
}
}
else
@ -725,7 +725,7 @@ void ImagoCocoonVineCheckPlayDamagedSound(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x1A2);
SoundPlayNotAlreadyPlaying(SOUND_IMAGO_COCOON_VINE_DAMAGED);
}
}
@ -940,7 +940,7 @@ void ImagoCocoonSporeSpawning(void)
{
if (gCurrentSprite.roomSlot == 0x0 && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN &&
gCurrentSprite.currentAnimationFrame == 0x0 && gCurrentSprite.animationDurationCounter == 0x1)
SoundPlay(0x1A0);
SoundPlay(SOUND_IMAGO_COCOON_SPORE_SPAWNING);
if (SpriteUtilCheckEndCurrentSpriteAnim())
{
@ -979,7 +979,7 @@ void ImagoCocoonSporeNest(void)
gCurrentSprite.pose = IMAGO_COCOON_SPORE_POSE_MOVING;
if (gCurrentSprite.roomSlot == IMAGO_COCOON_SPORE_PART_DOWN && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x1A1);
SoundPlay(SOUND_IMAGO_COCOON_SPORE_NEST_SPAWNING);
}
}
}
@ -1611,9 +1611,9 @@ void ImagoCocoonAfterFight(void)
{
switch (gCurrentSprite.currentAnimationFrame)
{
case 0x0:
case 0x4:
SoundPlay(0x212);
case 0:
case 4:
SoundPlay(SOUND_IMAGO_COCOON_IN_GROUND_IDLE);
}
}
}

26
src/sprites_AI/imago_larva.c
View File

@ -303,7 +303,7 @@ void ImagoLarvaWarningInit(struct SubSpriteData* pSub)
gCurrentSprite.work0 = 60;
pSub->workVariable1 = 0;
SoundPlay(0xAD);
SoundPlay(SOUND_IMAGO_LARVA_WARNING);
}
/**
@ -331,7 +331,7 @@ void ImagoLarvaAttackingInit(struct SubSpriteData* pSub)
pSub->currentAnimationFrame = 0;
gCurrentSprite.pose = IMAGO_LARVA_POSE_ATTACKING;
SoundPlay(0xAE);
SoundPlay(SOUND_IMAGO_LARVA_ATTACKING);
}
/**
@ -351,7 +351,7 @@ void ImagoLarvaAttacking(struct SubSpriteData* pSub)
// Reached spawn position, set idle
pSub->xPosition = gCurrentSprite.xPositionSpawn;
gCurrentSprite.pose = IMAGO_LARVA_POSE_IDLE_INIT;
SoundFade(0xAE, 10);
SoundFade(SOUND_IMAGO_LARVA_ATTACKING, CONVERT_SECONDS(1.f / 6));
}
}
else
@ -362,7 +362,7 @@ void ImagoLarvaAttacking(struct SubSpriteData* pSub)
// Reached spawn position, set idle
pSub->xPosition = gCurrentSprite.xPositionSpawn;
gCurrentSprite.pose = IMAGO_LARVA_POSE_IDLE_INIT;
SoundFade(0xAE, 10);
SoundFade(SOUND_IMAGO_LARVA_ATTACKING, CONVERT_SECONDS(1.f / 6));
}
}
}
@ -384,7 +384,7 @@ void ImagoLarvaTakingDamageInit(struct SubSpriteData* pSub)
gCurrentSprite.work0 = 47;
pSub->workVariable1 = 0;
SoundFade(0xAE, 10);
SoundFade(SOUND_IMAGO_LARVA_ATTACKING, CONVERT_SECONDS(1.f / 6));
}
/**
@ -413,17 +413,17 @@ void ImagoLarvaDyingInit(struct SubSpriteData* pSub)
gCurrentSprite.pose = IMAGO_LARVA_POSE_DYING;
// Death animation lasts for 100 frames
gCurrentSprite.work0 = 100;
gCurrentSprite.work0 = CONVERT_SECONDS(1.f) + TWO_THIRD_SECOND;
SPRITE_CLEAR_AND_SET_ISFT(gCurrentSprite, gCurrentSprite.work0);
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
gCurrentSprite.health = 1;
SoundFade(0xAE, 10);
SoundPlay(0xB0);
SoundFade(SOUND_IMAGO_LARVA_ATTACKING, CONVERT_SECONDS(1.f / 6));
SoundPlay(SOUND_IMAGO_LARVA_DYING);
if (gCurrentSprite.spriteId == PSPRITE_IMAGO_LARVA_RIGHT)
FadeMusic(10);
FadeMusic(CONVERT_SECONDS(1.f / 6));
}
/**
@ -613,7 +613,7 @@ void ImagoLarvaPartShellIdle(struct SubSpriteData* pSub)
if (MOD_AND(gCurrentSprite.currentAnimationFrame, 2) && gCurrentSprite.animationDurationCounter == 1)
{
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0xAA);
SoundPlay(SOUND_IMAGO_LARVA_IDLE);
}
}
@ -658,9 +658,9 @@ void ImagoLarvaPartShellIdle(struct SubSpriteData* pSub)
speed = 1;
if (speed > 1)
SoundPlay(0xAC);
SoundPlay(SOUND_IMAGO_LARVA_CRAWLING_FAST);
else
SoundPlay(0xAB);
SoundPlay(SOUND_IMAGO_LARVA_CRAWLING_SLOW);
// Update retreating counter
if (pSub->workVariable1 < 8)
@ -881,7 +881,7 @@ void ImagoLarva(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0xAF);
SoundPlay(SOUND_IMAGO_LARVA_DAMAGED);
}
// Check took damage

44
src/sprites_AI/imago_larva_right_side.c
View File

@ -1,6 +1,11 @@
#include "sprites_AI/imago_larva_right_side.h"
#include "macros.h"
#include "data/sprites/imago_larva_right_side.h"
#include "constants/audio.h"
#include "constants/sprite.h"
#include "structs/sprite.h"
/**
@ -15,38 +20,39 @@ void ImagoLarvaRightSide(void)
{
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
gCurrentSprite.hitboxTop = -0x4;
gCurrentSprite.hitboxBottom = 0x4;
gCurrentSprite.hitboxLeft = -0x4;
gCurrentSprite.hitboxRight = 0x4;
gCurrentSprite.hitboxTop = -PIXEL_SIZE;
gCurrentSprite.hitboxBottom = PIXEL_SIZE;
gCurrentSprite.hitboxLeft = -PIXEL_SIZE;
gCurrentSprite.hitboxRight = PIXEL_SIZE;
gCurrentSprite.drawDistanceTop = 0x30;
gCurrentSprite.drawDistanceBottom = 0x8;
gCurrentSprite.drawDistanceHorizontal = 0x30;
gCurrentSprite.drawDistanceTop = SUB_PIXEL_TO_PIXEL(BLOCK_SIZE * 3);
gCurrentSprite.drawDistanceBottom = SUB_PIXEL_TO_PIXEL(HALF_BLOCK_SIZE);
gCurrentSprite.drawDistanceHorizontal = SUB_PIXEL_TO_PIXEL(BLOCK_SIZE * 3);
gCurrentSprite.samusCollision = SSC_NONE;
gCurrentSprite.pOam = sImagoLarvaRightSideOAM;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.pose = 0x9;
}
if (gCurrentSprite.animationDurationCounter == 0x1)
if (gCurrentSprite.animationDurationCounter == 1)
{
switch (gCurrentSprite.currentAnimationFrame)
{
case 0x0:
SoundPlay(0xB1);
case 0:
SoundPlay(SOUND_IMAGO_LARVA_RIGHT_SIDE_SHAKING);
break;
case 0xB:
case 0xF:
case 0x13:
case 0x17:
case 0x1B:
case 0x1F:
SoundPlay(0xB2);
case 11:
case 15:
case 19:
case 23:
case 27:
case 31:
SoundPlay(SOUND_IMAGO_LARVA_RIGHT_SIDE_CORE_BEATING);
}
}
}

8
src/sprites_AI/item_banner.c
View File

@ -399,7 +399,7 @@ void SaveYesNoCursor(void)
// Check not already on left
if (gCurrentSprite.xPosition != SAVE_YES_NO_CURSOR_LEFT_POSITION)
{
SoundPlay(0x207);
SoundPlay(SOUND_YES_NO_CURSOR_MOVING);
gCurrentSprite.xPosition = SAVE_YES_NO_CURSOR_LEFT_POSITION;
}
}
@ -408,7 +408,7 @@ void SaveYesNoCursor(void)
// Check not already on right
if (gCurrentSprite.xPosition != SAVE_YES_NO_CURSOR_RIGHT_POSITION)
{
SoundPlay(0x207);
SoundPlay(SOUND_YES_NO_CURSOR_MOVING);
gCurrentSprite.xPosition = SAVE_YES_NO_CURSOR_RIGHT_POSITION;
}
}
@ -418,7 +418,7 @@ void SaveYesNoCursor(void)
if (gCurrentSprite.xPosition == SAVE_YES_NO_CURSOR_LEFT_POSITION)
{
// On left, "yes" option selected
SoundPlay(0x208);
SoundPlay(SOUND_YES_NO_CURSOR_SELECTING_YES);
gSpriteData[ramSlot].work1 = TRUE;
if (gSpriteData[ramSlot].roomSlot == MESSAGE_SAVE_PROMPT)
{
@ -431,7 +431,7 @@ void SaveYesNoCursor(void)
else
{
// On right, "no" option selected
SoundPlay(0x209);
SoundPlay(SOUND_REFUSE_MENU);
gSpriteData[ramSlot].work1 = FALSE;
}

50
src/sprites_AI/kraid.c
View File

@ -174,7 +174,7 @@ void KraidOpenCloseRoutineAndProjectileCollision(void)
pSprite->animationDurationCounter = 0;
pSprite->currentAnimationFrame = 0;
SoundPlay(0x1CE);
SoundPlay(SOUND_KRAID_OPENING_MOUTH);
}
else if (SpriteUtilCheckEndCurrentSpriteAnim() && gSpriteRng < 5)
{
@ -194,7 +194,7 @@ void KraidOpenCloseRoutineAndProjectileCollision(void)
pSprite->animationDurationCounter = 0;
pSprite->currentAnimationFrame = 0;
SoundPlay(0x1CE);
SoundPlay(SOUND_KRAID_OPENING_MOUTH);
}
else if (SpriteUtilCheckEndCurrentSpriteAnim())
{
@ -242,7 +242,7 @@ void KraidOpenCloseRoutineAndProjectileCollision(void)
pSprite->animationDurationCounter = 0;
pSprite->currentAnimationFrame = 0;
SoundPlay(0x1CE);
SoundPlay(SOUND_KRAID_OPENING_MOUTH);
}
else if (SpriteUtilCheckEndCurrentSpriteAnim())
{
@ -392,7 +392,7 @@ void KraidOpenCloseRoutineAndProjectileCollision(void)
{
pSprite->invincibilityStunFlashTimer &= 0x80;
pSprite->invincibilityStunFlashTimer |= 0x11;
SoundPlay(0x1CF);
SoundPlay(SOUND_KRAID_DAMAGED);
}
else
{
@ -644,7 +644,7 @@ void KraidPartUpdateRightArmAttackingHitbox(void)
gCurrentSprite.hitboxBottom = 0;
gCurrentSprite.hitboxLeft = 0xD0;
gCurrentSprite.hitboxRight = 0x120;
SoundPlay(0x1C2);
SoundPlay(SOUND_KRAID_RIGHT_ARM_DYING_1);
break;
case 0x1:
@ -673,7 +673,7 @@ void KraidPartUpdateRightArmAttackingHitbox(void)
gCurrentSprite.hitboxBottom = -0xA0;
gCurrentSprite.hitboxLeft = 0x70;
gCurrentSprite.hitboxRight = 0xA0;
SoundPlay(0x1C3);
SoundPlay(SOUND_KRAID_RIGHT_ARM_DYING_2);
break;
case 0x5:
@ -842,7 +842,7 @@ void KraidPartUpdateLeftArmDyingHitbox(void)
gCurrentSprite.hitboxBottom = -0x40;
gCurrentSprite.hitboxLeft = 0x8;
gCurrentSprite.hitboxRight = 0x80;
SoundPlay(0x1C0);
SoundPlay(SOUND_KRAID_LEFT_ARM_DYING_1);
break;
case 0x1:
@ -871,7 +871,7 @@ void KraidPartUpdateLeftArmDyingHitbox(void)
gCurrentSprite.hitboxBottom = -0x180;
gCurrentSprite.hitboxLeft = -0x40;
gCurrentSprite.hitboxRight = 0x40;
SoundPlay(0x1C1);
SoundPlay(SOUND_KRAID_LEFT_ARM_DYING_2);
break;
case 0x5:
@ -927,7 +927,7 @@ void KraidPartUpdateLeftArmAttackingHitbox(void)
gCurrentSprite.hitboxBottom = -0x20;
gCurrentSprite.hitboxLeft = 0;
gCurrentSprite.hitboxRight = 0x80;
SoundPlay(0x1C4);
SoundPlay(SOUND_KRAID_LEFT_ARM_ATTACKING_1);
break;
case 0x1:
@ -970,7 +970,7 @@ void KraidPartUpdateLeftArmAttackingHitbox(void)
gCurrentSprite.hitboxBottom = -0x100;
gCurrentSprite.hitboxLeft = -0x80;
gCurrentSprite.hitboxRight = -0x8;
SoundPlay(0x1C5);
SoundPlay(SOUND_KRAID_LEFT_ARM_ATTACKING_2);
break;
case 0x7:
@ -1034,7 +1034,7 @@ void KraidPartUpdateLeftArmAttackingHitbox(void)
gCurrentSprite.hitboxBottom = -0x40;
gCurrentSprite.hitboxLeft = 0x10;
gCurrentSprite.hitboxRight = 0x90;
SoundPlay(0x1C6);
SoundPlay(SOUND_KRAID_LEFT_ARM_ATTACKING_3);
break;
case 0x10:
@ -1202,7 +1202,7 @@ u8 KraidMoveUp(void)
void KraidGoUp(void)
{
if (gCurrentSprite.work1 == 0)
SoundPlay(0x1BF);
SoundPlay(SOUND_KRAID_RISING);
gCurrentSprite.work1++;
@ -1266,7 +1266,7 @@ u8 KraidMoveFeet(void)
SpriteDebrisInit(0, 0x12, yPosition, xPosition + 0xC);
SpriteDebrisInit(0, 0x13, yPosition - 0x2A, xPosition + 0x14);
SpriteDebrisInit(0, 0x4, yPosition - 0x18, xPosition - 0x1e);
SoundPlay(0x138);
SoundPlay(SOUND_138);
yPosition -= (BLOCK_SIZE * 8);
xPosition -= BLOCK_SIZE;
@ -1531,7 +1531,7 @@ void KraidDyingInit(void)
gCurrentSprite.drawOrder = 0xC;
EventFunction(EVENT_ACTION_SETTING, EVENT_KRAID_KILLED);
MinimapUpdateChunk(EVENT_KRAID_KILLED);
SoundPlay(0x1D0);
SoundPlay(SOUND_KRAID_DYING_1);
}
/**
@ -1574,7 +1574,7 @@ void KraidDying(void)
if (gCurrentSprite.work2 == 0x1)
StartEffectForCutscene(EFFECT_CUTSCENE_STATUE_OPENING); // Statue opening
else if (gCurrentSprite.work2 == 0)
SoundPlay(0x1D2);
SoundPlay(SOUND_KRAID_DYING_3);
}
// Play effects
@ -1596,7 +1596,7 @@ void KraidDying(void)
{
gCurrentSprite.pose = KRAID_POSE_DEAD_STATIONARY;
gCurrentSprite.work0 = 0x78;
SoundPlay(0x1D1);
SoundPlay(SOUND_KRAID_DYING_2);
}
else
{
@ -2459,7 +2459,7 @@ void Kraid(void)
{
gBg2Movement.yOffset += 4;
ScreenShakeStartVertical(10, 0x80 | 1);
SoundPlay(0x1CC);
SoundPlay(SOUND_KRAID_STOMPING_FEET);
if (gSubSpriteData1.pMultiOam == sKraidMultiSpriteData_MovingLeftFeetToRight)
{
ParticleSet(gCurrentSprite.yPositionSpawn + BLOCK_SIZE * 7 + HALF_BLOCK_SIZE,
@ -2493,7 +2493,7 @@ void Kraid(void)
{
gBg2Movement.yOffset += 4;
ScreenShakeStartVertical(10, 0x80 | 1);
SoundPlay(0x1CC);
SoundPlay(SOUND_KRAID_STOMPING_FEET);
if (gSubSpriteData1.pMultiOam == sKraidMultiSpriteData_MovingLeftFeetToLeft)
{
ParticleSet(gCurrentSprite.yPositionSpawn + BLOCK_SIZE * 7 + HALF_BLOCK_SIZE,
@ -2688,7 +2688,7 @@ void KraidSpike(void)
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.work0 = 0x14;
SoundPlay(0x1C7);
SoundPlay(SOUND_KRAID_SPIKE_SPAWNING);
case KRAID_SPIKE_POSE_DELAY_BEFORE_MOVING:
caf = gCurrentSprite.currentAnimationFrame;
@ -2714,7 +2714,7 @@ void KraidSpike(void)
{
gCurrentSprite.pose = KRAID_SPIKE_POSE_MOVING;
gCurrentSprite.work0 = 0x4;
SoundPlay(0x1C8);
SoundPlay(SOUND_KRAID_SPIKE_EMERGING);
}
}
@ -2758,7 +2758,7 @@ void KraidSpike(void)
if (!(gSubSpriteData1.workVariable3 & 0x1))
{
gSubSpriteData1.workVariable3 |= 0x1;
SoundPlay(0x1C9);
SoundPlay(SOUND_KRAID_SPIKE_DESTROYING_PLATFORM);
}
}
else if (gCurrentSprite.roomSlot == KRAID_PART_MIDDLE_HOLE_LEFT)
@ -2766,7 +2766,7 @@ void KraidSpike(void)
if (!(gSubSpriteData1.workVariable3 & 0x2))
{
gSubSpriteData1.workVariable3 |= 0x2;
SoundPlay(0x1CA);
SoundPlay(SOUND_KRAID_SPIKE_DESTROYING_BLOCKS);
}
gCurrentClipdataAffectingAction = CAA_REMOVE_SOLID;
ClipdataProcess(yPosition - BLOCK_SIZE, xPosition);
@ -2779,7 +2779,7 @@ void KraidSpike(void)
if (!(gSubSpriteData1.workVariable3 & 0x4))
{
gSubSpriteData1.workVariable3 |= 0x4;
SoundPlay(0x1CA);
SoundPlay(SOUND_KRAID_SPIKE_DESTROYING_BLOCKS);
}
gCurrentClipdataAffectingAction = CAA_REMOVE_SOLID;
ClipdataProcess(yPosition - BLOCK_SIZE, xPosition);
@ -2823,7 +2823,7 @@ void KraidSpike(void)
gCurrentSprite.yPositionSpawn = 0x168;
gCurrentSprite.pose = KRAID_SPIKE_POSE_IN_WALL;
gCurrentSprite.drawOrder = 0x4;
SoundPlay(0x1CB);
SoundPlay(SOUND_KRAID_SPIKE_HITTING_WALL);
}
}
break;
@ -2848,7 +2848,7 @@ void KraidSpike(void)
gSamusData.standingStatus = STANDING_MIDAIR;
gCurrentSprite.status = 0;
ParticleSet(gCurrentSprite.yPosition, gCurrentSprite.xPosition + 0x50, PE_SPRITE_EXPLOSION_HUGE);
SoundPlay(0x138);
SoundPlay(SOUND_138);
break;
}
}

7
src/sprites_AI/map_station.c
View File

@ -5,6 +5,7 @@
#include "data/sprites/map_station.h"
#include "constants/audio.h"
#include "constants/connection.h"
#include "constants/game_state.h"
#include "constants/sprite.h"
@ -101,7 +102,7 @@ void MapStationIdle(void)
else
SamusSetPose(SPOSE_DOWNLOADING_MAP_DATA);
SoundPlay(0x123);
SoundPlay(SOUND_USING_MAP_STATION);
}
}
@ -195,7 +196,7 @@ void MapStationSpawnMessage(void)
gSamusData.currentAnimationFrame = 0;
gSamusData.timer = 1;
SoundFade(0x123, 10);
SoundFade(SOUND_USING_MAP_STATION, CONVERT_SECONDS(1.f / 6));
}
/**
@ -239,7 +240,7 @@ void MapStationRetracting(void)
gCurrentSprite.animationDurationCounter = 0;
SamusSetPose(SPOSE_STANDING);
SoundPlay(0x124);
SoundPlay(SOUND_MAP_STATION_RETRACTING);
}
/**

69
src/sprites_AI/mecha_ridley.c
View File

@ -482,9 +482,9 @@ void MechaRidleyInit(void)
void MechaRidleyStartWalking(void)
{
gCurrentSprite.pose = MECHA_RIDLEY_POSE_DELAY_BEFORE_CRAWLING;
SoundPlay(0x2B3);
SoundPlay(SOUND_MECHA_RIDLEY_ENTRANCE_CRAWL);
DMA_SET(3, sMechaRidleyFadingPal, PALRAM_BASE + 0x300, (DMA_ENABLE << 16) | 13);
DMA_SET(3, sMechaRidleyFadingPal, PALRAM_BASE + 0x300, C_32_2_16(DMA_ENABLE, 13));
TransparencyUpdateBldcnt(1,
BLDCNT_BG2_FIRST_TARGET_PIXEL | BLDCNT_BG3_FIRST_TARGET_PIXEL |
@ -588,7 +588,7 @@ void MechaRidleyStartBattle(void)
else
{
if (palRow == 1)
SoundPlay(0x2AD);
SoundPlay(SOUND_2AD);
// Palette fading
DMA_SET(3, &sMechaRidleyFadingPal[palRow * 16],
@ -681,7 +681,7 @@ void MechaRidleyClawAttack(void)
if ((u16)(gSpriteData[leftArmSlot].currentAnimationFrame - 4) < 4)
{
if (gSpriteData[leftArmSlot].currentAnimationFrame == 4 && gSpriteData[leftArmSlot].animationDurationCounter == 1)
SoundPlay(0x29E);
SoundPlay(SOUND_MECHA_RIDLEY_CLAW_ATTACK);
gSubSpriteData1.xPosition -= 4;
}
@ -805,7 +805,7 @@ void MechaRidleyRetracting(void)
gSubSpriteData1.currentAnimationFrame = 0;
gCurrentSprite.pose = MECHA_RIDLEY_POSE_CRAWLING_BACKWARDS;
SoundPlay(0x29F);
SoundPlay(SOUND_MECHA_RIDLEY_CRAWLING_BACKWARDS);
}
}
@ -888,7 +888,7 @@ void MechaRidleyStandingForFireballs(void)
gSubSpriteData1.currentAnimationFrame = 0;
gCurrentSprite.pose = MECHA_RIDLEY_POSE_OPENING_MOUTH;
SoundPlay(0x2A8);
SoundPlay(SOUND_MECHA_RIDLEY_OPENING_MOUTH);
}
}
@ -934,7 +934,7 @@ void MechaRidleyFireballsAttack(void)
gSubSpriteData1.xPosition - BLOCK_SIZE, 0);
}
SoundPlay(0x2A9);
SoundPlay(SOUND_MECHA_RIDLEY_SPITTING_FIREBALL);
}
gCurrentSprite.work0--;
@ -1006,8 +1006,8 @@ void MechaRidleyDyingInit(void)
gBossWork.work4 = EYE_STATE_LASER_SET_IDLE;
ParticleSet(gCurrentSprite.yPosition + BLOCK_SIZE, gCurrentSprite.xPosition, PE_MAIN_BOSS_DEATH);
SoundPlay(0x2B0);
FadeMusic(60);
SoundPlay(SOUND_MECHA_RIDLEY_DEATH_EXPLOSIONS);
FadeMusic(CONVERT_SECONDS(1.f));
}
/**
@ -1050,7 +1050,7 @@ void MechaRidleyDying(void)
gCurrentSprite.pose = MECHA_RIDLEY_POSE_DYING_GLOW_FADING;
gCurrentSprite.work0 = 0;
SoundPlay(0x2AE);
SoundPlay(SOUND_MECA_RIDLEY_POWERING_OFF);
// Disable alarm
gDisableAnimatedPalette = -1;
@ -1230,7 +1230,7 @@ void MechaRidleyFirstEyeGlow(void)
gCurrentSprite.work1 = 0;
gCurrentSprite.work2 = 4;
gBossWork.work4 = EYE_STATE_LASER_SET_DYING;
SoundPlay(0x2B1);
SoundPlay(SOUND_MECHA_RIDLEY_EYE_BEEPING);
}
}
@ -1490,7 +1490,7 @@ void MechaRidleyPartCoverIdle(void)
u16 maxHealth;
if ((gCurrentSprite.invincibilityStunFlashTimer & 0x7F) == 0x10)
SoundPlay(0x2AF);
SoundPlay(SOUND_MECHA_RIDLEY_DAMAGED);
// Spawn health of cover
maxHealth = gBossWork.work10;
@ -1547,7 +1547,7 @@ void MechaRidleyPartMissileLauncherIdle(void)
gCurrentSprite.animationDurationCounter = 0;
gBossWork.work5 = MISSILE_LAUNCHER_STATE_OPENING;
SoundPlay(0x2A6);
SoundPlay(SOUND_MECHA_RIDLEY_OPENING_MISSILE_LAUNCHER);
}
else
gBossWork.work5 = MISSILE_LAUNCHER_STATE_IDLE; // Cancel attack
@ -1603,7 +1603,7 @@ void MechaRidleyPartMissileLauncherIdle(void)
gCurrentSprite.primarySpriteRamSlot, gCurrentSprite.yPosition - 0x34,
gCurrentSprite.xPosition - 0x24, 0);
SoundPlay(0x2A7);
SoundPlay(SOUND_MECHA_RIDLEY_FIRING_MISSILE_LAUNCHER);
}
}
}
@ -1695,7 +1695,7 @@ void MechaRidleyPartEyeIdle(void)
gCurrentSprite.work1 = LASER_DIRECTION_FORWARD;
}
SoundPlay(0x2AA);
SoundPlay(SOUND_MECHA_RIDLEY_PREPARING_LASER);
}
else if (SpriteUtilCheckEndCurrentSpriteAnim())
{
@ -1803,7 +1803,7 @@ void MechaRidleyPartRightArmIdle(void)
{
case 0:
if (gCurrentSprite.animationDurationCounter == 1 && gSpriteData[ramSlot].pose > 7)
SoundPlay(0x2B2);
SoundPlay(SOUND_MECHA_RIDLEY_RIGHT_ARM_CRAWLING);
topHitbox = BLOCK_SIZE;
bottomHitbox = BLOCK_SIZE * 3;
@ -1889,7 +1889,7 @@ void MechaRidleyPartRightArmIdle(void)
case 7:
if (gCurrentSprite.animationDurationCounter == 1 && gSpriteData[ramSlot].pose > 7)
SoundPlay(0x2B2);
SoundPlay(SOUND_MECHA_RIDLEY_RIGHT_ARM_CRAWLING);
topHitbox = BLOCK_SIZE;
bottomHitbox = (BLOCK_SIZE * 2 + HALF_BLOCK_SIZE);
@ -1957,7 +1957,7 @@ void MechaRidleyPartLeftArmIdle(void)
{
case 0:
if (gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x2A4);
SoundPlay(SOUND_MECHA_RIDLEY_ARM_SWIPE_PREPARING);
topHitbox = -BLOCK_SIZE;
bottomHitbox = BLOCK_SIZE;
@ -1981,7 +1981,7 @@ void MechaRidleyPartLeftArmIdle(void)
case 3:
if (gCurrentSprite.animationDurationCounter == 20)
SoundPlay(0x2A5);
SoundPlay(SOUND_MECHA_RIDLEY_ARM_SWIPE);
topHitbox = -(BLOCK_SIZE * 4 + HALF_BLOCK_SIZE);
bottomHitbox = 0;
@ -2014,7 +2014,7 @@ void MechaRidleyPartLeftArmIdle(void)
if (gCurrentSprite.animationDurationCounter == 1)
{
ScreenShakeStartVertical(20, 0x81);
SoundPlay(0x2A0);
SoundPlay(SOUND_MECHA_RIDLEY_ARM_SWIPE_HITTING_GROUND);
}
case 8:
@ -2044,7 +2044,8 @@ void MechaRidleyPartLeftArmIdle(void)
case 1:
if (gCurrentSprite.animationDurationCounter == 8)
SoundPlay(0x2A3);
SoundPlay(SOUND_MECHA_RIDLEY_HOLDING_UP_ARM);
topHitbox = BLOCK_SIZE * 2;
bottomHitbox = BLOCK_SIZE * 3;
leftHitbox = -BLOCK_SIZE * 5;
@ -2177,7 +2178,7 @@ void MechaRidleyPartNeckIdle(void)
if (gCurrentSprite.currentAnimationFrame == 0)
{
if (gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x2AB);
SoundPlay(SOUND_MECHA_RIDLEY_NECK_MIDDLE_UP_MOVEMENT);
topHitbox = -BLOCK_SIZE;
bottomHitbox = BLOCK_SIZE;
@ -2197,7 +2198,7 @@ void MechaRidleyPartNeckIdle(void)
if (gCurrentSprite.currentAnimationFrame == 0)
{
if (gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x2AB);
SoundPlay(SOUND_MECHA_RIDLEY_NECK_MIDDLE_UP_MOVEMENT);
topHitbox = -BLOCK_SIZE * 2;
bottomHitbox = 0;
@ -2217,7 +2218,7 @@ void MechaRidleyPartNeckIdle(void)
if (gCurrentSprite.currentAnimationFrame == 0)
{
if (gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x2AC);
SoundPlay(SOUND_MECHA_RIDLEY_NECK_MIDDLE_DOWN_MOVEMENT);
topHitbox = -BLOCK_SIZE * 2;
bottomHitbox = 0;
@ -2237,7 +2238,7 @@ void MechaRidleyPartNeckIdle(void)
if (gCurrentSprite.currentAnimationFrame == 0)
{
if (gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x2AC);
SoundPlay(SOUND_MECHA_RIDLEY_NECK_MIDDLE_DOWN_MOVEMENT);
topHitbox = -BLOCK_SIZE;
bottomHitbox = BLOCK_SIZE;
@ -2257,7 +2258,7 @@ void MechaRidleyPartNeckIdle(void)
if (gCurrentSprite.currentAnimationFrame == 0)
{
if (gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x2A1);
SoundPlay(SOUND_MECHA_RIDLEY_NECK_LOW_TO_HIGH);
topHitbox = -BLOCK_SIZE;
bottomHitbox = BLOCK_SIZE;
@ -2291,7 +2292,7 @@ void MechaRidleyPartNeckIdle(void)
if (gCurrentSprite.currentAnimationFrame == 0)
{
if (gCurrentSprite.animationDurationCounter == 1)
SoundPlay(0x2A2);
SoundPlay(SOUND_MECHA_RIDLEY_NECK_HIGH_TO_LOW);
topHitbox = -BLOCK_SIZE * 2;
bottomHitbox = 0;
@ -2342,7 +2343,7 @@ void MechaRidley(void)
if (gCurrentSprite.properties & SP_DAMAGED)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
SoundPlay(0x2AF);
SoundPlay(SOUND_MECHA_RIDLEY_DAMAGED);
}
if (gCurrentSprite.pose != 0)
@ -2779,7 +2780,7 @@ void MechaRidleyLaser(void)
// Destroy
gCurrentSprite.status = 0;
ParticleSet(gCurrentSprite.yPosition, gCurrentSprite.xPosition, PE_SPRITE_EXPLOSION_SMALL);
SoundPlay(0x2C1);
SoundPlay(SOUND_MECHA_RIDLEY_LASER_EXPLODING);
}
}
@ -2869,11 +2870,11 @@ void MechaRidleyMissile(void)
gCurrentSprite.pose = 0x44;
break;
case 0x42:
case SPRITE_POSE_STOPPED:
ParticleSet(gCurrentSprite.yPosition, gCurrentSprite.xPosition, PE_SPRITE_EXPLOSION_HUGE);
gCurrentSprite.status = 0;
gBossWork.work6--;
SoundPlay(0x2C2);
SoundPlay(SOUND_MECHA_RIDLEY_MISSILE_EXPLODING);
break;
case 0x44:
@ -2946,18 +2947,18 @@ void MechaRidleyFireball(void)
case 0x23:
break;
case 0x42:
case SPRITE_POSE_STOPPED:
ParticleSet(gCurrentSprite.yPosition, gCurrentSprite.xPosition, PE_SPRITE_EXPLOSION_HUGE);
gCurrentSprite.status = 0;
gBossWork.work8--;
SoundPlay(0x2B4);
SoundPlay(SOUND_MECHA_RIDLEY_FIREBALL_EXPLODING);
break;
case 0x44:
ParticleSet(gCurrentSprite.yPosition, gCurrentSprite.xPosition, PE_SPRITE_EXPLOSION_SMALL);
gCurrentSprite.status = 0;
gBossWork.work8--;
SoundPlay(0x2B4);
SoundPlay(SOUND_MECHA_RIDLEY_FIREBALL_EXPLODING);
break;
default:

9
src/sprites_AI/mella.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/mella.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
@ -212,7 +213,7 @@ void MellaDelayBeforeGoingDown(void)
{
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN &&
gCurrentSprite.currentAnimationFrame == 0 && gCurrentSprite.animationDurationCounter == 1)
SoundPlayNotAlreadyPlaying(0x189);
SoundPlayNotAlreadyPlaying(SOUND_MELLA_MOVING);
gCurrentSprite.work0--;
if (gCurrentSprite.work0 == 0)
@ -239,7 +240,7 @@ void MellaGoingDown(void)
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN &&
gCurrentSprite.currentAnimationFrame == 0 && gCurrentSprite.animationDurationCounter == 1)
SoundPlayNotAlreadyPlaying(0x189);
SoundPlayNotAlreadyPlaying(SOUND_MELLA_MOVING);
// Check increase offsets
if (gCurrentSprite.work3 < ARRAY_SIZE(sMellaGoingDownYMovement) * 8 - 1)
@ -274,7 +275,7 @@ void MellaGoingUp(void)
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN &&
gCurrentSprite.currentAnimationFrame == 0 && gCurrentSprite.animationDurationCounter == 1)
SoundPlayNotAlreadyPlaying(0x189);
SoundPlayNotAlreadyPlaying(SOUND_MELLA_MOVING);
// Check increase offsets
if (gCurrentSprite.work3 < ARRAY_SIZE(sMellaGoingUpYMovement) * 8 - 1)
@ -308,7 +309,7 @@ void Mella(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x18B);
SoundPlayNotAlreadyPlaying(SOUND_MELLA_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0)

31
src/sprites_AI/metroid.c
View File

@ -6,6 +6,7 @@
#include "data/sprites/enemy_drop.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/event.h"
#include "constants/game_state.h"
@ -483,14 +484,16 @@ u8 MetroidCheckSamusGrabbed(void)
}
/**
* @brief 359a4 | 2c | Plays the metroid sound
* @brief 359a4 | 2c | Plays the metroid moving sound
*
*/
void MetroidPlaySound(void)
void MetroidPlayMovingSound(void)
{
if (gCurrentSprite.currentAnimationFrame == 0 && gCurrentSprite.animationDurationCounter == 1
&& gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x170);
if (gCurrentSprite.currentAnimationFrame == 0 && gCurrentSprite.animationDurationCounter == 1)
{
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(SOUND_METROID_MOVING);
}
}
/**
@ -699,7 +702,7 @@ void MetroidMovingInit(void)
*/
void MetroidMovement(void)
{
MetroidPlaySound();
MetroidPlayMovingSound();
if (gCurrentSprite.status & SPRITE_STATUS_SAMUS_COLLIDING)
{
// Colliding with samus
@ -752,7 +755,7 @@ void MetroidSamusGrabbed(void)
u8 flags;
u8 suits;
MetroidPlaySound();
MetroidPlayMovingSound();
MetroidCheckBouncingOnMetroid(0x2);
gCurrentSprite.work0--; // Delay between palette swap
@ -805,18 +808,18 @@ void MetroidSamusGrabbed(void)
// Check play sucking sound
if (MOD_AND(gCurrentSprite.rotation, 32) == 0)
{
SoundPlayNotAlreadyPlaying(0x81);
SoundPlayNotAlreadyPlaying(SOUND_METROID_LEECHING);
flags = gEquipment.suitMiscActivation;
velocity = SMF_ALL_SUITS;
velocity &= flags;
if (!velocity)
SoundPlay(0x16D);
if (velocity == SMF_NONE)
SoundPlay(SOUND_METROID_SUCKING_NO_SUIT);
else if (velocity == SMF_ALL_SUITS)
SoundPlay(0x16F);
SoundPlay(SOUND_METROID_SUCKING_ALL_SUITS);
else
SoundPlay(0x16E);
SoundPlay(SOUND_METROID_SUCKING_ONE_SUIT);
}
gCurrentSprite.rotation++; // Sound counter
@ -923,7 +926,7 @@ void Metroid(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x172);
SoundPlayNotAlreadyPlaying(SOUND_METROID_DAMAGED);
}
else
{
@ -932,7 +935,7 @@ void Metroid(void)
if (gCurrentSprite.health == gCurrentSprite.yPositionSpawn)
{
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x171);
SoundPlayNotAlreadyPlaying(SOUND_METROID_DETACHED);
}
else
gCurrentSprite.yPositionSpawn = gCurrentSprite.health;

32
src/sprites_AI/mother_brain.c
View File

@ -74,7 +74,7 @@ void MotherBrainUpdatePalette(void)
newTimer = sMotherBrainDynamicPaletteData[offset][1];
if (offset == 0 || offset == 0x6)
SoundPlay(0x2BB);
SoundPlay(SOUND_MOTHER_BRAIN_CHARGING);
gCurrentSprite.paletteRow = timer;
gCurrentSprite.scaling = newTimer;
@ -166,7 +166,7 @@ void MotherBrainCheckGlassBreaked(void)
gSpriteData[eyeRamSlot].pOam = sMotherBrainPartOam_EyeOpening;
gSpriteData[eyeRamSlot].animationDurationCounter = 0;
gSpriteData[eyeRamSlot].currentAnimationFrame = 0;
SoundPlay(0x2B9); // Mother brain eye open
SoundPlay(SOUND_MOTHER_BRAIN_EYE_OPENING);
}
}
@ -216,7 +216,7 @@ void MotherBrainMainLoop(void)
gSubSpriteData1.workVariable3 = 0x2;
// Set event
EventFunction(EVENT_ACTION_SETTING, EVENT_MOTHER_BRAIN_KILLED);
SoundPlay(0x2BF); // Mother brain dying
SoundPlay(SOUND_MOTHER_BRAIN_DYING);
return;
}
@ -234,11 +234,11 @@ void MotherBrainMainLoop(void)
else
{
if (gCurrentSprite.currentAnimationFrame == 0x1 && gCurrentSprite.animationDurationCounter == 0x1)
SoundPlay(0x2BD); // Mother brain idle
SoundPlay(SOUND_MOTHER_BRAIN_IDLE);
if ((gSpriteData[eyeRamSlot].invincibilityStunFlashTimer & 0x7F) == 0x10)
{
SoundPlay(0x2BE); // Mother brain hurt
SoundPlay(SOUND_MOTHER_BRAIN_DAMAGED);
if (gSpriteData[eyeRamSlot].health < gBossWork.work4)
{
// Damage dealt, check should close eye
@ -262,7 +262,7 @@ void MotherBrainMainLoop(void)
gSpriteData[eyeRamSlot].animationDurationCounter = 0;
gSpriteData[eyeRamSlot].currentAnimationFrame = 0;
gSpriteData[eyeRamSlot].properties |= SP_IMMUNE_TO_PROJECTILES;
SoundPlay(0x2BA); // Mother brain eye closing
SoundPlay(SOUND_MOTHER_BRAIN_EYE_CLOSING);
gCurrentSprite.work2 = 0x1;
}
}
@ -311,7 +311,7 @@ void MotherBrainMainLoop(void)
gSpriteData[eyeRamSlot].animationDurationCounter = 0;
gSpriteData[eyeRamSlot].currentAnimationFrame = 0;
gSpriteData[eyeRamSlot].properties |= SP_IMMUNE_TO_PROJECTILES;
SoundPlay(0x2BA); // Mother brain eye close
SoundPlay(SOUND_MOTHER_BRAIN_EYE_CLOSING);
gCurrentSprite.work2 = 0x3C;
}
return;
@ -352,7 +352,7 @@ void MotherBrainMainLoop(void)
gSpriteData[eyeRamSlot].currentAnimationFrame = 0;
// Make eye vulnerable
gSpriteData[eyeRamSlot].properties &= ~SP_IMMUNE_TO_PROJECTILES;
SoundPlay(0x2B9); // Mother brain eye open
SoundPlay(SOUND_MOTHER_BRAIN_EYE_OPENING);
}
else if (gCurrentSprite.work1 == 0x18)
{
@ -361,7 +361,7 @@ void MotherBrainMainLoop(void)
gSpriteData[beamShooterRamSlot].animationDurationCounter = 0;
gSpriteData[beamShooterRamSlot].currentAnimationFrame = 0;
gSpriteData[beamShooterRamSlot].status &= ~SPRITE_STATUS_NOT_DRAWN;
SoundPlay(0x2BC);
SoundPlay(SOUND_MOTHER_BRAIN_SHOOTING);
}
if (palette != 0xE)
@ -403,7 +403,7 @@ void MotherBrainDeath(void)
ParticleSet(gSubSpriteData1.yPosition + 0x46, gSubSpriteData1.xPosition - 0x3C, PE_MAIN_BOSS_DEATH);
ParticleSet(gSubSpriteData1.yPosition + 0x3C, gSubSpriteData1.xPosition + 0x50, PE_MAIN_BOSS_DEATH);
gInGameTimerAtBosses[1] = gInGameTimer;
SoundPlay(0x2C0); // Mother brain death explosion
SoundPlay(SOUND_MOTHER_BRAIN_DEATH_EXPLOSION);
MakeBackgroundFlash(BG_FLASH_QUICK_YELLOW);
}
}
@ -423,7 +423,7 @@ void MotherBrainStartEscape(void)
SpriteSpawnPrimary(PSPRITE_ITEM_BANNER, MESSAGE_ZEBES_ESCAPE, 0, gCurrentSprite.yPosition, gCurrentSprite.xPosition, 0);
SpriteSpawnPrimary(PSPRITE_EXPLOSION_ZEBES_ESCAPE, 0, 0, gCurrentSprite.yPosition + (BLOCK_SIZE * 4), gCurrentSprite.xPosition, 0);
PlayMusic(MUSIC_ESCAPE, 0x40);
SoundPlay(0x120);
SoundPlay(SOUND_ESCAPE_BEEP);
gSubSpriteData1.workVariable3 = 0x3;
}
}
@ -587,7 +587,7 @@ void MotherBrainPartGlassStage1(void)
gCurrentSprite.pose = MOTHER_BRAIN_PART_POSE_GLASS_STAGE_2;
// Edit BG
BgClipCallMotherBrainUpdateGlass(0x1);
SoundPlay(0x2B5);
SoundPlay(SOUND_MOTHER_BRAIN_JAR_DAMAGE_1);
}
}
@ -604,7 +604,7 @@ void MotherBrainPartGlassStage2(void)
gCurrentSprite.pose = MOTHER_BRAIN_PART_POSE_GLASS_STAGE_3;
// Edit BG
BgClipCallMotherBrainUpdateGlass(0x2);
SoundPlay(0x2B6);
SoundPlay(SOUND_MOTHER_BRAIN_JAR_DAMAGE_2);
}
}
@ -621,7 +621,7 @@ void MotherBrainPartGlassStage3(void)
gCurrentSprite.pose = MOTHER_BRAIN_PART_POSE_GLASS_BROKEN;
// Edit BG
BgClipCallMotherBrainUpdateGlass(0x3);
SoundPlay(0x2B7);
SoundPlay(SOUND_MOTHER_BRAIN_JAR_DAMAGE_3);
}
}
@ -648,7 +648,7 @@ void MotherBrainPartSpawnGlassBreaking(void)
gCurrentSprite.primarySpriteRamSlot, gSubSpriteData1.yPosition, gSubSpriteData1.xPosition, 0);
// Remove in BG
BgClipCallMotherBrainUpdateGlass(0x4);
SoundPlay(0x2B8);
SoundPlay(SOUND_MOTHER_BRAIN_JAR_SHATTER);
}
/**
@ -810,7 +810,7 @@ void MotherBrainBeam(void)
{
ParticleSet(gCurrentSprite.yPosition + 0x1C, gCurrentSprite.xPosition, PE_SPRITE_EXPLOSION_BIG);
gCurrentSprite.status = 0;
SoundPlay(0x2C3);
SoundPlay(SOUND_MOTHER_BRAIN_LASER_EXPLODING);
}
}
}

7
src/sprites_AI/multiviola.c
View File

@ -4,8 +4,9 @@
#include "data/sprites/multiviola.h"
#include "data/sprite_data.h"
#include "constants/particle.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -103,7 +104,7 @@ void MultiviolaMove(void)
}
if (isBouncing && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x152);
SoundPlayNotAlreadyPlaying(SOUND_MULTIVIOLA_BOUNCING);
}
/**
@ -135,7 +136,7 @@ void Multiviola(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x153);
SoundPlayNotAlreadyPlaying(SOUND_MULTIVIOLA_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

16
src/sprites_AI/parasite.c
View File

@ -1,13 +1,17 @@
#include "sprites_AI/geron.h"
#include "sprites_AI/parasite.h"
#include "data/sprites/parasite.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/event.h"
#include "constants/sprite.h"
#include "constants/projectile.h"
#include "constants/sprite_util.h"
#include "constants/samus.h"
#include "structs/connection.h"
#include "structs/display.h"
#include "structs/game_state.h"
@ -750,11 +754,11 @@ void ParasiteIdle(struct SpriteData* pSprite)
{
timer = pSprite->work3;
if (timer < 0x8)
SoundPlayNotAlreadyPlaying(0x174);
SoundPlayNotAlreadyPlaying(SOUND_PARASITE_JUMPING_1);
else if (timer > 0xB)
SoundPlayNotAlreadyPlaying(0x176);
SoundPlayNotAlreadyPlaying(SOUND_PARASITE_JUMPING_3);
else
SoundPlayNotAlreadyPlaying(0x175);
SoundPlayNotAlreadyPlaying(SOUND_PARASITE_JUMPING_2);
}
}
else
@ -859,11 +863,11 @@ void ParasiteMultipleIdle(struct SpriteData* pSprite)
{
timer = pSprite->work3;
if (timer < 0x8)
SoundPlayNotAlreadyPlaying(0x174);
SoundPlayNotAlreadyPlaying(SOUND_PARASITE_JUMPING_1);
else if (timer > 0xB)
SoundPlayNotAlreadyPlaying(0x176);
SoundPlayNotAlreadyPlaying(SOUND_PARASITE_JUMPING_3);
else
SoundPlayNotAlreadyPlaying(0x175);
SoundPlayNotAlreadyPlaying(SOUND_PARASITE_JUMPING_2);
}
}
else

5
src/sprites_AI/piston.c
View File

@ -3,8 +3,9 @@
#include "data/sprites/piston.h"
#include "constants/sprite.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/sprite.h"
#include "structs/display.h"
#include "structs/sprite.h"
@ -184,7 +185,7 @@ void PistonCheckProjectile(void)
gCurrentSprite.pose = PISTON_POSE_OPENING;
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
SoundPlay(0x173);
SoundPlay(SOUND_PISTON_EXTENDING);
}
}
else if (!PistonSamusCollision())

7
src/sprites_AI/polyp.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/polyp.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -69,7 +70,7 @@ void PolypCheckSpawnProjectile(void)
gCurrentSprite.currentAnimationFrame = 0;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x17C);
SoundPlay(SOUND_POLYP_WARNING);
}
else
{
@ -207,7 +208,7 @@ void PolypProjectileSpawn(void)
gCurrentSprite.status &= ~SPRITE_STATUS_IGNORE_PROJECTILES;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x17D);
SoundPlay(SOUND_POLYP_SPITTING);
}
}
@ -264,7 +265,7 @@ void PolypProjectileExplodingInit(void)
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x17E);
SoundPlay(SOUND_POLYP_PROJECTILE_EXPLODING);
}
/**

5
src/sprites_AI/reo.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/reo.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
@ -339,7 +340,7 @@ void ReoMove(void)
{
gCurrentSprite.scaling = 0x20;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x158);
SoundPlayNotAlreadyPlaying(SOUND_REO_MOVING);
}
}
@ -353,7 +354,7 @@ void Reo(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x159);
SoundPlayNotAlreadyPlaying(SOUND_REO_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

67
src/sprites_AI/ridley.c
View File

@ -151,7 +151,7 @@ void RidleyUpdateHealth(void)
default:
if (SPRITE_GET_ISFT(gCurrentSprite) == 0x10)
SoundPlayNotAlreadyPlaying(0x1ED);
SoundPlayNotAlreadyPlaying(SOUND_RIDLEY_DAMAGED);
if (gCurrentSprite.health == 0 && gSubSpriteData1.health != 0)
{
@ -678,7 +678,7 @@ void RidleySpawning(void)
ParticleSet(yPosition + HALF_BLOCK_SIZE, xPosition - (BLOCK_SIZE * 5 + HALF_BLOCK_SIZE), PE_SPRITE_EXPLOSION_HUGE);
ParticleSet(yPosition + HALF_BLOCK_SIZE, xPosition + (BLOCK_SIZE * 6 + HALF_BLOCK_SIZE), PE_SPRITE_EXPLOSION_HUGE);
SoundPlay(0x1F2);
SoundPlay(SOUND_RIDLEY_EXPLODING_GROUND);
}
gSubSpriteData1.yPosition = RIDLEY_GROUND_POSITION - (BLOCK_SIZE * 2 + HALF_BLOCK_SIZE);
@ -688,7 +688,7 @@ void RidleySpawning(void)
gCurrentSprite.work0 = 30;
gCurrentSprite.work3 = 0;
SoundPlay(0x1E6);
SoundPlay(SOUND_RIDLEY_HITTING_GROUND);
}
break;
@ -700,7 +700,7 @@ void RidleySpawning(void)
gSpriteData[gSubSpriteData1.workVariable4].animationDurationCounter = 0;
gSpriteData[gSubSpriteData1.workVariable4].currentAnimationFrame = 0;
SoundPlay(0x1E5);
SoundPlay(SOUND_RIDLEY_OPENING_MOUTH);
gCurrentSprite.work0 = 5;
gCurrentSprite.work1++;
}
@ -724,7 +724,7 @@ void RidleySpawning(void)
gSpriteData[gSubSpriteData1.workVariable5].currentAnimationFrame = 0;
gCurrentSprite.work1++;
SoundPlay(0x1E7);
SoundPlay(SOUND_RIDLEY_SPITTING_FIREBALLS);
}
break;
@ -759,7 +759,7 @@ void RidleySpawning(void)
gCurrentSprite.work0 = 5;
gCurrentSprite.work1++;
SoundFade(0x1E7, 30);
SoundFade(SOUND_RIDLEY_SPITTING_FIREBALLS, CONVERT_SECONDS(.5f));
break;
case RIDLEY_SPAWNING_ACTION_CLOSING_MOUTH:
@ -1024,7 +1024,7 @@ void RidleyIdle(void)
gSpriteData[clawSlot].work1 = RIDLEY_SAMUS_GRABBED_ACTION_LIFTING_SAMUS;
gSpriteData[clawSlot].work0 = 28;
SoundPlay(0x1E4);
SoundPlay(SOUND_RIDLEY_LIFTING_SAMUS);
}
}
else if (action == RIDLEY_SAMUS_GRABBED_ACTION_LIFTING_SAMUS)
@ -1049,7 +1049,7 @@ void RidleyIdle(void)
gSpriteData[gSubSpriteData1.workVariable4].animationDurationCounter = 0;
gSpriteData[gSubSpriteData1.workVariable4].currentAnimationFrame = 0;
SoundPlay(0x1E5);
SoundPlay(SOUND_RIDLEY_OPENING_MOUTH);
gSpriteData[clawSlot].work1 = RIDLEY_SAMUS_GRABBED_ACTION_OPENING_MOUTH;
gSpriteData[clawSlot].work0 = 5;
}
@ -1091,7 +1091,7 @@ void RidleyIdle(void)
gCurrentSprite.xPosition - (BLOCK_SIZE * 2 - QUARTER_BLOCK_SIZE), 0);
}
SoundPlay(0x1E8);
SoundPlay(SOUND_RIDLEY_SPITTING_FIREBALLS_ON_SAMUS);
}
// Update release timer
@ -1468,7 +1468,7 @@ void RidleySmallFireballsAttack(void)
gCurrentSprite.work0 = 0x1E;
gCurrentSprite.work3 = 0;
SoundPlay(0x1E6);
SoundPlay(SOUND_RIDLEY_HITTING_GROUND);
}
break;
@ -1481,7 +1481,7 @@ void RidleySmallFireballsAttack(void)
gSpriteData[gSubSpriteData1.workVariable4].animationDurationCounter = 0;
gSpriteData[gSubSpriteData1.workVariable4].currentAnimationFrame = 0;
SoundPlay(0x1E5);
SoundPlay(SOUND_RIDLEY_OPENING_MOUTH);
gCurrentSprite.work0 = 0x5;
gCurrentSprite.work1++;
}
@ -1503,7 +1503,7 @@ void RidleySmallFireballsAttack(void)
gSpriteData[gSubSpriteData1.workVariable4].currentAnimationFrame = 0;
gCurrentSprite.work1++;
SoundPlay(0x1E7);
SoundPlay(SOUND_RIDLEY_SPITTING_FIREBALLS);
}
break;
@ -1538,7 +1538,7 @@ void RidleySmallFireballsAttack(void)
gCurrentSprite.work0 = 0x5;
gCurrentSprite.work1++;
SoundFade(0x1E7, 0x1E);
SoundFade(SOUND_RIDLEY_SPITTING_FIREBALLS, CONVERT_SECONDS(.5f));
break;
case RIDLEY_SMALL_FIREBALLS_ATTACK_ACTION_CLOSING_MOUTH:
@ -1672,7 +1672,7 @@ void RidleyBigFireballsAttackInit(void)
gCurrentSprite.work1 = 0x96;
gCurrentSprite.work2 = 0xB4;
gCurrentSprite.work3 = 0x1;
SoundPlay(0x1EE);
SoundPlay(SOUND_RIDLEY_DYING_1);
}
else
{
@ -1740,7 +1740,7 @@ void RidleyBigFireballsAttack(void)
SpriteSpawnSecondary(SSPRITE_RIDLEY_BIG_FIREBALL, RIDLEY_FIREBALL_PART_FLOATING_PATTERN | RIDLEY_FIREBALL_PART_BOTTOM,
gCurrentSprite.spritesetGfxSlot, gCurrentSprite.primarySpriteRamSlot, yPosition, xPosition, status);
SoundPlay(0x1E9);
SoundPlay(SOUND_RIDLEY_SPITTING_BIG_FIREBALLS);
}
}
@ -1840,7 +1840,7 @@ void RidleyDying(void)
PlayMusic(MUSIC_BOSS_KILLED, 0);
}
else if (gCurrentSprite.work1 == 0x95)
SoundPlay(0x1EF);
SoundPlay(SOUND_RIDLEY_DYING_2);
}
}
@ -1950,9 +1950,9 @@ void RidleyPartWingPlaySound(u8 ramSlot)
gCurrentSprite.currentAnimationFrame == 0 && gCurrentSprite.animationDurationCounter == 0x1)
{
if (gCurrentSprite.pOam == sRidleyPartOam_LeftWingIdle)
SoundPlay(0x1E1);
SoundPlay(SOUND_RIDLEY_WINGS_FLAPPING);
else if (gCurrentSprite.pOam == sRidleyPartOam_LeftWingSpittingFireballs)
SoundPlay(0x1E2);
SoundPlay(SOUND_RIDLEY_WINGS_FLAPPING_FAST);
}
}
@ -2054,7 +2054,7 @@ void RidleyTailDead(void)
case RIDLEY_TAIL_PART_TIP:
SpriteUtilSpriteDeath(DEATH_NORMAL, gSubSpriteData1.yPosition + 0x78 + rng,
gSubSpriteData1.xPosition - 0x78 + rng * 2, FALSE, PE_SPRITE_EXPLOSION_MEDIUM);
SoundPlay(0x1F0);
SoundPlay(SOUND_RIDLEY_TAIL_DYING);
break;
default:
@ -2158,7 +2158,7 @@ void RidleyTailCheckMovingToAttackAnimEnded(void)
void RidleyTailSettingUpAttack(void)
{
if (gSubSpriteData2.currentAnimationFrame == 0x3 && gSubSpriteData2.animationDurationCounter == 0x1)
SoundPlay(0x1EA);
SoundPlay(SOUND_RIDLEY_TAIL_SPINNING);
if (SpriteUtilCheckEndSubSprite2Anim())
{
@ -2189,7 +2189,7 @@ void RidleyTailChargingAttack(void)
u8 doDiagonal;
if (gSubSpriteData2.currentAnimationFrame == 0x3 && gSubSpriteData2.animationDurationCounter == 0x1)
SoundPlay(0x1EA);
SoundPlay(SOUND_RIDLEY_TAIL_SPINNING);
ramSlot = gCurrentSprite.primarySpriteRamSlot;
doDiagonal = FALSE;
@ -2261,7 +2261,7 @@ void RidleyTailChargingAttack(void)
void RidleyTailFirstVerticalAttack(void)
{
if (gSubSpriteData2.currentAnimationFrame == 0x3 && gSubSpriteData2.animationDurationCounter == 0x1)
SoundPlay(0x1EC);
SoundPlay(SOUND_RIDLEY_TAIL_VERTICAL_SWIPE);
if (SpriteUtilCheckEndSubSprite2Anim())
{
@ -2292,7 +2292,7 @@ void RidleyTailVerticalAttack(void)
u8 ramSlot;
if (gSubSpriteData2.currentAnimationFrame == 0 && gSubSpriteData2.animationDurationCounter == 0x1)
SoundPlay(0x1EC);
SoundPlay(SOUND_RIDLEY_TAIL_VERTICAL_SWIPE);
stopAttack = FALSE;
ramSlot = gCurrentSprite.primarySpriteRamSlot;
@ -2345,7 +2345,7 @@ void RidleyTailVerticalAttack(void)
void RidleyTailLastVerticalAttack(void)
{
if (gSubSpriteData2.currentAnimationFrame == 0 && gSubSpriteData2.animationDurationCounter == 0x1)
SoundPlay(0x1EC);
SoundPlay(SOUND_RIDLEY_TAIL_VERTICAL_SWIPE);
if (SpriteUtilCheckEndSubSprite2Anim())
{
@ -2384,24 +2384,23 @@ void RidleyTailLastVerticalAttack(void)
*/
void RidleyTailDiagonalAttack(void)
{
struct SpriteData* pSprite;
if (gSubSpriteData2.currentAnimationFrame == 0x3 && gSubSpriteData2.animationDurationCounter == 0x1)
SoundPlay(0x1EB);
SoundPlay(SOUND_RIDLEY_TAIL_DIAGONAL_SWIPE);
// Commented out code probably
if (gCurrentSprite.status) {}
// Why
pSprite = &gCurrentSprite;
if (SpriteUtilCheckEndSubSprite2Anim())
{
// Decrement swipe counter
pSprite->work0--;
if (pSprite->work0 == 0)
gCurrentSprite.work0--;
if (gCurrentSprite.work0 == 0)
{
// No more swipes, set back to idle
gSubSpriteData2.pMultiOam = sRidleyTailMultiSpriteData_BackToIdle;
gSubSpriteData2.animationDurationCounter = 0;
gSubSpriteData2.currentAnimationFrame = 0;
pSprite->pose = RIDLEY_TAIL_POSE_BACK_TO_IDLE;
gCurrentSprite.pose = RIDLEY_TAIL_POSE_BACK_TO_IDLE;
}
else
{
@ -2409,7 +2408,7 @@ void RidleyTailDiagonalAttack(void)
gSubSpriteData2.pMultiOam = sRidleyTailMultiSpriteData_ChargingDiagonalTailAttack;
gSubSpriteData2.animationDurationCounter = 0;
gSubSpriteData2.currentAnimationFrame = 0;
pSprite->pose = RIDLEY_TAIL_POSE_CHARGING_ATTACK;
gCurrentSprite.pose = RIDLEY_TAIL_POSE_CHARGING_ATTACK;
}
}
else
@ -3052,7 +3051,7 @@ void RidleyFireball(void)
case RIDLEY_FIREBALL_POSE_DESTROY:
gCurrentSprite.status = 0;
ParticleSet(gCurrentSprite.yPosition, gCurrentSprite.xPosition, PE_SPRITE_EXPLOSION_MEDIUM);
SoundPlay(0x1F1);
SoundPlay(SOUND_RIDLEY_FIREBALL_EXPLODING);
return;
default:

7
src/sprites_AI/rising_chozo_pillar.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/rising_chozo_pillar.h"
#include "data/sprites/enemy_drop.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/event.h"
#include "constants/particle.h"
@ -226,7 +227,7 @@ void RisingChozoPillar(void)
{
gCurrentSprite.pose = RISING_CHOZO_PILLAR_POSE_EXTENDING;
gCurrentSprite.scaling = 704;
SoundPlay(0x125);
SoundPlay(SOUND_RISING_CHOZO_PILLAR_RISING);
}
break;
@ -242,7 +243,7 @@ void RisingChozoPillar(void)
else
{
gCurrentSprite.pose = RISING_CHOZO_PILLAR_POSE_SPAWN_3_PLATFORMS;
SoundFade(0x125, 10);
SoundFade(SOUND_RISING_CHOZO_PILLAR_RISING, CONVERT_SECONDS(1.f / 6));
}
debrisY = yPosition + HALF_BLOCK_SIZE;
@ -324,7 +325,7 @@ void ChozoPillarPlatform(void)
else
gCurrentSprite.pOam = sRisingChozoPillarPlatformOam_Slot0Spawning;
SoundPlay(0x126);
SoundPlay(SOUND_RISING_CHOZO_PILLAR_PLATFORM_SPAWNING);
}
break;

37
src/sprites_AI/ruins_test.c
View File

@ -11,6 +11,7 @@
#include "constants/clipdata.h"
#include "constants/event.h"
#include "constants/game_state.h"
#include "constants/in_game_cutscene.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/samus.h"
@ -279,7 +280,7 @@ u8 RuinsTestCheckSymbolShooted(void)
{
if (gCurrentSprite.invincibilityStunFlashTimer != 0 && gCurrentSprite.health != 100)
{
SoundPlay(0x1D9);
SoundPlay(SOUND_RUINS_TEST_SHOOTABLE_SYMBOL_SHOT);
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
gCurrentSprite.health = 100;
@ -538,7 +539,7 @@ void RuinsTestSpawning(void)
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.pose = RUINS_TEST_POSE_TURNING_INTO_REFLECTION;
SoundPlay(0x1D5);
SoundPlay(SOUND_RUINS_TEST_TURNING_INTO_FIRST_REFLECTION);
}
}
@ -1131,7 +1132,7 @@ void RuinsTestGhostSpawn(void)
gCurrentSprite.pOam = sRuinsTestGhostOam_Moving;
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.animationDurationCounter = 0;
SoundPlay(0x1D7);
SoundPlay(SOUND_RUINS_TEST_GHOST_SPANWING);
}
}
}
@ -1186,7 +1187,7 @@ void RuinsTestGhostIdle(void)
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.status |= SPRITE_STATUS_ALPHA_BLENDING;
SoundPlay(0x1DF);
SoundPlay(SOUND_RUINS_TEST_GHOST_FADING_OUT);
}
}
}
@ -1322,7 +1323,7 @@ void RuinsTestGhostMoveSymbolToPlace(void)
gCurrentSprite.status &= ~SPRITE_STATUS_UNKNOWN_10;
gCurrentSprite.drawOrder = 14;
SoundPlay(0x1DA);
SoundPlay(SOUND_RUINS_TEST_SYMBOL_PLACED);
}
else
{
@ -1453,7 +1454,7 @@ void RuinsTestGhostSymbolDelayBeforePlacingAtEndOfFight(void)
gCurrentSprite.pOam = sRuinsTestGhostOam_SymbolPlacing;
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.animationDurationCounter = 0;
SoundPlay(0x1E0);
SoundPlay(SOUND_RUINS_TEST_SYMBOLS_LIGHTING_UP);
}
}
@ -1610,7 +1611,7 @@ void RuinsTestSymbol(void)
gCurrentSprite.currentAnimationFrame = 1;
gCurrentSprite.animationDurationCounter = 0;
PlayMusic(MUSIC_RUINS_TEST_BATTLE_WITH_INTRO, 0);
SoundPlay(0x1D3);
SoundPlay(SOUND_RUINS_TEST_SPAWNING);
}
break;
@ -1651,7 +1652,7 @@ void RuinsTestSymbol(void)
case 10:
RUINS_TEST_TRANSFER_DYNAMIC_PAL(sRuinsTestPal_SymbolShot_Frame3, ARRAY_SIZE(sRuinsTestPal_SymbolShot_Frame3));
SoundPlay(0x1D4);
SoundPlay(SOUND_RUINS_TEST_SYMBOLS_MERGING);
break;
}
}
@ -1885,13 +1886,13 @@ void RuinsTestGhostOutline(void)
else
gCurrentSprite.pOam = sRuinsTestGhostOutlineOam_Spawning;
SoundPlay(0x1DB);
SoundPlay(SOUND_RUINS_TEST_LIGHTNING_WARNING);
}
else
{
gCurrentSprite.drawOrder = 13;
gCurrentSprite.pOam = sRuinsTestGhostOutlineOam_Spawning;
SoundPlay(0x1D6);
SoundPlay(SOUND_RUINS_TEST_OUTLINE_SPAWNING);
}
gCurrentSprite.pose = 0x9;
@ -1901,7 +1902,7 @@ void RuinsTestGhostOutline(void)
if (gCurrentSprite.roomSlot != RUINS_TEST_GHOST_OUTLINE_PART_OUTLINE && gCurrentSprite.currentAnimationFrame == 4 &&
gCurrentSprite.animationDurationCounter == 8)
{
MakeBackgroundFlash(0x3); // Undefined || Quick flash
MakeBackgroundFlash(BG_FLASH_QUICK_YELLOW);
// Spawn lightning
if (gCurrentSprite.roomSlot == RUINS_TEST_GHOST_OUTLINE_PART_SHOOTING_GROUND_LIGHTNING)
@ -1967,7 +1968,7 @@ void RuinsTestShootableSymbol(void)
gCurrentSprite.pose = RUINS_TEST_SHOOTABLE_SYMBOL_POSE_SPAWNING;
gCurrentSprite.samusCollision = SSC_NONE;
SoundPlay(0x1D8);
SoundPlay(SOUND_RUINS_TEST_SHOOTABLE_SYMBOL);
break;
case RUINS_TEST_SHOOTABLE_SYMBOL_POSE_SPAWNING:
@ -1989,7 +1990,7 @@ void RuinsTestShootableSymbol(void)
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.pose = RUINS_TEST_SHOOTABLE_SYMBOL_POSE_DESPAWNING;
SoundFade(0x1D8, 0x28);
SoundFade(SOUND_RUINS_TEST_SHOOTABLE_SYMBOL, TWO_THIRD_SECOND);
}
break;
@ -2308,7 +2309,7 @@ void RuinsTestLightning(void)
// Static lightning, kill
gCurrentSprite.status = 0;
ParticleSet(gCurrentSprite.yPosition, gCurrentSprite.xPosition, PE_SPRITE_EXPLOSION_HUGE);
SoundPlay(0x1DD);
SoundPlay(SOUND_RUINS_TEST_STATIC_LIGHTNING_HITTING_GROUND);
}
else
{
@ -2318,7 +2319,7 @@ void RuinsTestLightning(void)
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.pose = RUINS_TEST_LIGHTNING_POSE_GOING_ON_GROUND;
SoundPlay(0x1DE);
SoundPlay(SOUND_RUINS_TEST_GROUND_LIGHTNING_MOVING);
}
}
else
@ -2330,7 +2331,7 @@ void RuinsTestLightning(void)
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
{
gCurrentSprite.status |= SPRITE_STATUS_FACING_DOWN;
SoundPlay(0x1DC);
SoundPlay(SOUND_RUINS_TEST_SHOOTING_LIGHTNING);
}
}
}
@ -2352,7 +2353,7 @@ void RuinsTestLightning(void)
if (gCurrentSprite.roomSlot == RUINS_TEST_LIGHTNING_PART_GROUND_RIGHT)
{
if (MOD_AND(gCurrentSprite.work0++, 32) == 0)
SoundPlay(0x1DE);
SoundPlay(SOUND_RUINS_TEST_GROUND_LIGHTNING_MOVING);
}
// Move
@ -2390,7 +2391,7 @@ void RuinsTestLightning(void)
if (gCurrentSprite.roomSlot == RUINS_TEST_LIGHTNING_PART_GROUND_RIGHT)
{
if (MOD_AND(gCurrentSprite.work0++, 32) == 0)
SoundPlay(0x1DE);
SoundPlay(SOUND_RUINS_TEST_GROUND_LIGHTNING_MOVING);
}
// Move
gCurrentSprite.yPosition -= velocity;

11
src/sprites_AI/save_platform.c
View File

@ -3,6 +3,7 @@
#include "data/sprites/save_platform.h"
#include "constants/audio.h"
#include "constants/escape.h"
#include "constants/sprite.h"
#include "constants/samus.h"
@ -106,7 +107,7 @@ void SavePlatformSamusDetection(void)
gCurrentSprite.pOam = sSavePlatformOAM_Opening;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x112);
SoundPlay(SOUND_SAVE_PLATFORM_OPENING);
}
}
else
@ -154,7 +155,7 @@ void SavePlatformSecondSamusDetection(void)
gCurrentSprite.pOam = sSavePlatformOAM_Closing;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x113);
SoundPlay(SOUND_SAVE_PLATFORM_CLOSING);
}
}
@ -202,7 +203,7 @@ void SavePlatformSamusDetectionOut(void)
gCurrentSprite.pOam = sSavePlatformOAM_Closing;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x113);
SoundPlay(SOUND_SAVE_PLATFORM_CLOSING);
}
}
@ -239,7 +240,7 @@ void SavePlatformSavePrompt(void)
gSpriteData[gCurrentSprite.work3].pose = SAVE_PLATFORM_PART_POSE_TOP_EXTENDING_INIT;
gSamusData.timer = FALSE;
SoundPlay(0x114);
SoundPlay(SOUND_SAVING);
}
else
{
@ -450,7 +451,7 @@ void SavePlatformPartTopRetractingInit(void)
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.pose = SAVE_PLATFORM_PART_POSE_TOP_RETRACTING;
gSamusData.timer = TRUE;
SoundPlay(0x115);
SoundPlay(SOUND_SAVE_PLATFORM_RETRACTING);
}
/**

17
src/sprites_AI/save_platform_chozodia.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/save_platform_chozodia.h"
#include "constants/audio.h"
#include "constants/escape.h"
#include "constants/sprite.h"
#include "constants/samus.h"
@ -95,7 +96,7 @@ void SavePlatformChozodiaSamusDetection(void)
gCurrentSprite.pOam = sSavePlatformChozodiaOAM_Opening;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x127);
SoundPlay(SOUND_CHOZODIA_SAVE_PLATFORM_OPENING);
}
}
else
@ -145,7 +146,7 @@ void SavePlatformChozodiaSecondSamusDetection(void)
gCurrentSprite.pOam = sSavePlatformChozodiaOAM_Closing;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x128);
SoundPlay(SOUND_CHOZODIA_SAVE_PLATFORM_CLOSING);
}
}
@ -193,7 +194,7 @@ void SavePlatformChozodiaSamusDetectionOut(void)
gCurrentSprite.pOam = sSavePlatformChozodiaOAM_Closing;
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
SoundPlay(0x128);
SoundPlay(SOUND_CHOZODIA_SAVE_PLATFORM_CLOSING);
}
}
@ -242,7 +243,7 @@ void SavePlatformChozodiaCheckRefill(void)
gCurrentSprite.yPosition, gCurrentSprite.xPosition, 0x0);
TransparencySpriteUpdateBLDALPHA(0x7, 0x10, 0x0, 0x10);
SoundPlay(0x129);
SoundPlay(SOUND_CHOZODIA_SAVE_PLATFORM_REFILL);
}
}
}
@ -277,7 +278,7 @@ void SavePlatformChozodiaRefill(void)
{
gSamusData.timer = TRUE;
TransparencySpriteUpdateBLDALPHA(0x0, 0x10, 0x0, 0x10);
SoundFade(0x129, 0x14);
SoundFade(SOUND_CHOZODIA_SAVE_PLATFORM_REFILL, ONE_THIRD_SECOND);
}
}
else
@ -336,7 +337,7 @@ void SavePlatformChozodiaRefill(void)
{
gSamusData.timer = TRUE;
TransparencySpriteUpdateBLDALPHA(0x0, 0x10, 0x0, 0x10);
SoundFade(0x129, 0x14);
SoundFade(SOUND_CHOZODIA_SAVE_PLATFORM_REFILL, ONE_THIRD_SECOND);
}
}
else
@ -400,7 +401,7 @@ void SavePlatformChozodiaSavePrompt(void)
gSpriteData[gCurrentSprite.work3].pose = SAVE_PLATFORM_CHOZODIA_PART_POSE_TOP_EXTENDING_INIT;
gSamusData.timer = FALSE;
SoundPlay(0x114);
SoundPlay(SOUND_SAVING);
}
else
{
@ -650,7 +651,7 @@ void SavePlatformChozodiaPartTopRetractingInit(void)
gCurrentSprite.pose = SAVE_PLATFORM_CHOZODIA_PART_POSE_TOP_RETRACTING;
gSamusData.timer = TRUE;
SoundPlay(0x115);
SoundPlay(SOUND_SAVE_PLATFORM_RETRACTING);
}
/**

2
src/sprites_AI/searchlight_eye.c
View File

@ -465,7 +465,7 @@ void SearchlightEyeProjectile(void)
}
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x26D);
SoundPlay(SOUND_SEARCHLIGHT_EYE_PROJECTILE_EMERGING);
case 9:
if (gCurrentSprite.status & SPRITE_STATUS_X_FLIP)

5
src/sprites_AI/security_gate.c
View File

@ -2,6 +2,7 @@
#include "data/sprites/security_gate.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -49,7 +50,7 @@ void SecurityGateOpen(void)
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.pose = 0x27;
SecurityGateChangeCcaa(CAA_REMOVE_SOLID); // Remove collision
SoundPlayNotAlreadyPlaying(0x225);
SoundPlayNotAlreadyPlaying(SOUND_SECURITY_GATE_OPENING);
}
/**
@ -63,7 +64,7 @@ void SecurityGateStartClosing(void)
gCurrentSprite.animationDurationCounter = 0x0;
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.pose = 0x23;
SoundPlayNotAlreadyPlaying(0x109);
SoundPlayNotAlreadyPlaying(SOUND_SECURITY_GATE_CLOSING);
}
/**

10
src/sprites_AI/security_laser.c
View File

@ -1,8 +1,12 @@
#include "gba.h"
#include "sprites_AI/security_laser.h"
#include "gba.h"
#include "data/sprites/security_laser.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/sprite.h"
#include "structs/sprite.h"
/**
@ -190,11 +194,11 @@ void SecurityLaserIdle(void)
break;
default:
gCurrentSprite.status = 0x0;
gCurrentSprite.status = 0;
return;
}
SoundPlay(0x10A);
SoundPlay(SOUND_SECURITY_LASER_TRIPPED);
}
/**

13
src/sprites_AI/sidehopper.c
View File

@ -5,6 +5,7 @@
#include "data/sprite_data.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -113,7 +114,7 @@ void SidehopperJumpingInit(void)
gCurrentSprite.hitboxTop = -0x70;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x17F);
SoundPlayNotAlreadyPlaying(SOUND_SIDEHOPPER_JUMPING);
}
/**
@ -134,7 +135,7 @@ void SidehopperLandingInit(void)
gCurrentSprite.hitboxTop = -0x5C;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x180);
SoundPlayNotAlreadyPlaying(SOUND_SIDEHOPPER_LANDING);
}
/**
@ -160,7 +161,7 @@ void SidehopperIdleInit(void)
{
gCurrentSprite.pOam = sSidehopperOAM_ShakingHead;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x181);
SoundPlayNotAlreadyPlaying(SOUND_SIDEHOPPER_SHAKING_HEAD);
}
}
}
@ -592,7 +593,7 @@ void SidehopperIdleGround(void)
else
{
if (gCurrentSprite.pOam == sSidehopperOAM_ShakingHead && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x181);
SoundPlayNotAlreadyPlaying(SOUND_SIDEHOPPER_SHAKING_HEAD);
}
}
}
@ -615,7 +616,7 @@ void SidehopperIdleCeiling(void)
else
{
if (gCurrentSprite.pOam == sSidehopperOAM_ShakingHead && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x181);
SoundPlayNotAlreadyPlaying(SOUND_SIDEHOPPER_SHAKING_HEAD);
}
}
}
@ -647,7 +648,7 @@ void Sidehopper(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x182);
SoundPlayNotAlreadyPlaying(SOUND_SIDEHOPPER_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

46
src/sprites_AI/skree.c
View File

@ -4,8 +4,9 @@
#include "data/sprites/skree.h"
#include "data/sprite_data.h"
#include "constants/particle.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -26,8 +27,8 @@ void SkreeInit(void)
gCurrentSprite.hitboxTop = 0;
gCurrentSprite.hitboxBottom = BLOCK_SIZE + HALF_BLOCK_SIZE;
gCurrentSprite.hitboxLeft = -(QUARTER_BLOCK_SIZE + PIXEL_SIZE * 2);
gCurrentSprite.hitboxRight = (QUARTER_BLOCK_SIZE + PIXEL_SIZE * 2);
gCurrentSprite.hitboxLeft = -(QUARTER_BLOCK_SIZE + EIGHTH_BLOCK_SIZE);
gCurrentSprite.hitboxRight = (QUARTER_BLOCK_SIZE + EIGHTH_BLOCK_SIZE);
gCurrentSprite.health = GET_PSPRITE_HEALTH(gCurrentSprite.spriteId);
gCurrentSprite.yPosition -= BLOCK_SIZE;
@ -112,7 +113,7 @@ void SkreeGoingDownInit(void)
gCurrentSprite.status |= SPRITE_STATUS_FACING_RIGHT;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x141);
SoundPlay(SOUND_SKREE_GOING_DOWN);
}
/**
@ -135,7 +136,7 @@ void SkreeGoDown(void)
gCurrentSprite.pose = SKREE_POSE_CRASHING;
gCurrentSprite.work0 = 0x0;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x142);
SoundPlay(SOUND_SKREE_CRASHING);
}
else
{
@ -199,13 +200,13 @@ void SkreeCrashGround(void)
case 1:
yPosition += 0x48;
SpriteDebrisInit(0, 17, yPosition - QUARTER_BLOCK_SIZE, xPosition);
SpriteDebrisInit(0, 18, yPosition, xPosition + (PIXEL_SIZE * 3));
SpriteDebrisInit(0, 18, yPosition, xPosition + (QUARTER_BLOCK_SIZE - PIXEL_SIZE));
SpriteDebrisInit(0, 19, yPosition - (HALF_BLOCK_SIZE + PIXEL_SIZE * 2 + PIXEL_SIZE / 2),
SpriteDebrisInit(0, 19, yPosition - (HALF_BLOCK_SIZE + EIGHTH_BLOCK_SIZE + PIXEL_SIZE / 2),
xPosition + (QUARTER_BLOCK_SIZE + PIXEL_SIZE));
SpriteDebrisInit(0, 4, yPosition - (QUARTER_BLOCK_SIZE + PIXEL_SIZE * 2),
xPosition - (QUARTER_BLOCK_SIZE + PIXEL_SIZE * 3 + PIXEL_SIZE / 2));
SpriteDebrisInit(0, 4, yPosition - (QUARTER_BLOCK_SIZE + EIGHTH_BLOCK_SIZE),
xPosition - (QUARTER_BLOCK_SIZE + (QUARTER_BLOCK_SIZE - PIXEL_SIZE) + PIXEL_SIZE / 2));
break;
case 40:
@ -222,22 +223,21 @@ void SkreeCrashGround(void)
spriteId = SSPRITE_SKREE_EXPLOSION;
SpriteSpawnSecondary(spriteId, SKREE_EXPLOSION_PART_GOING_UP, gfxSlot, ramSlot,
yPosition - (PIXEL_SIZE * 2), xPosition, 0);
yPosition - EIGHTH_BLOCK_SIZE, xPosition, 0);
SpriteSpawnSecondary(spriteId, SKREE_EXPLOSION_PART_GOING_UP, gfxSlot, ramSlot,
yPosition - (PIXEL_SIZE * 2), xPosition, SPRITE_STATUS_X_FLIP);
yPosition - EIGHTH_BLOCK_SIZE, xPosition, SPRITE_STATUS_X_FLIP);
SpriteSpawnSecondary(spriteId, SKREE_EXPLOSION_PART_GOING_DOWN, gfxSlot, ramSlot,
yPosition + (PIXEL_SIZE * 2), xPosition - (PIXEL_SIZE * 3), 0);
yPosition + EIGHTH_BLOCK_SIZE, xPosition - (QUARTER_BLOCK_SIZE - PIXEL_SIZE), 0);
SpriteSpawnSecondary(spriteId, SKREE_EXPLOSION_PART_GOING_DOWN, gfxSlot, ramSlot,
yPosition + (PIXEL_SIZE * 2), xPosition + (PIXEL_SIZE * 3), SPRITE_STATUS_X_FLIP);
yPosition + EIGHTH_BLOCK_SIZE, xPosition + (QUARTER_BLOCK_SIZE - PIXEL_SIZE), SPRITE_STATUS_X_FLIP);
gCurrentSprite.status = 0;
ParticleSet(yPosition + HALF_BLOCK_SIZE + PIXEL_SIZE, xPosition, PE_SPRITE_EXPLOSION_HUGE);
SoundPlay(0x134);
SoundPlay(SOUND_SKREE_EXPLODING);
}
}
@ -255,10 +255,10 @@ void SkreeExplosionInit(void)
gCurrentSprite.drawDistanceBottom = SUB_PIXEL_TO_PIXEL(BLOCK_SIZE);
gCurrentSprite.drawDistanceHorizontal = SUB_PIXEL_TO_PIXEL(BLOCK_SIZE);
gCurrentSprite.hitboxTop = -(PIXEL_SIZE * 3);
gCurrentSprite.hitboxBottom = (PIXEL_SIZE * 3);
gCurrentSprite.hitboxLeft = -(PIXEL_SIZE * 3);
gCurrentSprite.hitboxRight = (PIXEL_SIZE * 3);
gCurrentSprite.hitboxTop = -(QUARTER_BLOCK_SIZE - PIXEL_SIZE);
gCurrentSprite.hitboxBottom = (QUARTER_BLOCK_SIZE - PIXEL_SIZE);
gCurrentSprite.hitboxLeft = -(QUARTER_BLOCK_SIZE - PIXEL_SIZE);
gCurrentSprite.hitboxRight = (QUARTER_BLOCK_SIZE - PIXEL_SIZE);
gCurrentSprite.animationDurationCounter = 0;
gCurrentSprite.currentAnimationFrame = 0;
@ -268,7 +268,7 @@ void SkreeExplosionInit(void)
gCurrentSprite.drawOrder = 3;
gCurrentSprite.bgPriority = MOD_AND(gIoRegistersBackup.BG1CNT, 4);
gCurrentSprite.yPosition += HALF_BLOCK_SIZE + PIXEL_SIZE * 2;
gCurrentSprite.yPosition += HALF_BLOCK_SIZE + EIGHTH_BLOCK_SIZE;
gCurrentSprite.status |= SPRITE_STATUS_DOUBLE_SIZE | SPRITE_STATUS_ROTATION_SCALING;
gCurrentSprite.scaling = Q_8_8(1.f);
gCurrentSprite.rotation = 0;
@ -290,12 +290,12 @@ void SkreeExplosionMove(void)
if (gCurrentSprite.status & SPRITE_STATUS_X_FLIP)
{
gCurrentSprite.xPosition += PIXEL_SIZE * 2;
gCurrentSprite.xPosition += EIGHTH_BLOCK_SIZE;
gCurrentSprite.rotation += PI / 4;
}
else
{
gCurrentSprite.xPosition -= PIXEL_SIZE * 2;
gCurrentSprite.xPosition -= EIGHTH_BLOCK_SIZE;
gCurrentSprite.rotation -= PI / 4;
}
@ -318,7 +318,7 @@ void Skree(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x143);
SoundPlayNotAlreadyPlaying(SOUND_SKREE_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0)

7
src/sprites_AI/skultera.c
View File

@ -4,8 +4,9 @@
#include "data/sprites/skultera.h"
#include "data/sprite_data.h"
#include "constants/particle.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -276,7 +277,7 @@ void SkulteraTurningAroundInit(void)
gCurrentSprite.currentAnimationFrame = 0;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x269);
SoundPlayNotAlreadyPlaying(SOUND_SKULTERA_TURNING_AROUND);
}
/**
@ -307,7 +308,7 @@ void Skultera(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x26A);
SoundPlayNotAlreadyPlaying(SOUND_SKULTERA_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0)

3
src/sprites_AI/sova.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/sova.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -921,7 +922,7 @@ void Sova(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x154);
SoundPlayNotAlreadyPlaying(SOUND_SOVA_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

32
src/sprites_AI/space_pirate.c
View File

@ -2063,7 +2063,7 @@ void SpacePirateFalling(void)
gCurrentSprite.currentAnimationFrame = 0;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x167);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_LANDING);
return;
}
@ -2195,7 +2195,7 @@ void SpacePirateWalking(void)
gCurrentSprite.scaling++;
if (gCurrentSprite.animationDurationCounter > 0x5 && !(gCurrentSprite.currentAnimationFrame & 0x3) && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x165);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_FOOTSTEPS);
}
}
@ -2619,7 +2619,7 @@ void SpacePirateWalkingAlerted(void)
gCurrentSprite.pose = SPACE_PIRATE_POSE_WALKING;
if (gCurrentSprite.animationDurationCounter > 0x5 && !(gCurrentSprite.currentAnimationFrame & 0x3) && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x165);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_FOOTSTEPS);
}
}
}
@ -2850,7 +2850,7 @@ void SpacePirateJumping(void)
}
if (gCurrentSprite.work3 == 0x0 && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x166);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_JUMPING);
if (gCurrentSprite.work1 == 0x1)
{
@ -2895,7 +2895,7 @@ void SpacePirateJumping(void)
gCurrentSprite.currentAnimationFrame = 0x0;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x167);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_LANDING);
}
}
else
@ -3304,7 +3304,9 @@ void SpacePirateClimbingUp(void)
if (gCurrentSprite.animationDurationCounter > 0x9 && !(gCurrentSprite.currentAnimationFrame & 0x3) &&
gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x16C);
{
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_CLIMBING);
}
}
/**
@ -3405,7 +3407,9 @@ void SpacePirateClimbingDown(void)
if (gCurrentSprite.animationDurationCounter > 0x9 && !(gCurrentSprite.currentAnimationFrame & 0x3) &&
gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x16C);
{
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_CLIMBING);
}
}
/**
@ -3869,7 +3873,7 @@ void SpacePirateCrawling(void)
gCurrentSprite.xPosition -= movement;
if (gCurrentSprite.animationDurationCounter > 0x9 && !(gCurrentSprite.currentAnimationFrame & 0x3) && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x16B);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_CRAWLING);
}
}
@ -4080,7 +4084,7 @@ void SpacePirateDeath(u8 playSound)
u8 type;
if (playSound && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x16A);
SoundPlay(SOUND_SPACE_PIRATE_DYING);
SpriteUtilSpriteDeath(DEATH_NORMAL, gCurrentSprite.yPosition - (BLOCK_SIZE + HALF_BLOCK_SIZE), gCurrentSprite.xPosition, TRUE, PE_SPRITE_EXPLOSION_SINGLE_THEN_BIG);
if (gAlarmTimer != 0x0)
@ -4106,7 +4110,7 @@ void SpacePirateDeath(u8 playSound)
void SpacePirateHitByLaserInit(void)
{
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x16A);
SoundPlay(SOUND_SPACE_PIRATE_DYING);
gCurrentSprite.pose = SPACE_PIRATE_POSE_HIT_BY_LASER;
gCurrentSprite.health = 0x0;
@ -4147,7 +4151,7 @@ void SpacePirateHitByLaser(void)
*/
void SpacePirateLaserInit(void)
{
u8 roomSlot;
u8 roomSlot;
gCurrentSprite.status &= ~SPRITE_STATUS_NOT_DRAWN;
gCurrentSprite.status |= SPRITE_STATUS_IGNORE_PROJECTILES;
@ -4204,7 +4208,7 @@ u8 roomSlot;
}
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x168);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_FIRING_LASER);
}
/**
@ -4226,7 +4230,7 @@ void SpacePirateLaserExplodingInit(void)
gCurrentSprite.ignoreSamusCollisionTimer = DELTA_TIME;
gCurrentSprite.bgPriority = gIoRegistersBackup.BG1CNT & 0x3;
SoundPlayNotAlreadyPlaying(0x25F);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_LASER_EXPLODING);
}
}
@ -4635,7 +4639,7 @@ void SpacePirate(void)
}
if (!alerted && (gCurrentSprite.status & (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_FACING_DOWN | SPRITE_STATUS_IGNORE_PROJECTILES)) == (SPRITE_STATUS_EXISTS | SPRITE_STATUS_ONSCREEN | SPRITE_STATUS_FACING_DOWN))
SoundPlayNotAlreadyPlaying(0x169);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_GETTING_ALERTED);
}
/**

5
src/sprites_AI/space_pirate_carrying_power_bomb.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/space_pirate.h"
#include "data/sprites/enemy_drop.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/event.h"
#include "constants/sprite.h"
@ -70,7 +71,7 @@ void SpacePirateCarryingPowerBomb(void)
gCurrentSprite.pose = SPACE_PIRATE_CARRYING_POWER_BOMB_POSE_MOVING;
if (gCurrentSprite.animationDurationCounter > 5 && MOD_AND(gCurrentSprite.currentAnimationFrame, 4) == 0)
SoundPlayNotAlreadyPlaying(0x165);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_FOOTSTEPS);
}
break;
@ -78,7 +79,7 @@ void SpacePirateCarryingPowerBomb(void)
if (gCurrentSprite.animationDurationCounter > 5 && MOD_AND(gCurrentSprite.currentAnimationFrame, 4) == 0 &&
gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
{
SoundPlayNotAlreadyPlaying(0x165);
SoundPlayNotAlreadyPlaying(SOUND_SPACE_PIRATE_FOOTSTEPS);
}
if (gCurrentSprite.status & SPRITE_STATUS_FACING_RIGHT)

11
src/sprites_AI/squeept.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/squeept.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
@ -167,7 +168,9 @@ void SqueeptGoUp(void)
if (SpriteUtilCheckOutOfRoomEffect(oldY, gCurrentSprite.yPosition, gCurrentSprite.xPosition, SPLASH_SMALL) &&
gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x155);
{
SoundPlay(SOUND_SQUEEPT_LEAVING_LAVA);
}
}
/**
@ -213,7 +216,9 @@ void SqueeptGoDown(void)
if (SpriteUtilCheckInRoomEffect(oldY, gCurrentSprite.yPosition, gCurrentSprite.xPosition, SPLASH_BIG) &&
gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x156);
{
SoundPlay(SOUND_SQUEEPT_ENTERING_LAVA);
}
if (gCurrentSprite.yPositionSpawn < gCurrentSprite.yPosition)
{
@ -232,7 +237,7 @@ void Squeept(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x157);
SoundPlayNotAlreadyPlaying(SOUND_SQUEEPT_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0)

16
src/sprites_AI/tangle_vine.c
View File

@ -57,7 +57,7 @@ void TangleVineGeruta(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x264);
SoundPlayNotAlreadyPlaying(SOUND_TANGLE_VINE_DAMAGE);
}
counter = 0;
@ -228,7 +228,7 @@ void TangleVineRedGeruta(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x264);
SoundPlayNotAlreadyPlaying(SOUND_TANGLE_VINE_DAMAGE);
}
if (gCurrentSprite.pose == 0)
@ -271,7 +271,7 @@ void TangleVineLarvaRight(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x264);
SoundPlayNotAlreadyPlaying(SOUND_TANGLE_VINE_DAMAGE);
}
if (gCurrentSprite.pose == 0)
@ -315,7 +315,7 @@ void TangleVineLarvaLeft(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x264);
SoundPlayNotAlreadyPlaying(SOUND_TANGLE_VINE_DAMAGE);
}
if (gCurrentSprite.pose == 0)
@ -362,7 +362,7 @@ void TangleVineTall(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x264);
SoundPlayNotAlreadyPlaying(SOUND_TANGLE_VINE_DAMAGE);
}
if (gCurrentSprite.pose == 0)
@ -429,7 +429,7 @@ void TangleVineMedium(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x264);
SoundPlayNotAlreadyPlaying(SOUND_TANGLE_VINE_DAMAGE);
}
if (gCurrentSprite.pose == 0)
@ -496,7 +496,7 @@ void TangleVineCurved(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x264);
SoundPlayNotAlreadyPlaying(SOUND_TANGLE_VINE_DAMAGE);
}
if (gCurrentSprite.pose == 0)
@ -563,7 +563,7 @@ void TangleVineShort(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x264);
SoundPlayNotAlreadyPlaying(SOUND_TANGLE_VINE_DAMAGE);
}
if (gCurrentSprite.pose == 0)

7
src/sprites_AI/unknown_item_block.c
View File

@ -3,6 +3,7 @@
#include "data/sprites/unknown_item_block.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/event.h"
#include "constants/sprite.h"
@ -176,11 +177,11 @@ void UnknownItemBlock(void)
// Play sound, most likely planned to have a different sound for each block
if (spriteId == PSPRITE_PLASMA_BEAM_BLOCK)
SoundPlayNotAlreadyPlaying(0x13B);
SoundPlayNotAlreadyPlaying(SOUND_UNKNOWN_ITEM_BLOCK_BREAKING);
else if (spriteId == PSPRITE_GRAVITY_SUIT_BLOCK)
SoundPlayNotAlreadyPlaying(0x13B);
SoundPlayNotAlreadyPlaying(SOUND_UNKNOWN_ITEM_BLOCK_BREAKING);
else if (spriteId == PSPRITE_SPACE_JUMP_BLOCK)
SoundPlayNotAlreadyPlaying(0x13B);
SoundPlayNotAlreadyPlaying(SOUND_UNKNOWN_ITEM_BLOCK_BREAKING);
break;
}
}

8
src/sprites_AI/unknown_item_chozo_statue.c
View File

@ -220,7 +220,7 @@ void UnknownItemChozoStatueHintFlashing(void)
if (gCurrentSprite.work0 == 0x77)
{
MakeBackgroundFlash(BG_FLASH_SLIGHT_YELLOW);
SoundPlay(0x11B); // Chozo hint
SoundPlay(SOUND_CHOZO_STATUE_HINT);
}
else if (gCurrentSprite.work0 > 0x77)
return;
@ -257,7 +257,7 @@ void UnknownItemChozoStatueSittingInit(void)
gSubSpriteData1.currentAnimationFrame = 0;
ChozoStatueStandingChangeCcaa(CAA_REMOVE_SOLID, CAA_REMOVE_SOLID);
SoundPlay(0x11C);
SoundPlay(SOUND_CHOZO_STATUE_SITTING_DOWN);
gSlowScrollingTimer = 0x3C;
}
@ -1047,12 +1047,12 @@ void UnknownItemChozoStatueRefill(void)
gCurrentSprite.currentAnimationFrame = 0;
gCurrentSprite.pOam = sUnknownItemChozoStatueRefillOam;
SoundPlay(0x10F); // Chozo statue refill
SoundPlay(SOUND_CHOZO_STATUE_REFILL);
}
else if (gSpriteData[ramSlot].pose == UNKNOWN_ITEM_CHOZO_STATUE_POSE_SLEEPING)
{
gCurrentSprite.status = 0;
SoundFade(0x10F, 0x1E); // Chozo statue refill
SoundFade(SOUND_CHOZO_STATUE_REFILL, CONVERT_SECONDS(.5f));
}
}

3
src/sprites_AI/viola.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/viola.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
@ -503,7 +504,7 @@ void Viola(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x178);
SoundPlayNotAlreadyPlaying(SOUND_VIOLA_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

5
src/sprites_AI/waver.c
View File

@ -4,8 +4,9 @@
#include "data/sprites/waver.h"
#include "data/sprite_data.h"
#include "constants/particle.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -97,7 +98,7 @@ void Waver(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x177);
SoundPlayNotAlreadyPlaying(SOUND_WAVER_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0)

13
src/sprites_AI/worker_robot.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/worker_robot.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/clipdata.h"
#include "constants/particle.h"
#include "constants/sprite.h"
@ -123,7 +124,7 @@ void WorkerRobotWakingUpInit(void)
gCurrentSprite.animationDurationCounter = 0x0;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x26F);
SoundPlayNotAlreadyPlaying(SOUND_WORKER_ROBOT_WAKING_UP);
}
void WorkerRobotChecWakingUpAnimEnded(void)
@ -330,7 +331,7 @@ void WorkerRobotWalking(void)
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN && (gCurrentSprite.currentAnimationFrame & 3) == 3 &&
gCurrentSprite.animationDurationCounter == 6)
{
SoundPlayNotAlreadyPlaying(0x26E);
SoundPlayNotAlreadyPlaying(SOUND_WORKER_ROBOT_FOOTSTEPS);
}
gCurrentSprite.animationDurationCounter += 4;
@ -366,7 +367,7 @@ void WorkerRobotWalking(void)
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN && (gCurrentSprite.currentAnimationFrame & 3) == 3 &&
gCurrentSprite.animationDurationCounter == 8)
{
SoundPlayNotAlreadyPlaying(0x26E);
SoundPlayNotAlreadyPlaying(SOUND_WORKER_ROBOT_FOOTSTEPS);
}
if (WorkerRobotCheckSamusInFront())
@ -433,7 +434,7 @@ void WorkerRobotBackToSleepInit(void)
gCurrentSprite.currentAnimationFrame = 0x0;
gCurrentSprite.animationDurationCounter = 0x0;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x270);
SoundPlayNotAlreadyPlaying(SOUND_WORKER_ROBOT_FALLING_ASLEEP);
}
void WorkerRobotCheckBackToSleepAnimEnded(void)
@ -499,7 +500,7 @@ void WorkerRobotFalling(void)
{
gCurrentSprite.yPosition = blockTop;
gCurrentSprite.pose = WORKER_ROBOT_POSE_STANDING_INIT;
SoundPlay(0x271);
SoundPlay(SOUND_WORKER_ROBOT_LANDING);
}
else
{
@ -541,7 +542,7 @@ void WorkerRobotFallingSleep(void)
{
gCurrentSprite.yPosition = blockTop;
gCurrentSprite.pose = WORKER_ROBOT_POSE_SLEEPING_INIT;
SoundPlay(0x271);
SoundPlay(SOUND_WORKER_ROBOT_LANDING);
}
else
{

11
src/sprites_AI/zeb.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/zeb.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -93,7 +94,7 @@ void ZebIdle(void)
SpriteUtilMakeSpriteFaceSamusXFlip();
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x144);
SoundPlay(SOUND_ZEB_RISING);
}
}
}
@ -170,7 +171,7 @@ void ZebMove(void)
if (gCurrentSprite.work0 == 0x0)
{
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x145);
SoundPlay(SOUND_ZEB_MOVING);
gCurrentSprite.work1 = 0x0;
}
}
@ -200,7 +201,7 @@ void ZebMove(void)
gCurrentSprite.xPosition -= 0xC; // Move
}
if (!(gCurrentSprite.work1 & 0xF) && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x145);
SoundPlay(SOUND_ZEB_MOVING);
}
}
@ -214,7 +215,7 @@ void Zeb(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x146);
SoundPlayNotAlreadyPlaying(SOUND_ZEB_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)
@ -249,4 +250,4 @@ void Zeb(void)
ZebRespawn();
}
}
}
}

9
src/sprites_AI/zebbo.c
View File

@ -4,6 +4,7 @@
#include "data/sprites/zebbo.h"
#include "data/sprite_data.h"
#include "constants/audio.h"
#include "constants/particle.h"
#include "constants/sprite.h"
#include "constants/sprite_util.h"
@ -102,7 +103,7 @@ void ZebboIdle(void)
SpriteUtilMakeSpriteFaceSamusXFlip();
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x162);
SoundPlay(SOUND_ZEBBO_RISING);
if (gCurrentSprite.spriteId == PSPRITE_ZEBBO_GREEN_LEADER)
{
@ -212,7 +213,7 @@ void ZebboMove(void)
if (gCurrentSprite.work0 == 0x0)
{
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x163);
SoundPlay(SOUND_ZEBBO_MOVING);
gCurrentSprite.work1 = 0x0;
}
@ -244,7 +245,7 @@ void ZebboMove(void)
}
if (!(gCurrentSprite.work1 & 0xF) && gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlay(0x163);
SoundPlay(SOUND_ZEBBO_MOVING);
}
}
@ -258,7 +259,7 @@ void Zebbo(void)
{
gCurrentSprite.properties &= ~SP_DAMAGED;
if (gCurrentSprite.status & SPRITE_STATUS_ONSCREEN)
SoundPlayNotAlreadyPlaying(0x164);
SoundPlayNotAlreadyPlaying(SOUND_ZEBBO_DAMAGED);
}
if (gCurrentSprite.freezeTimer != 0x0)

Some files were not shown because too many files have changed in this diff Show More