diff --git a/res/ACTION.HGR.UNCOMPRESSED/G.I.JOE b/res/ACTION.HGR.UNCOMPRESSED/G.I.JOE
new file mode 100644
index 000000000..eec01a56d
Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/G.I.JOE differ
diff --git a/res/ACTION.HGR.UNCOMPRESSED/G.I.JOE2 b/res/ACTION.HGR.UNCOMPRESSED/G.I.JOE2
new file mode 100644
index 000000000..3196c50d7
Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/G.I.JOE2 differ
diff --git a/res/ACTION.HGR.UNCOMPRESSED/G.I.JOE3 b/res/ACTION.HGR.UNCOMPRESSED/G.I.JOE3
new file mode 100644
index 000000000..fc9d7797e
Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/G.I.JOE3 differ
diff --git a/res/ACTION.HGR/G.I.JOE b/res/ACTION.HGR/G.I.JOE
new file mode 100644
index 000000000..e01010567
Binary files /dev/null and b/res/ACTION.HGR/G.I.JOE differ
diff --git a/res/ACTION.HGR/G.I.JOE2 b/res/ACTION.HGR/G.I.JOE2
new file mode 100644
index 000000000..cdc1ff743
Binary files /dev/null and b/res/ACTION.HGR/G.I.JOE2 differ
diff --git a/res/ACTION.HGR/G.I.JOE3 b/res/ACTION.HGR/G.I.JOE3
new file mode 100644
index 000000000..7f22176b9
Binary files /dev/null and b/res/ACTION.HGR/G.I.JOE3 differ
diff --git a/res/ACTION.HGR/_FileInformation.txt b/res/ACTION.HGR/_FileInformation.txt
index 8ceb2acc9..ed8629f59 100644
--- a/res/ACTION.HGR/_FileInformation.txt
+++ b/res/ACTION.HGR/_FileInformation.txt
@@ -207,6 +207,9 @@ FROGGER=Type(06),AuxType(3FF8),Access(C3)
 FROGGER.II=Type(06),AuxType(3FF8),Access(C3)
 FROGGER2=Type(06),AuxType(3FF8),Access(C3)
 FS2=Type(06),AuxType(3FF8),Access(C3)
+G.I.JOE=Type(06),AuxType(3FF8),Access(C3)
+G.I.JOE2=Type(06),AuxType(3FF8),Access(C3)
+G.I.JOE3=Type(06),AuxType(3FF8),Access(C3)
 GALAXIAN2=Type(06),AuxType(3FF8),Access(C3)
 GALAXY.GATES=Type(06),AuxType(3FF8),Access(C3)
 GAMMA.GOBLINS=Type(06),AuxType(3FF8),Access(C3)
diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/G.I.JOE b/res/ARTWORK.SHR.UNCOMPRESSED/G.I.JOE
new file mode 100644
index 000000000..39cfc9f77
Binary files /dev/null and b/res/ARTWORK.SHR.UNCOMPRESSED/G.I.JOE differ
diff --git a/res/ARTWORK.SHR/G.I.JOE b/res/ARTWORK.SHR/G.I.JOE
new file mode 100644
index 000000000..07a856bff
Binary files /dev/null and b/res/ARTWORK.SHR/G.I.JOE differ
diff --git a/res/ARTWORK.SHR/_FileInformation.txt b/res/ARTWORK.SHR/_FileInformation.txt
index 2c0432041..a0168311f 100644
--- a/res/ARTWORK.SHR/_FileInformation.txt
+++ b/res/ARTWORK.SHR/_FileInformation.txt
@@ -44,6 +44,7 @@ EGGS.IT=Type(06),AuxType(1FF8),Access(C3)
 FORCE.7=Type(06),AuxType(1FF8),Access(C3)
 FROGGER.II=Type(06),AuxType(1FF8),Access(C3)
 FS2=Type(06),AuxType(1FF8),Access(C3)
+G.I.JOE=Type(06),AuxType(1FF8),Access(C3)
 GAUNTLET=Type(06),AuxType(1FF8),Access(C3)
 GORGON=Type(06),AuxType(1FF8),Access(C3)
 GUMBALL=Type(06),AuxType(1FF8),Access(C3)
diff --git a/res/ATTRACT/G.I.JOE b/res/ATTRACT/G.I.JOE
index c1c8df6b6..1684a01c9 100644
--- a/res/ATTRACT/G.I.JOE
+++ b/res/ATTRACT/G.I.JOE
@@ -3,5 +3,9 @@
 # This file is automatically generated
 #
 
+ARTWORK.SHR/G.I.JOE=C
+ACTION.HGR/G.I.JOE2=A
+ACTION.HGR/G.I.JOE3=A
+ACTION.HGR/G.I.JOE=A
 
 [eof]
diff --git a/res/SS/ACTIONEFG3.CONF b/res/SS/ACTIONEFG3.CONF
index 83e5db458..d909601ab 100644
--- a/res/SS/ACTIONEFG3.CONF
+++ b/res/SS/ACTIONEFG3.CONF
@@ -4,7 +4,7 @@
 
 GAUNTLET2=GAUNTLET
 THE.GOONIES6=THE.GOONIES
-FS2
+G.I.JOE3=G.I.JOE
 GENIUSB=GENIUS
 FORMULA.1.RACER
 GUARDIAN2=GUARDIAN
diff --git a/res/SS/ACTIONEFG4.CONF b/res/SS/ACTIONEFG4.CONF
index d1ea92241..d4bfe5a73 100644
--- a/res/SS/ACTIONEFG4.CONF
+++ b/res/SS/ACTIONEFG4.CONF
@@ -5,7 +5,7 @@
 GUMBALL2=GUMBALL
 FROGGER.II
 GALAXY.GATES
-FREE.FALL2=FREE.FALL
+G.I.JOE2=G.I.JOE
 GUARDIAN
 THE.GOONIES2=THE.GOONIES
 FORCE.74=FORCE.7
diff --git a/res/SS/ACTIONEFG5.CONF b/res/SS/ACTIONEFG5.CONF
index 033540b3e..b2db23b1b 100644
--- a/res/SS/ACTIONEFG5.CONF
+++ b/res/SS/ACTIONEFG5.CONF
@@ -9,5 +9,8 @@ GENIUS.2B=GENIUS.2
 GENETIC.DRIFT
 FALCONS
 FIREBIRD
+G.I.JOE
+FREE.FALL2=FREE.FALL
+FS2
 
 [eof]
diff --git a/res/SS/EFG2.CONF b/res/SS/EFG2.CONF
index b2575f0a0..53ce008f0 100644
--- a/res/SS/EFG2.CONF
+++ b/res/SS/EFG2.CONF
@@ -12,5 +12,6 @@ FORMULA.1.RACER
 FORCE.7
 GOLD.RUSH
 GALAXY.GATES
+G.I.JOE
 
 [eof]
diff --git a/res/SS/EPYX.CONF b/res/SS/EPYX.CONF
index 1e2e83bb4..8a8438f7e 100644
--- a/res/SS/EPYX.CONF
+++ b/res/SS/EPYX.CONF
@@ -8,5 +8,6 @@ JUMPMAN
 WINTER.GAMES
 PITSTOP.II
 SUMMER.GAMES.II
+G.I.JOE
 
 [eof]
diff --git a/res/SS/SHR24.CONF b/res/SS/SHR24.CONF
index 7289531b1..480e6dc3b 100644
--- a/res/SS/SHR24.CONF
+++ b/res/SS/SHR24.CONF
@@ -7,5 +7,6 @@ LITTLE.COMP.PPL
 JAWBREAKER.II
 CAVRNS.CALLISTO
 BATTLE.CHESS
+G.I.JOE
 
 [eof]