From 1fd893088129a8eb396dc0ec2f1e1a64136c7222 Mon Sep 17 00:00:00 2001 From: Gregory Heskett Date: Tue, 29 Aug 2023 08:49:40 -0400 Subject: [PATCH] Remove singular version ifdef from sounds.h (#655) Makes tooling more difficult but also just hard to look at --- include/sounds.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/include/sounds.h b/include/sounds.h index 5fc0a074..80758f9d 100644 --- a/include/sounds.h +++ b/include/sounds.h @@ -289,13 +289,7 @@ enum SoundBank { #define SOUND_GENERAL_PLATFORM /* 0x302D8081 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x2D, 0x80, SOUND_DISCRETE) // unverified #define SOUND_GENERAL_DONUT_PLATFORM_EXPLOSION /* 0x302E2081 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x2E, 0x20, SOUND_DISCRETE) #define SOUND_GENERAL_BOWSER_BOMB_EXPLOSION /* 0x312F0081 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x2F, 0x00, SOUND_NO_VOLUME_LOSS | SOUND_DISCRETE) -#if defined(VERSION_JP) -#define SOUND_GENERAL_COIN_SPURT /* 0x30300081 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x30, 0x00, SOUND_DISCRETE) // unverified -#elif defined(VERSION_US) #define SOUND_GENERAL_COIN_SPURT /* 0x38300081 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x30, 0x00, SOUND_CONSTANT_FREQUENCY | SOUND_DISCRETE) // unverified -#else -#define SOUND_GENERAL_COIN_SPURT /* 0x38302081 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x30, 0x20, SOUND_CONSTANT_FREQUENCY | SOUND_DISCRETE) // unverified -#endif #define SOUND_GENERAL_EXPLOSION6 /* 0x30310001 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x31, 0x00, 0) // unverified, unused #define SOUND_GENERAL_UNK32 /* 0x30320001 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x32, 0x00, 0) // unverified, unused #define SOUND_GENERAL_DRAWBRIDGE_LOWER /* 0x30344081 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x34, 0x40, SOUND_DISCRETE) // unverified