diff --git a/res/attract-mode.txt b/res/attract-mode.txt
index e8343e30c..fa9bbd050 100644
--- a/res/attract-mode.txt
+++ b/res/attract-mode.txt
@@ -38,7 +38,6 @@ Ceiling Zero
 Drelbs
 Firebird
 Formula 1 Racer
-High Rise
 O'Riley's Mine
 Snake Byte
 Spider Raid
@@ -63,6 +62,7 @@ Flip Out
 Gamma Goblins
 Gumball
 Hard Hat Mack
+High Rise
 Jungle Hunt
 Karateka
 Lady Tut
diff --git a/res/attract.conf b/res/attract.conf
index 96646673b..99bca9b59 100644
--- a/res/attract.conf
+++ b/res/attract.conf
@@ -1 +1 @@
-#
# Mega-Attract-Mode configuration file
#
# Mega-Attract-Mode is split into modules. Each module can be a
# short slideshow or a self-running demo (like a game's built-in
# 'attract mode'). Modules are run in the order listed here, one
# after the next, until interrupted by user input. The last-run
# module is tracked in the global prefs file.
#
# Format:
# key=value
#
# |key| must be unique within this file
#
# |value| must be one of
#   1 for HGR slideshow (|key| is a file containing a list of HGR graphics)
#   2 for DHGR slideshow (|key| is a file containing a list of DHGR graphics)
#   3 for self-running demo (|key| is an executable binary file)
#
# Blank lines and lines beginning with '#' are ignored (like this one!)
# A line beginning with '[' terminates the parsing
#

THUNDERBOMBS=3
ROBOTRON=3
NIBBLER=3
LADY.TUT=3
STARGATE=3
#SPIDER.RAID=3
FLIP.OUT=3
#STELLAR.7=3
#TRACK.AND.FIELD=3
AGENT.USA=3
GUMBALL=3
TUBEWAY=3
CIDER.SPIDER=3
CONAN=3
MR.COOL=3
CHOPLIFTER=3
HARD.HAT.MACK=3
PACMAN=3
SERPENTINE=3
KARATEKA=3
WARP.DESTROYER=3
LOST.TOMB=3
VINDICATOR=3
REPTON=3
SAMMY.LIGHTFOOT=3
DUNG.BEETLES=3
GAMMA.GOBLINS=3
#ALIEN.DOWNPOUR=3
PIEMAN=3
ALIEN.AMBUSH=3
ALIEN.RAIN=3
AQUATRON=3
JUNGLE.HUNT=3
POOYAN=3
SHORT.CONF=1
PLASMANIA=3
SPY.HUNTER=3
DINO.EGGS=3
BOLO=3
CHAMP.LODERUN=3
SPYS.DEMISE=3
PEST.PATROL=3
PITFALL.II=3
LODE.RUNNER=3
BURGERTIME=3
SPARE.CHANGE=3
SNEAKERS=3
WAVY.NAVY=3
DHGR.CONF=2
FAVORITES.CONF=1
EFG.CONF=1
ACTIVISION.CONF=1
CD.CONF=1
BRODERBUND.CONF=1
T.CONF=1
ATARI.CONF=1
SIERRA.CONF=1
PQR.CONF=1
DATAMOST.CONF=1
MNO.CONF=1
DATASOFT.CONF=1
S.CONF=1
MICROFUN.CONF=1
AB.CONF=1
PICCADILLY.CONF=1
HIJKL.CONF=1
SIRIUS.CONF=1

[eof]
\ No newline at end of file
+#
# Mega-Attract-Mode configuration file
#
# Mega-Attract-Mode is split into modules. Each module can be a
# short slideshow or a self-running demo (like a game's built-in
# 'attract mode'). Modules are run in the order listed here, one
# after the next, until interrupted by user input. The last-run
# module is tracked in the global prefs file.
#
# Format:
# key=value
#
# |key| must be unique within this file
#
# |value| must be one of
#   1 for HGR slideshow (|key| is a file containing a list of HGR graphics)
#   2 for DHGR slideshow (|key| is a file containing a list of DHGR graphics)
#   3 for self-running demo (|key| is an executable binary file)
#
# Blank lines and lines beginning with '#' are ignored (like this one!)
# A line beginning with '[' terminates the parsing
#

HIGH.RISE=3
THUNDERBOMBS=3
ROBOTRON=3
NIBBLER=3
LADY.TUT=3
STARGATE=3
#SPIDER.RAID=3
FLIP.OUT=3
#STELLAR.7=3
#TRACK.AND.FIELD=3
AGENT.USA=3
GUMBALL=3
TUBEWAY=3
CIDER.SPIDER=3
CONAN=3
MR.COOL=3
CHOPLIFTER=3
HARD.HAT.MACK=3
PACMAN=3
SERPENTINE=3
KARATEKA=3
WARP.DESTROYER=3
LOST.TOMB=3
VINDICATOR=3
REPTON=3
SAMMY.LIGHTFOOT=3
DUNG.BEETLES=3
GAMMA.GOBLINS=3
#ALIEN.DOWNPOUR=3
PIEMAN=3
ALIEN.AMBUSH=3
ALIEN.RAIN=3
AQUATRON=3
JUNGLE.HUNT=3
POOYAN=3
SHORT.CONF=1
PLASMANIA=3
SPY.HUNTER=3
DINO.EGGS=3
BOLO=3
CHAMP.LODERUN=3
SPYS.DEMISE=3
PEST.PATROL=3
PITFALL.II=3
LODE.RUNNER=3
BURGERTIME=3
SPARE.CHANGE=3
SNEAKERS=3
WAVY.NAVY=3
DHGR.CONF=2
FAVORITES.CONF=1
EFG.CONF=1
ACTIVISION.CONF=1
CD.CONF=1
BRODERBUND.CONF=1
T.CONF=1
ATARI.CONF=1
SIERRA.CONF=1
PQR.CONF=1
DATAMOST.CONF=1
MNO.CONF=1
DATASOFT.CONF=1
S.CONF=1
MICROFUN.CONF=1
AB.CONF=1
PICCADILLY.CONF=1
HIJKL.CONF=1
SIRIUS.CONF=1

[eof]
\ No newline at end of file
diff --git a/res/demo/HIGH.RISE b/res/demo/HIGH.RISE
new file mode 100755
index 000000000..bca5191e0
Binary files /dev/null and b/res/demo/HIGH.RISE differ
diff --git a/res/demo/_FileInformation.txt b/res/demo/_FileInformation.txt
index cce21f0bc..d789b9f63 100644
--- a/res/demo/_FileInformation.txt
+++ b/res/demo/_FileInformation.txt
@@ -42,6 +42,7 @@ GUMBALL.F=Type(F1),AuxType(6000),Access(C3)
 GUMBALL.I=Type(F1),AuxType(0800),Access(C3)
 GUMBALL.M=Type(F1),AuxType(6000),Access(C3)
 HARD.HAT.MACK=Type(06),AuxType(0800),Access(C3)
+HIGH.RISE=Type(06),AuxType(3FCB),Access(C3)
 JUNGLE.HUNT=Type(06),AuxType(0300),Access(C3)
 JUNGLE.HUNT.1=Type(F1),AuxType(0000),Access(C3)
 JUNGLE.HUNT.A=Type(F1),AuxType(7700),Access(C3)
diff --git a/res/notes/goonies.txt b/res/notes/goonies.txt
new file mode 100644
index 000000000..f1f0eb2e3
--- /dev/null
+++ b/res/notes/goonies.txt
@@ -0,0 +1,7 @@
+$06BF: 20 -> 2C to skip unskippable text title page and joystick configuration (context is 20000CA9088503)
+$0586: A008B9 -> 4C0001 to exit on keypress (context is AD00C01043A008B9E006)
+$406F: E6B260 -> 4C0001 to exit on buttonn press (context is AE61C030034C2140E6B260)
+$4039: 20 -> 2C to reduce wait time on title screen (context is 207240A002B107F012)
+$087C: 4C2408 -> 4C0001 to exit on button press (context is AD61C010034C2408AD6D10)
+$12C3: 4C2408 -> 4C0001 to exit on button press (context is AD61C010034C2408AD00C0)
+$12CB: 8D10C0 -> 4C0001 to exit on keypress (context is AD00C0103A8D10C08D5C10C9A0)
diff --git a/res/notes/high-rise.txt b/res/notes/high-rise.txt
new file mode 100644
index 000000000..ed0f12b18
--- /dev/null
+++ b/res/notes/high-rise.txt
@@ -0,0 +1,2 @@
+$455D: C9C9D0 -> 4C0001 to exit on keypress (context is AD00C01009C9C9D002E6D5)
+$4695: 4C0A45 -> 4C0001 to exit at end of demo cycle (context is 4C0A4520AF47)