-#define IS_LOOP_SOUND(s) ((s)==SND_KLAPPER || (s)==SND_ROEHR || \
- (s)==SND_NJAM || (s)==SND_MIEP)
-#define IS_MUSIC_SOUND(s) ((s)==SND_ALCHEMY || (s)==SND_CHASE || \
- (s)==SND_NETWORK || (s)==SND_CZARDASZ || \
- (s)==SND_TYGER || (s)==SND_VOYAGER || \
- (s)==SND_TWILIGHT)
+#define IS_LOOP_SOUND(s) ((s) == SND_BD_MAGIC_WALL_RUNNING || \
+ (s) == SND_BD_BUTTERFLY_MOVING || \
+ (s) == SND_BD_FIREFLY_MOVING || \
+ (s) == SND_SP_SNIKSNAK_MOVING || \
+ (s) == SND_SP_ELECTRON_MOVING || \
+ (s) == SND_DYNAMITE_BURNING || \
+ (s) == SND_BUG_MOVING || \
+ (s) == SND_SPACESHIP_MOVING || \
+ (s) == SND_YAMYAM_MOVING || \
+ (s) == SND_YAMYAM_WAITING || \
+ (s) == SND_ROBOT_WHEEL_RUNNING || \
+ (s) == SND_MAGIC_WALL_RUNNING || \
+ (s) == SND_BALLOON_MOVING || \
+ (s) == SND_MOLE_MOVING || \
+ (s) == SND_TIMEGATE_WHEEL_RUNNING || \
+ (s) == SND_CONVEYOR_BELT_RUNNING || \
+ (s) == SND_DYNABOMB_BURNING || \
+ (s) == SND_PACMAN_MOVING || \
+ (s) == SND_PENGUIN_MOVING || \
+ (s) == SND_PIG_MOVING || \
+ (s) == SND_DRAGON_MOVING || \
+ (s) == SND_DRAGON_BREATHING_FIRE)