diff --git a/res/ACTION.DHGR.UNCOMPRESSED/PUYO.PUYO b/res/ACTION.DHGR.UNCOMPRESSED/PUYO.PUYO
new file mode 100644
index 000000000..7ca517267
Binary files /dev/null and b/res/ACTION.DHGR.UNCOMPRESSED/PUYO.PUYO differ
diff --git a/res/ACTION.DHGR/PUYO.PUYO b/res/ACTION.DHGR/PUYO.PUYO
new file mode 100644
index 000000000..18c9eb3b4
Binary files /dev/null and b/res/ACTION.DHGR/PUYO.PUYO differ
diff --git a/res/ATTRACT/PUYO.PUYO b/res/ATTRACT/PUYO.PUYO
index e5843ea6e..e07ee13b1 100644
--- a/res/ATTRACT/PUYO.PUYO
+++ b/res/ATTRACT/PUYO.PUYO
@@ -3,5 +3,6 @@
 # This file is automatically generated
 #
 
+PUYO.PUYO=B
 
 [eof]
diff --git a/res/SS/ACTDHGR16.CONF b/res/SS/ACTDHGR16.CONF
index ef33fa452..15c67b9a3 100644
--- a/res/SS/ACTDHGR16.CONF
+++ b/res/SS/ACTDHGR16.CONF
@@ -3,6 +3,7 @@
 #
 
 PLATOON
+PUYO.PUYO
 BATMAN3=BATMAN
 HEAVY2=HEAVY.BARREL
 RAMPAGE4=RAMPAGE
diff --git a/res/SS/DHGR1.CONF b/res/SS/DHGR1.CONF
index 85a41cf89..eebc85bf6 100644
--- a/res/SS/DHGR1.CONF
+++ b/res/SS/DHGR1.CONF
@@ -4,6 +4,7 @@
 
 BRUCE.LEE
 RENEGADE
+PUYO.PUYO
 ROBOCOP
 DG
 SPIDERBOT
diff --git a/src/index/artwork.idx.a b/src/index/artwork.idx.a
index cd48e5626..028e13b53 100644
--- a/src/index/artwork.idx.a
+++ b/src/index/artwork.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15404283
+         !be24  15406558
          !le16     5112
diff --git a/src/index/attract.idx.a b/src/index/attract.idx.a
index 8edb50cc5..af9c783ae 100644
--- a/src/index/attract.idx.a
+++ b/src/index/attract.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15350177
+         !be24  15352436
          !le16     5642
diff --git a/src/index/cache00.idx.a b/src/index/cache00.idx.a
index 5c635b7ab..2dd9da1b5 100644
--- a/src/index/cache00.idx.a
+++ b/src/index/cache00.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15283350
+         !be24  15285609
          !le16     4033
diff --git a/src/index/cache01.idx.a b/src/index/cache01.idx.a
index a637b1395..ea44c8cb1 100644
--- a/src/index/cache01.idx.a
+++ b/src/index/cache01.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15297532
+         !be24  15299791
          !le16     4473
diff --git a/src/index/cache10.idx.a b/src/index/cache10.idx.a
index 834dc2a42..c0c56a336 100644
--- a/src/index/cache10.idx.a
+++ b/src/index/cache10.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15315635
+         !be24  15317894
          !le16     5830
diff --git a/src/index/cache11.idx.a b/src/index/cache11.idx.a
index 740998e1c..c62f964a1 100644
--- a/src/index/cache11.idx.a
+++ b/src/index/cache11.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15336419
+         !be24  15338678
          !le16     6429
diff --git a/src/index/coverfade.idx.a b/src/index/coverfade.idx.a
index 694acdae5..d1dee0c04 100644
--- a/src/index/coverfade.idx.a
+++ b/src/index/coverfade.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15409395
+         !be24  15411670
          !le16      410
diff --git a/src/index/credits.idx.a b/src/index/credits.idx.a
index b1d93f4b0..4c8239875 100644
--- a/src/index/credits.idx.a
+++ b/src/index/credits.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15410149
+         !be24  15412424
          !le16      448
diff --git a/src/index/decrunch.idx.a b/src/index/decrunch.idx.a
index 252461c05..5cf616767 100644
--- a/src/index/decrunch.idx.a
+++ b/src/index/decrunch.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15410597
+         !be24  15412872
          !le16      303
diff --git a/src/index/demo.idx.a b/src/index/demo.idx.a
index 7bf365a95..a2e4fa539 100644
--- a/src/index/demo.idx.a
+++ b/src/index/demo.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  12259866
+         !be24  12262125
          !le16     1652
diff --git a/src/index/dfx.idx.a b/src/index/dfx.idx.a
index 7716e9599..359829f51 100644
--- a/src/index/dfx.idx.a
+++ b/src/index/dfx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15358459
+         !be24  15360718
          !le16     1640
diff --git a/src/index/dgr.fizzle.idx.a b/src/index/dgr.fizzle.idx.a
index 62a3b5953..77bb844a4 100644
--- a/src/index/dgr.fizzle.idx.a
+++ b/src/index/dgr.fizzle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15409881
+         !be24  15412156
          !le16       67
diff --git a/src/index/dgr.idx.a b/src/index/dgr.idx.a
index 26834c151..bf193fd04 100644
--- a/src/index/dgr.idx.a
+++ b/src/index/dgr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15404224
+         !be24  15406499
          !le16       59
diff --git a/src/index/dhgr.idx.a b/src/index/dhgr.idx.a
index 373c08e31..f8a2384ef 100644
--- a/src/index/dhgr.idx.a
+++ b/src/index/dhgr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15402717
-         !le16     1410
+         !be24  15404976
+         !le16     1426
diff --git a/src/index/dtitle.idx.a b/src/index/dtitle.idx.a
index d39b9744b..115cea124 100644
--- a/src/index/dtitle.idx.a
+++ b/src/index/dtitle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15387302
+         !be24  15389561
          !le16      540
diff --git a/src/index/fx.idx.a b/src/index/fx.idx.a
index dd6a52c81..2d7a566b3 100644
--- a/src/index/fx.idx.a
+++ b/src/index/fx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15355819
+         !be24  15358078
          !le16     2640
diff --git a/src/index/gamehelp.idx.a b/src/index/gamehelp.idx.a
index 93416fee9..9eb00efb8 100644
--- a/src/index/gamehelp.idx.a
+++ b/src/index/gamehelp.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15360457
+         !be24  15362716
          !le16     7329
diff --git a/src/index/gr.fizzle.idx.a b/src/index/gr.fizzle.idx.a
index 919afdb9d..1dbaf6491 100644
--- a/src/index/gr.fizzle.idx.a
+++ b/src/index/gr.fizzle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15409805
+         !be24  15412080
          !le16       76
diff --git a/src/index/gr.idx.a b/src/index/gr.idx.a
index 7e7167b0a..549d75538 100644
--- a/src/index/gr.idx.a
+++ b/src/index/gr.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15404127
+         !be24  15406402
          !le16       97
diff --git a/src/index/helptext.idx.a b/src/index/helptext.idx.a
index 58c9bc082..5823995a4 100644
--- a/src/index/helptext.idx.a
+++ b/src/index/helptext.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15409948
+         !be24  15412223
          !le16      201
diff --git a/src/index/hgr0.idx.a b/src/index/hgr0.idx.a
index b4feff263..7669e8dff 100644
--- a/src/index/hgr0.idx.a
+++ b/src/index/hgr0.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15387842
+         !be24  15390101
          !le16     4702
diff --git a/src/index/hgr1.idx.a b/src/index/hgr1.idx.a
index 12939e387..be53429ae 100644
--- a/src/index/hgr1.idx.a
+++ b/src/index/hgr1.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15392544
+         !be24  15394803
          !le16     1748
diff --git a/src/index/hgr2.idx.a b/src/index/hgr2.idx.a
index 9a10bd4b3..dba8463ad 100644
--- a/src/index/hgr2.idx.a
+++ b/src/index/hgr2.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15394292
+         !be24  15396551
          !le16     1129
diff --git a/src/index/hgr3.idx.a b/src/index/hgr3.idx.a
index 865e39b3d..2559793f1 100644
--- a/src/index/hgr3.idx.a
+++ b/src/index/hgr3.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15395421
+         !be24  15397680
          !le16     3371
diff --git a/src/index/hgr4.idx.a b/src/index/hgr4.idx.a
index 4ca70ff7d..ef844c679 100644
--- a/src/index/hgr4.idx.a
+++ b/src/index/hgr4.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15398792
+         !be24  15401051
          !le16     3332
diff --git a/src/index/hgr5.idx.a b/src/index/hgr5.idx.a
index 372818b0b..f3497c8b6 100644
--- a/src/index/hgr5.idx.a
+++ b/src/index/hgr5.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15402124
+         !be24  15404383
          !le16      479
diff --git a/src/index/hgr6.idx.a b/src/index/hgr6.idx.a
index 5ceff4bd2..d1166c30f 100644
--- a/src/index/hgr6.idx.a
+++ b/src/index/hgr6.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15402603
+         !be24  15404862
          !le16      114
diff --git a/src/index/joystick.idx.a b/src/index/joystick.idx.a
index e2133acb2..0cf1f9620 100644
--- a/src/index/joystick.idx.a
+++ b/src/index/joystick.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15410900
+         !be24  15413175
          !le16     2370
diff --git a/src/index/miniattract0.idx.a b/src/index/miniattract0.idx.a
index c09a2cf8e..01f952fa5 100644
--- a/src/index/miniattract0.idx.a
+++ b/src/index/miniattract0.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15373098
+         !be24  15375357
          !le16     4933
diff --git a/src/index/miniattract1.idx.a b/src/index/miniattract1.idx.a
index f2be73690..befcedc07 100644
--- a/src/index/miniattract1.idx.a
+++ b/src/index/miniattract1.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15378031
+         !be24  15380290
          !le16     2400
diff --git a/src/index/prelaunch.idx.a b/src/index/prelaunch.idx.a
index c15e4e9c8..66db59618 100644
--- a/src/index/prelaunch.idx.a
+++ b/src/index/prelaunch.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15342848
+         !be24  15345107
          !le16     7329
diff --git a/src/index/search00.idx.a b/src/index/search00.idx.a
index 53a3d23fe..8caa65403 100644
--- a/src/index/search00.idx.a
+++ b/src/index/search00.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15274105
+         !be24  15276364
          !le16     9245
diff --git a/src/index/search01.idx.a b/src/index/search01.idx.a
index 207c61c89..de671f662 100644
--- a/src/index/search01.idx.a
+++ b/src/index/search01.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15287383
+         !be24  15289642
          !le16    10149
diff --git a/src/index/search10.idx.a b/src/index/search10.idx.a
index cb257ec1b..8f055d39d 100644
--- a/src/index/search10.idx.a
+++ b/src/index/search10.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15302005
+         !be24  15304264
          !le16    13630
diff --git a/src/index/search11.idx.a b/src/index/search11.idx.a
index 3391d6d59..e1eb6a41e 100644
--- a/src/index/search11.idx.a
+++ b/src/index/search11.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15321465
+         !be24  15323724
          !le16    14954
diff --git a/src/index/sfx.idx.a b/src/index/sfx.idx.a
index 47bc1050e..a0e5cc4ed 100644
--- a/src/index/sfx.idx.a
+++ b/src/index/sfx.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15360099
+         !be24  15362358
          !le16      358
diff --git a/src/index/slideshow.idx.a b/src/index/slideshow.idx.a
index 93b46c1c2..6a2efa46a 100644
--- a/src/index/slideshow.idx.a
+++ b/src/index/slideshow.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15367786
+         !be24  15370045
          !le16     5312
diff --git a/src/index/title.idx.a b/src/index/title.idx.a
index e242a004d..0b325efab 100644
--- a/src/index/title.idx.a
+++ b/src/index/title.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15380431
+         !be24  15382690
          !le16     6871
diff --git a/src/index/xsingle.idx.a b/src/index/xsingle.idx.a
index 4d39266b0..fc4479522 100644
--- a/src/index/xsingle.idx.a
+++ b/src/index/xsingle.idx.a
@@ -4,5 +4,5 @@
 ; This file is automatically generated
 ;
          !byte 0
-         !be24  15269901
+         !be24  15272160
          !le16     4204