diff --git a/Makefile b/Makefile
index 0ad275436..b76f6fb01 100644
--- a/Makefile
+++ b/Makefile
@@ -486,11 +486,12 @@ ifeq ($(TARGET_BITS), 32)
   _ := $(shell rm -rf sound/samples/sfx_custom_luigi_peach/*.aiff)
   _ := $(shell rm -rf sound/samples/sfx_custom_wario/*.aiff)
   _ := $(shell rm -rf sound/samples/sfx_custom_wario_peach/*.aiff)
-endif
 
 # Copy missing character sounds from mario sound banks
 _ := $(shell $(PYTHON) $(TOOLS_DIR)/copy_mario_sounds.py)
 
+endif
+
 # Copy missing instrument samples from the music sound banks
 _ := $(shell $(PYTHON) $(TOOLS_DIR)/copy_extended_sounds.py)
 
diff --git a/sound/samples/sfx_custom_luigi/00.aiff b/sound/samples/sfx_custom_luigi/00.aiff
index 35dbf3e8f..69e7d4a6d 100644
Binary files a/sound/samples/sfx_custom_luigi/00.aiff and b/sound/samples/sfx_custom_luigi/00.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/01.aiff b/sound/samples/sfx_custom_luigi/01.aiff
index 23c91ff42..8ae365725 100644
Binary files a/sound/samples/sfx_custom_luigi/01.aiff and b/sound/samples/sfx_custom_luigi/01.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/02.aiff b/sound/samples/sfx_custom_luigi/02.aiff
index fde28d355..f0a85ad36 100644
Binary files a/sound/samples/sfx_custom_luigi/02.aiff and b/sound/samples/sfx_custom_luigi/02.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/03.aiff b/sound/samples/sfx_custom_luigi/03.aiff
index 4311a327f..c6b78f013 100644
Binary files a/sound/samples/sfx_custom_luigi/03.aiff and b/sound/samples/sfx_custom_luigi/03.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/04.aiff b/sound/samples/sfx_custom_luigi/04.aiff
index 6fcabe25a..9112a264f 100644
Binary files a/sound/samples/sfx_custom_luigi/04.aiff and b/sound/samples/sfx_custom_luigi/04.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/05.aiff b/sound/samples/sfx_custom_luigi/05.aiff
index fa484f15f..cc04d6013 100644
Binary files a/sound/samples/sfx_custom_luigi/05.aiff and b/sound/samples/sfx_custom_luigi/05.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/06.aiff b/sound/samples/sfx_custom_luigi/06.aiff
index f14d48189..45aadf13f 100644
Binary files a/sound/samples/sfx_custom_luigi/06.aiff and b/sound/samples/sfx_custom_luigi/06.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/07.aiff b/sound/samples/sfx_custom_luigi/07.aiff
index c0d8fe2c3..c46b5d76c 100644
Binary files a/sound/samples/sfx_custom_luigi/07.aiff and b/sound/samples/sfx_custom_luigi/07.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/08.aiff b/sound/samples/sfx_custom_luigi/08.aiff
index 67eb2f2ce..ddd7464f0 100644
Binary files a/sound/samples/sfx_custom_luigi/08.aiff and b/sound/samples/sfx_custom_luigi/08.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/09.aiff b/sound/samples/sfx_custom_luigi/09.aiff
index 7f68c22c5..a4f69d6e4 100644
Binary files a/sound/samples/sfx_custom_luigi/09.aiff and b/sound/samples/sfx_custom_luigi/09.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/0A.aiff b/sound/samples/sfx_custom_luigi/0A.aiff
index 853ea0950..d99f5f25c 100644
Binary files a/sound/samples/sfx_custom_luigi/0A.aiff and b/sound/samples/sfx_custom_luigi/0A.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/0B.aiff b/sound/samples/sfx_custom_luigi/0B.aiff
index 1926332f5..0b939b032 100644
Binary files a/sound/samples/sfx_custom_luigi/0B.aiff and b/sound/samples/sfx_custom_luigi/0B.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/0C.aiff b/sound/samples/sfx_custom_luigi/0C.aiff
index 0c63ebd77..153bc241f 100644
Binary files a/sound/samples/sfx_custom_luigi/0C.aiff and b/sound/samples/sfx_custom_luigi/0C.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/0D.aiff b/sound/samples/sfx_custom_luigi/0D.aiff
index 6a1d02284..e205b343a 100644
Binary files a/sound/samples/sfx_custom_luigi/0D.aiff and b/sound/samples/sfx_custom_luigi/0D.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/0E.aiff b/sound/samples/sfx_custom_luigi/0E.aiff
index a6a8f409c..f82e5cd9c 100644
Binary files a/sound/samples/sfx_custom_luigi/0E.aiff and b/sound/samples/sfx_custom_luigi/0E.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/0F.aiff b/sound/samples/sfx_custom_luigi/0F.aiff
index cefd9073c..332d7b08f 100644
Binary files a/sound/samples/sfx_custom_luigi/0F.aiff and b/sound/samples/sfx_custom_luigi/0F.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/10.aiff b/sound/samples/sfx_custom_luigi/10.aiff
index b36d0a225..c21cce33a 100644
Binary files a/sound/samples/sfx_custom_luigi/10.aiff and b/sound/samples/sfx_custom_luigi/10.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/11.aiff b/sound/samples/sfx_custom_luigi/11.aiff
index 9a21a440e..39a04f64f 100644
Binary files a/sound/samples/sfx_custom_luigi/11.aiff and b/sound/samples/sfx_custom_luigi/11.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/12.aiff b/sound/samples/sfx_custom_luigi/12.aiff
index d53710390..0ca289e94 100644
Binary files a/sound/samples/sfx_custom_luigi/12.aiff and b/sound/samples/sfx_custom_luigi/12.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/13.aiff b/sound/samples/sfx_custom_luigi/13.aiff
index b9d255098..5b8bbaee7 100644
Binary files a/sound/samples/sfx_custom_luigi/13.aiff and b/sound/samples/sfx_custom_luigi/13.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/14.aiff b/sound/samples/sfx_custom_luigi/14.aiff
index 7f822f046..4f5600896 100644
Binary files a/sound/samples/sfx_custom_luigi/14.aiff and b/sound/samples/sfx_custom_luigi/14.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/15.aiff b/sound/samples/sfx_custom_luigi/15.aiff
index 9b7b10ea8..825a7def1 100644
Binary files a/sound/samples/sfx_custom_luigi/15.aiff and b/sound/samples/sfx_custom_luigi/15.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/16.aiff b/sound/samples/sfx_custom_luigi/16.aiff
index 3d8dfdb10..4dbc2dc6a 100644
Binary files a/sound/samples/sfx_custom_luigi/16.aiff and b/sound/samples/sfx_custom_luigi/16.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/17.aiff b/sound/samples/sfx_custom_luigi/17.aiff
index 4bf805d47..eb66c2231 100644
Binary files a/sound/samples/sfx_custom_luigi/17.aiff and b/sound/samples/sfx_custom_luigi/17.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/18.aiff b/sound/samples/sfx_custom_luigi/18.aiff
index e5252e58b..9aeb459aa 100644
Binary files a/sound/samples/sfx_custom_luigi/18.aiff and b/sound/samples/sfx_custom_luigi/18.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/19.aiff b/sound/samples/sfx_custom_luigi/19.aiff
index d0e032b17..eada883a0 100644
Binary files a/sound/samples/sfx_custom_luigi/19.aiff and b/sound/samples/sfx_custom_luigi/19.aiff differ
diff --git a/sound/samples/sfx_custom_luigi/1A.aiff b/sound/samples/sfx_custom_luigi/1A.aiff
index 13f24b963..878038cd1 100644
Binary files a/sound/samples/sfx_custom_luigi/1A.aiff and b/sound/samples/sfx_custom_luigi/1A.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/00.aiff b/sound/samples/sfx_custom_luigi_peach/00.aiff
index afebd48a8..68089026e 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/00.aiff and b/sound/samples/sfx_custom_luigi_peach/00.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/01.aiff b/sound/samples/sfx_custom_luigi_peach/01.aiff
index f21499dd8..4c77a627e 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/01.aiff and b/sound/samples/sfx_custom_luigi_peach/01.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/02.aiff b/sound/samples/sfx_custom_luigi_peach/02.aiff
index 5df1b0a2b..209f8a897 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/02.aiff and b/sound/samples/sfx_custom_luigi_peach/02.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/03.aiff b/sound/samples/sfx_custom_luigi_peach/03.aiff
index 1098051e8..6384e85e4 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/03.aiff and b/sound/samples/sfx_custom_luigi_peach/03.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/04.aiff b/sound/samples/sfx_custom_luigi_peach/04.aiff
index cce7632d0..b8a8630fb 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/04.aiff and b/sound/samples/sfx_custom_luigi_peach/04.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/05.aiff b/sound/samples/sfx_custom_luigi_peach/05.aiff
index 0b94fd0eb..ca0a9b85b 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/05.aiff and b/sound/samples/sfx_custom_luigi_peach/05.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/06.aiff b/sound/samples/sfx_custom_luigi_peach/06.aiff
index c03c34da3..b94bb8a8b 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/06.aiff and b/sound/samples/sfx_custom_luigi_peach/06.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/07.aiff b/sound/samples/sfx_custom_luigi_peach/07.aiff
index 15ecd7f8b..cf929d28d 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/07.aiff and b/sound/samples/sfx_custom_luigi_peach/07.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/08.aiff b/sound/samples/sfx_custom_luigi_peach/08.aiff
index 80840ed27..56af140fc 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/08.aiff and b/sound/samples/sfx_custom_luigi_peach/08.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/09.aiff b/sound/samples/sfx_custom_luigi_peach/09.aiff
index 7ca106779..c44fec71f 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/09.aiff and b/sound/samples/sfx_custom_luigi_peach/09.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/0A.aiff b/sound/samples/sfx_custom_luigi_peach/0A.aiff
index 367d4fdf6..d000c33fa 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/0A.aiff and b/sound/samples/sfx_custom_luigi_peach/0A.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/0B.aiff b/sound/samples/sfx_custom_luigi_peach/0B.aiff
index 1cfc02abe..7b70e1147 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/0B.aiff and b/sound/samples/sfx_custom_luigi_peach/0B.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/0C.aiff b/sound/samples/sfx_custom_luigi_peach/0C.aiff
index 336ec098f..8036d2e3d 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/0C.aiff and b/sound/samples/sfx_custom_luigi_peach/0C.aiff differ
diff --git a/sound/samples/sfx_custom_luigi_peach/0D.aiff b/sound/samples/sfx_custom_luigi_peach/0D.aiff
index 1cc070604..f45aa9c77 100644
Binary files a/sound/samples/sfx_custom_luigi_peach/0D.aiff and b/sound/samples/sfx_custom_luigi_peach/0D.aiff differ
diff --git a/sound/samples/sfx_custom_wario/00.aiff b/sound/samples/sfx_custom_wario/00.aiff
index aaeab8ad5..64140de3f 100644
Binary files a/sound/samples/sfx_custom_wario/00.aiff and b/sound/samples/sfx_custom_wario/00.aiff differ
diff --git a/sound/samples/sfx_custom_wario/01.aiff b/sound/samples/sfx_custom_wario/01.aiff
index 079e4941f..6cf75262b 100644
Binary files a/sound/samples/sfx_custom_wario/01.aiff and b/sound/samples/sfx_custom_wario/01.aiff differ
diff --git a/sound/samples/sfx_custom_wario/02.aiff b/sound/samples/sfx_custom_wario/02.aiff
index 6962a2cb5..d42473660 100644
Binary files a/sound/samples/sfx_custom_wario/02.aiff and b/sound/samples/sfx_custom_wario/02.aiff differ
diff --git a/sound/samples/sfx_custom_wario/03.aiff b/sound/samples/sfx_custom_wario/03.aiff
index a7b17df61..526951bd6 100644
Binary files a/sound/samples/sfx_custom_wario/03.aiff and b/sound/samples/sfx_custom_wario/03.aiff differ
diff --git a/sound/samples/sfx_custom_wario/04.aiff b/sound/samples/sfx_custom_wario/04.aiff
index dfd1142d5..9005015b5 100644
Binary files a/sound/samples/sfx_custom_wario/04.aiff and b/sound/samples/sfx_custom_wario/04.aiff differ
diff --git a/sound/samples/sfx_custom_wario/05.aiff b/sound/samples/sfx_custom_wario/05.aiff
index a5c15a4a7..74947ae4b 100644
Binary files a/sound/samples/sfx_custom_wario/05.aiff and b/sound/samples/sfx_custom_wario/05.aiff differ
diff --git a/sound/samples/sfx_custom_wario/06.aiff b/sound/samples/sfx_custom_wario/06.aiff
index 49126f2df..eceb4a1f0 100644
Binary files a/sound/samples/sfx_custom_wario/06.aiff and b/sound/samples/sfx_custom_wario/06.aiff differ
diff --git a/sound/samples/sfx_custom_wario/07.aiff b/sound/samples/sfx_custom_wario/07.aiff
index 1ea4a2cf5..2fcd4c255 100644
Binary files a/sound/samples/sfx_custom_wario/07.aiff and b/sound/samples/sfx_custom_wario/07.aiff differ
diff --git a/sound/samples/sfx_custom_wario/08.aiff b/sound/samples/sfx_custom_wario/08.aiff
index 3c3a5cf03..e2450d37f 100644
Binary files a/sound/samples/sfx_custom_wario/08.aiff and b/sound/samples/sfx_custom_wario/08.aiff differ
diff --git a/sound/samples/sfx_custom_wario/09.aiff b/sound/samples/sfx_custom_wario/09.aiff
index aa5c38f79..c01ff53d9 100644
Binary files a/sound/samples/sfx_custom_wario/09.aiff and b/sound/samples/sfx_custom_wario/09.aiff differ
diff --git a/sound/samples/sfx_custom_wario/0A.aiff b/sound/samples/sfx_custom_wario/0A.aiff
index c28811be9..77623ca8d 100644
Binary files a/sound/samples/sfx_custom_wario/0A.aiff and b/sound/samples/sfx_custom_wario/0A.aiff differ
diff --git a/sound/samples/sfx_custom_wario/0B.aiff b/sound/samples/sfx_custom_wario/0B.aiff
index c4a5a1592..a0fbb217e 100644
Binary files a/sound/samples/sfx_custom_wario/0B.aiff and b/sound/samples/sfx_custom_wario/0B.aiff differ
diff --git a/sound/samples/sfx_custom_wario/0C.aiff b/sound/samples/sfx_custom_wario/0C.aiff
index c6b9655f3..201814212 100644
Binary files a/sound/samples/sfx_custom_wario/0C.aiff and b/sound/samples/sfx_custom_wario/0C.aiff differ
diff --git a/sound/samples/sfx_custom_wario/0D.aiff b/sound/samples/sfx_custom_wario/0D.aiff
index 088ba470c..70ed9d6e7 100644
Binary files a/sound/samples/sfx_custom_wario/0D.aiff and b/sound/samples/sfx_custom_wario/0D.aiff differ
diff --git a/sound/samples/sfx_custom_wario/0E.aiff b/sound/samples/sfx_custom_wario/0E.aiff
index 69c2fed46..ac6ac6c10 100644
Binary files a/sound/samples/sfx_custom_wario/0E.aiff and b/sound/samples/sfx_custom_wario/0E.aiff differ
diff --git a/sound/samples/sfx_custom_wario/0F.aiff b/sound/samples/sfx_custom_wario/0F.aiff
index 0d5261886..630dde18a 100644
Binary files a/sound/samples/sfx_custom_wario/0F.aiff and b/sound/samples/sfx_custom_wario/0F.aiff differ
diff --git a/sound/samples/sfx_custom_wario/10.aiff b/sound/samples/sfx_custom_wario/10.aiff
index 6e42b62d7..884e70e40 100644
Binary files a/sound/samples/sfx_custom_wario/10.aiff and b/sound/samples/sfx_custom_wario/10.aiff differ
diff --git a/sound/samples/sfx_custom_wario/11.aiff b/sound/samples/sfx_custom_wario/11.aiff
index ade062790..55a9e1761 100644
Binary files a/sound/samples/sfx_custom_wario/11.aiff and b/sound/samples/sfx_custom_wario/11.aiff differ
diff --git a/sound/samples/sfx_custom_wario/12.aiff b/sound/samples/sfx_custom_wario/12.aiff
index 9e87501ee..89ad647e8 100644
Binary files a/sound/samples/sfx_custom_wario/12.aiff and b/sound/samples/sfx_custom_wario/12.aiff differ
diff --git a/sound/samples/sfx_custom_wario/13.aiff b/sound/samples/sfx_custom_wario/13.aiff
index de8742690..0f0f14073 100644
Binary files a/sound/samples/sfx_custom_wario/13.aiff and b/sound/samples/sfx_custom_wario/13.aiff differ
diff --git a/sound/samples/sfx_custom_wario/14.aiff b/sound/samples/sfx_custom_wario/14.aiff
index 8997f36df..7888c8548 100644
Binary files a/sound/samples/sfx_custom_wario/14.aiff and b/sound/samples/sfx_custom_wario/14.aiff differ
diff --git a/sound/samples/sfx_custom_wario/15.aiff b/sound/samples/sfx_custom_wario/15.aiff
index 74ae529cd..38b2c7db4 100644
Binary files a/sound/samples/sfx_custom_wario/15.aiff and b/sound/samples/sfx_custom_wario/15.aiff differ
diff --git a/sound/samples/sfx_custom_wario/16.aiff b/sound/samples/sfx_custom_wario/16.aiff
index 0d858cc46..c3f1d723c 100644
Binary files a/sound/samples/sfx_custom_wario/16.aiff and b/sound/samples/sfx_custom_wario/16.aiff differ
diff --git a/sound/samples/sfx_custom_wario/17.aiff b/sound/samples/sfx_custom_wario/17.aiff
index 79d23ac34..15fd705b9 100644
Binary files a/sound/samples/sfx_custom_wario/17.aiff and b/sound/samples/sfx_custom_wario/17.aiff differ
diff --git a/sound/samples/sfx_custom_wario/18.aiff b/sound/samples/sfx_custom_wario/18.aiff
index 7f899864d..11469c830 100644
Binary files a/sound/samples/sfx_custom_wario/18.aiff and b/sound/samples/sfx_custom_wario/18.aiff differ
diff --git a/sound/samples/sfx_custom_wario/19.aiff b/sound/samples/sfx_custom_wario/19.aiff
index 8a53fa7fd..aff91bab9 100644
Binary files a/sound/samples/sfx_custom_wario/19.aiff and b/sound/samples/sfx_custom_wario/19.aiff differ
diff --git a/sound/samples/sfx_custom_wario/1A.aiff b/sound/samples/sfx_custom_wario/1A.aiff
index 8cba71b6f..445ee62cd 100644
Binary files a/sound/samples/sfx_custom_wario/1A.aiff and b/sound/samples/sfx_custom_wario/1A.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/00.aiff b/sound/samples/sfx_custom_wario_peach/00.aiff
index d856a4082..86239fa8e 100644
Binary files a/sound/samples/sfx_custom_wario_peach/00.aiff and b/sound/samples/sfx_custom_wario_peach/00.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/01.aiff b/sound/samples/sfx_custom_wario_peach/01.aiff
index d3103f3f9..dd4dea4ff 100644
Binary files a/sound/samples/sfx_custom_wario_peach/01.aiff and b/sound/samples/sfx_custom_wario_peach/01.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/02.aiff b/sound/samples/sfx_custom_wario_peach/02.aiff
index fa1d6297d..c7ac8a9ed 100644
Binary files a/sound/samples/sfx_custom_wario_peach/02.aiff and b/sound/samples/sfx_custom_wario_peach/02.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/03.aiff b/sound/samples/sfx_custom_wario_peach/03.aiff
index ef3dacd77..4e71b718f 100644
Binary files a/sound/samples/sfx_custom_wario_peach/03.aiff and b/sound/samples/sfx_custom_wario_peach/03.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/04.aiff b/sound/samples/sfx_custom_wario_peach/04.aiff
index c47eea166..cce9b5037 100644
Binary files a/sound/samples/sfx_custom_wario_peach/04.aiff and b/sound/samples/sfx_custom_wario_peach/04.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/05.aiff b/sound/samples/sfx_custom_wario_peach/05.aiff
index c1673d5fc..aff31b5a0 100644
Binary files a/sound/samples/sfx_custom_wario_peach/05.aiff and b/sound/samples/sfx_custom_wario_peach/05.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/06.aiff b/sound/samples/sfx_custom_wario_peach/06.aiff
index 6a0bec867..5aad2e7e9 100644
Binary files a/sound/samples/sfx_custom_wario_peach/06.aiff and b/sound/samples/sfx_custom_wario_peach/06.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/07.aiff b/sound/samples/sfx_custom_wario_peach/07.aiff
index 232b14c80..019d9c4e7 100644
Binary files a/sound/samples/sfx_custom_wario_peach/07.aiff and b/sound/samples/sfx_custom_wario_peach/07.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/08.aiff b/sound/samples/sfx_custom_wario_peach/08.aiff
index 4e6204fec..f490b3a2e 100644
Binary files a/sound/samples/sfx_custom_wario_peach/08.aiff and b/sound/samples/sfx_custom_wario_peach/08.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/09.aiff b/sound/samples/sfx_custom_wario_peach/09.aiff
index 3c5939a32..8986cdd2b 100644
Binary files a/sound/samples/sfx_custom_wario_peach/09.aiff and b/sound/samples/sfx_custom_wario_peach/09.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/0A.aiff b/sound/samples/sfx_custom_wario_peach/0A.aiff
index 4a317a90d..b7da8e58e 100644
Binary files a/sound/samples/sfx_custom_wario_peach/0A.aiff and b/sound/samples/sfx_custom_wario_peach/0A.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/0B.aiff b/sound/samples/sfx_custom_wario_peach/0B.aiff
index f6c825c08..6f38cbc26 100644
Binary files a/sound/samples/sfx_custom_wario_peach/0B.aiff and b/sound/samples/sfx_custom_wario_peach/0B.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/0C.aiff b/sound/samples/sfx_custom_wario_peach/0C.aiff
index b99d8e9c2..0b0829655 100644
Binary files a/sound/samples/sfx_custom_wario_peach/0C.aiff and b/sound/samples/sfx_custom_wario_peach/0C.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/0D.aiff b/sound/samples/sfx_custom_wario_peach/0D.aiff
index cc57023c9..2d0c16a29 100644
Binary files a/sound/samples/sfx_custom_wario_peach/0D.aiff and b/sound/samples/sfx_custom_wario_peach/0D.aiff differ
diff --git a/sound/samples/sfx_custom_wario_peach/17.aiff b/sound/samples/sfx_custom_wario_peach/17.aiff
deleted file mode 100644
index f2064720a..000000000
Binary files a/sound/samples/sfx_custom_wario_peach/17.aiff and /dev/null differ
diff --git a/sound/sound_banks/27_custom_luigi_peach.json b/sound/sound_banks/27_custom_luigi_peach.json
index d4e056c78..c65865e32 100644
--- a/sound/sound_banks/27_custom_luigi_peach.json
+++ b/sound/sound_banks/27_custom_luigi_peach.json
@@ -81,55 +81,55 @@
             "sound": "0D"
         },
         "inst14": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "0E"
         },
         "inst15": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "0F"
         },
         "inst16": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "10"
         },
         "inst17": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "11"
         },
         "inst18": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "12"
         },
         "inst19": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "13"
         },
         "inst20": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "14"
         },
         "inst21": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "15"
         },
         "inst22": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "16"
diff --git a/sound/sound_banks/29_custom_wario_peach.json b/sound/sound_banks/29_custom_wario_peach.json
index bff17438d..0a11a83d9 100644
--- a/sound/sound_banks/29_custom_wario_peach.json
+++ b/sound/sound_banks/29_custom_wario_peach.json
@@ -81,55 +81,55 @@
             "sound": "0D"
         },
         "inst14": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "0E"
         },
         "inst15": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "0F"
         },
         "inst16": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "10"
         },
         "inst17": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "11"
         },
         "inst18": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "12"
         },
         "inst19": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "13"
         },
         "inst20": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "14"
         },
         "inst21": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "15"
         },
         "inst22": {
-            "ifdef": ["VERSION_US", "VERSION_EU"],
+            "ifdef": ["EXTENDED_CHAR_SOUNDS"],
             "release_rate": 208,
             "envelope": "envelope0",
             "sound": "16"
diff --git a/tools/append_aiffc_table.py b/tools/append_aiffc_table.py
new file mode 100644
index 000000000..36f89292f
--- /dev/null
+++ b/tools/append_aiffc_table.py
@@ -0,0 +1,64 @@
+#!/usr/bin/env python3
+import sys
+import os
+import time
+
+# find sound/samples/*custom* -name '*.aiff' | while read filename; do     python3 tools/append_aiffc_table.py "$filename"; done
+
+# Get the filename from the first command line argument
+if len(sys.argv) < 2:
+    print("Usage: {} <filename>".format(sys.argv[0]))
+    sys.exit(1)
+filename = sys.argv[1]
+
+# check if the binary file contains the string 'VADPCMCODES', and if so print that it was already found and exit
+with open(filename, 'rb') as f:
+    content = f.read()
+if b'VADPCMCODES' in content:
+    print('Already contains a table for ' + filename + '. Exiting.')
+    sys.exit(0)
+
+# run the program ./tools/tabledesign on the specified filename and capture the output
+import subprocess
+command = ['./tools/tabledesign', '-s', '1', filename]
+result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+output = result.stdout.decode('utf-8').strip()
+
+# split the output by whitespace
+words = output.split()
+
+# calculate header info
+size = len(words) * 2 + 18
+unknown = 0x0b
+version = 1
+
+# append the chunk header
+chunk = b''
+chunk += b'APPL'
+chunk += size.to_bytes(4, 'big', signed=True)
+chunk += b'stoc'
+chunk += unknown.to_bytes(1, 'big', signed=False)
+chunk += b'VADPCMCODES'
+chunk += version.to_bytes(2, 'big', signed=False)
+
+# convert each word to a signed 16 bit integer and append them to content
+for word in words:
+    value = int(word)
+    chunk += value.to_bytes(2, 'big', signed=True)
+
+# find the index of the first instance of 'SSND'
+index = content.find(b'SSND')
+if index == -1:
+    print("Couldn't find 'SSND' for ' + filename + '. Aborting.")
+    sys.exit(1)
+
+if size != len(chunk) - 8:
+    print('Failed to generate the correct size for ' + filename)
+    sys,exit(1)
+
+# insert the chunk before 'SSND'
+content = content[:index] + chunk + content[index:]
+
+# write the modified content to the binary file
+with open(filename, 'wb') as f:
+    f.write(content)