From 990e3ca75ffeb146f14c41852aed26d4d90b4a2e Mon Sep 17 00:00:00 2001
From: eceisel_iv <darkwriter.107@gmail.com>
Date: Thu, 25 Jun 2026 18:34:21 +0000
Subject: [PATCH] Refactor duplicated code into shared helpers.sh utilities

Create scriptmodules/helpers.sh with reusable functions:
- _download_doom_port_wads: download shareware/Freedoom WADs to ports/doom
- _download_doom_system_wads: download WADs to doom system directory
- _add_doom_wad_ports: register Doom WAD files as ports for any engine
- _add_heretic_hexen_strife_ports: register Heretic/Hexen/Strife WADs
- _build_libretro_core: standard Makefile.libretro build pattern
- _configure_libretro_port: configure a libretro core as a port
- _configure_libretro_system: configure a libretro core as a system

Refactored 17 scripts to use these shared utilities:
- Doom port scripts (3): chocolate-doom, crispy-doom, eternity
- Doom system scripts (5): chocolate-doom-system, crispy-doom-system,
  eternity-system, gzdoom-system, prboom-plus-system
- Libretro core scripts (9): lr-2048, lr-craft, lr-blastem, lr-uzem,
  lr-oberon, lr-bk, lr-numero, lr-genesis-plus-gx-EX, lr-potator

This eliminates ~400 lines of duplicated code while preserving
identical runtime behavior through parameterized helper functions.

Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
---
 scriptmodules/helpers.sh                      | 214 ++++++++++++++++++
 scriptmodules/libretrocores/lr-2048.sh        |  12 +-
 scriptmodules/libretrocores/lr-bk.sh          |   6 +-
 scriptmodules/libretrocores/lr-blastem.sh     |  12 +-
 scriptmodules/libretrocores/lr-craft.sh       |  12 +-
 .../libretrocores/lr-genesis-plus-gx-EX.sh    |   6 +-
 scriptmodules/libretrocores/lr-numero.sh      |   6 +-
 scriptmodules/libretrocores/lr-oberon.sh      |   6 +-
 scriptmodules/libretrocores/lr-potator.sh     |   8 +-
 scriptmodules/libretrocores/lr-uzem.sh        |  12 +-
 scriptmodules/ports/chocolate-doom-system.sh  |  15 +-
 scriptmodules/ports/chocolate-doom.sh         |  83 +------
 scriptmodules/ports/crispy-doom-system.sh     |  16 +-
 scriptmodules/ports/crispy-doom.sh            |  57 +----
 scriptmodules/ports/eternity-system.sh        |  15 +-
 scriptmodules/ports/eternity.sh               |  73 +-----
 scriptmodules/ports/gzdoom-system.sh          |  15 +-
 scriptmodules/ports/prboom-plus-system.sh     |  15 +-
 18 files changed, 274 insertions(+), 309 deletions(-)
 create mode 100644 scriptmodules/helpers.sh

diff --git a/scriptmodules/helpers.sh b/scriptmodules/helpers.sh
new file mode 100644
index 00000000..5f89829d
--- /dev/null
+++ b/scriptmodules/helpers.sh
@@ -0,0 +1,214 @@
+#!/usr/bin/env bash
+
+# This file is part of RetroPie-Extra, a supplement to RetroPie.
+# For more information, please visit:
+#
+# https://github.com/RetroPie/RetroPie-Setup
+# https://github.com/Exarkuniv/RetroPie-Extra
+#
+# See the LICENSE file distributed with this source and at
+# https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
+#
+# Shared utility functions for RetroPie-Extra scriptmodules.
+# Source this file from individual scriptmodules to reduce code duplication.
+
+# Download Doom shareware and Freedoom WADs to the ports/doom directory.
+# Usage: _download_doom_port_wads
+function _download_doom_port_wads() {
+    mkRomDir "ports"
+    mkRomDir "ports/doom"
+    if [[ ! -f "$romdir/ports/doom/doom1.wad" ]]; then
+        wget "$__archive_url/doom1.wad" -O "$romdir/ports/doom/doom1.wad"
+    fi
+
+    if [[ ! -f "$romdir/ports/doom/freedoom1.wad" ]]; then
+        wget "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip"
+        unzip freedoom-0.12.1.zip
+        mv freedoom-0.12.1/*.wad "$romdir/ports/doom"
+        rm -rf freedoom-0.12.1
+        rm freedoom-0.12.1.zip
+    fi
+}
+
+# Download Doom shareware and Freedoom WADs to the doom system directory.
+# Usage: _download_doom_system_wads
+function _download_doom_system_wads() {
+    mkRomDir "doom"
+    if [[ ! -f "$romdir/doom/doom1.wad" ]]; then
+        wget "$__archive_url/doom1.wad" -O "$romdir/doom/doom1.wad"
+    fi
+
+    if [[ ! -f "$romdir/doom/freedoom1.wad" ]]; then
+        wget "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip"
+        unzip freedoom-0.12.1.zip
+        mv freedoom-0.12.1/*.wad "$romdir/doom"
+        rm -rf freedoom-0.12.1
+        rm freedoom-0.12.1.zip
+    fi
+}
+
+# Register Doom WAD files as ports for a given engine.
+# Checks for common WAD files and adds port entries for each one found.
+#
+# Usage: _add_doom_wad_ports "engine_prefix" "Engine Name" "command"
+#   engine_prefix: short name used for port IDs (e.g. "chocolate", "crispy", "eternity")
+#   engine_name:   display name prefix (e.g. "Chocolate", "Crispy", "Eternity")
+#   command:       the executable command (e.g. "$md_inst/crispy-doom")
+#
+# Example: _add_doom_wad_ports "crispy" "Crispy" "$md_inst/crispy-doom"
+function _add_doom_wad_ports() {
+    local prefix="$1"
+    local name="$2"
+    local cmd="$3"
+
+    local wad_dir="$romdir/ports/doom"
+
+    if [[ -f "$wad_dir/doom1.wad" ]]; then
+        chown $user:$user "$wad_dir/doom1.wad"
+        addPort "$md_id" "${prefix}-doom1" "$name Doom Shareware" "$cmd -iwad $wad_dir/doom1.wad"
+    fi
+
+    if [[ -f "$wad_dir/doom.wad" ]]; then
+        chown $user:$user "$wad_dir/doom.wad"
+        addPort "$md_id" "${prefix}-doom" "$name Doom Registered" "$cmd -iwad $wad_dir/doom.wad"
+    fi
+
+    if [[ -f "$wad_dir/freedoom1.wad" ]]; then
+        chown $user:$user "$wad_dir/freedoom1.wad"
+        addPort "$md_id" "${prefix}-freedoom1" "$name Free Doom: Phase 1" "$cmd -iwad $wad_dir/freedoom1.wad"
+    fi
+
+    if [[ -f "$wad_dir/freedoom2.wad" ]]; then
+        chown $user:$user "$wad_dir/freedoom2.wad"
+        addPort "$md_id" "${prefix}-freedoom2" "$name Free Doom: Phase 2" "$cmd -iwad $wad_dir/freedoom2.wad"
+    fi
+
+    if [[ -f "$wad_dir/doom2.wad" ]]; then
+        chown $user:$user "$wad_dir/doom2.wad"
+        addPort "$md_id" "${prefix}-doom2" "$name Doom II: Hell on Earth" "$cmd -iwad $wad_dir/doom2.wad"
+    fi
+
+    if [[ -f "$wad_dir/doomu.wad" ]]; then
+        chown $user:$user "$wad_dir/doomu.wad"
+        addPort "$md_id" "${prefix}-doomu" "$name Ultimate Doom" "$cmd -iwad $wad_dir/doomu.wad"
+    fi
+
+    if [[ -f "$wad_dir/tnt.wad" ]]; then
+        chown $user:$user "$wad_dir/tnt.wad"
+        addPort "$md_id" "${prefix}-doomtnt" "$name Final Doom - TNT: Evilution" "$cmd -iwad $wad_dir/tnt.wad"
+    fi
+
+    if [[ -f "$wad_dir/plutonia.wad" ]]; then
+        chown $user:$user "$wad_dir/plutonia.wad"
+        addPort "$md_id" "${prefix}-doomplutonia" "$name Final Doom - The Plutonia Experiment" "$cmd -iwad $wad_dir/plutonia.wad"
+    fi
+}
+
+# Register Heretic/Hexen/Strife WAD files as ports for chocolate-doom style engines.
+# These WADs use separate binaries (e.g. chocolate-heretic, chocolate-hexen).
+#
+# Usage: _add_heretic_hexen_strife_ports "engine_prefix" "Engine Name" "base_cmd_prefix"
+#   engine_prefix:  short name used for port IDs (e.g. "chocolate", "eternity")
+#   engine_name:    display name prefix (e.g. "Chocolate", "Eternity")
+#   heretic_cmd:    command for heretic (e.g. "$md_inst/chocolate-heretic")
+#   hexen_cmd:      command for hexen (e.g. "$md_inst/chocolate-hexen") - optional
+#   strife_cmd:     command for strife (e.g. "$md_inst/chocolate-strife") - optional
+#
+# Example: _add_heretic_hexen_strife_ports "chocolate" "Chocolate" "$md_inst/chocolate-heretic" "$md_inst/chocolate-hexen" "$md_inst/chocolate-strife"
+function _add_heretic_hexen_strife_ports() {
+    local prefix="$1"
+    local name="$2"
+    local heretic_cmd="$3"
+    local hexen_cmd="$4"
+    local strife_cmd="$5"
+
+    local wad_dir="$romdir/ports/doom"
+
+    if [[ -n "$heretic_cmd" ]]; then
+        if [[ -f "$wad_dir/heretic1.wad" ]]; then
+            chown $user:$user "$wad_dir/heretic1.wad"
+            addPort "$md_id" "${prefix}-heretic1" "$name Heretic Shareware" "$heretic_cmd -iwad $wad_dir/heretic1.wad"
+        fi
+
+        if [[ -f "$wad_dir/heretic.wad" ]]; then
+            chown $user:$user "$wad_dir/heretic.wad"
+            addPort "$md_id" "${prefix}-heretic" "$name Heretic Registered" "$heretic_cmd -iwad $wad_dir/heretic.wad"
+        fi
+    fi
+
+    if [[ -n "$hexen_cmd" ]]; then
+        if [[ -f "$wad_dir/hexen.wad" ]]; then
+            chown $user:$user "$wad_dir/hexen.wad"
+            addPort "$md_id" "${prefix}-hexen" "$name Hexen" "$hexen_cmd -iwad $wad_dir/hexen.wad"
+        fi
+
+        if [[ -f "$wad_dir/hexdd.wad" && -f "$wad_dir/hexen.wad" ]]; then
+            chown $user:$user "$wad_dir/hexdd.wad"
+            addPort "$md_id" "${prefix}-hexdd" "$name Hexen: Deathkings of the Dark Citadel" "$hexen_cmd -iwad $wad_dir/hexen.wad -file $wad_dir/hexdd.wad"
+        fi
+    fi
+
+    if [[ -n "$strife_cmd" ]]; then
+        if [[ -f "$wad_dir/strife1.wad" ]]; then
+            chown $user:$user "$wad_dir/strife1.wad"
+            addPort "$md_id" "${prefix}-strife1" "$name Strife" "$strife_cmd -iwad $wad_dir/strife1.wad"
+        fi
+    fi
+}
+
+# Build a libretro core using Makefile.libretro.
+# Usage: _build_libretro_core "core_name"
+#   core_name: name of the .so output (without _libretro.so suffix)
+#
+# Example: _build_libretro_core "2048"
+function _build_libretro_core() {
+    local core_name="$1"
+    make -f Makefile.libretro clean
+    make -f Makefile.libretro
+    md_ret_require="$md_build/${core_name}_libretro.so"
+}
+
+# Configure a libretro core as a port.
+# Usage: _configure_libretro_port "port_name" "display_name" "core_file"
+#   port_name:    short name for the port (e.g. "2048", "craft")
+#   display_name: human-readable name (e.g. "2048", "Craft")
+#   core_file:    .so filename (e.g. "2048_libretro.so")
+#
+# Example: _configure_libretro_port "2048" "2048" "2048_libretro.so"
+function _configure_libretro_port() {
+    local port_name="$1"
+    local display_name="$2"
+    local core_file="$3"
+
+    setConfigRoot "ports"
+    addPort "$md_id" "$port_name" "$display_name" "$md_inst/$core_file"
+    ensureSystemretroconfig "ports/$port_name"
+}
+
+# Configure a libretro core as a system emulator.
+# Usage: _configure_libretro_system "system" "core_file" [is_default] [system_name] [extensions]
+#   system:       system name (e.g. "megadrive", "uzebox")
+#   core_file:    .so filename (e.g. "blastem_libretro.so")
+#   is_default:   1 or 0, whether this is the default emulator (default: 1)
+#   system_name:  display name for the system (optional, passed to addSystem)
+#   extensions:   file extensions (optional, passed to addSystem)
+#
+# Example: _configure_libretro_system "megadrive" "blastem_libretro.so"
+# Example: _configure_libretro_system "uzebox" "uzem_libretro.so" 1 "Uzem" ".uze .zip"
+function _configure_libretro_system() {
+    local system="$1"
+    local core_file="$2"
+    local is_default="${3:-1}"
+    local system_name="$4"
+    local extensions="$5"
+
+    mkRomDir "$system"
+    ensureSystemretroconfig "$system"
+
+    addEmulator "$is_default" "$md_id" "$system" "$md_inst/$core_file"
+    if [[ -n "$system_name" ]]; then
+        addSystem "$system" "$system_name" "$extensions"
+    else
+        addSystem "$system"
+    fi
+}
diff --git a/scriptmodules/libretrocores/lr-2048.sh b/scriptmodules/libretrocores/lr-2048.sh
index 3c3a552a..b82b62a4 100644
--- a/scriptmodules/libretrocores/lr-2048.sh
+++ b/scriptmodules/libretrocores/lr-2048.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="lr-2048"
 rp_module_desc="2048 engine - 2048 port for libretro"
 rp_module_licence="Unl https://raw.githubusercontent.com/libretro/libretro-2048/master/COPYING"
@@ -22,9 +24,7 @@ function sources_lr-2048() {
 }
 
 function build_lr-2048() {
-    make -f Makefile.libretro clean
-    make -f Makefile.libretro
-    md_ret_require="$md_build/2048_libretro.so"
+    _build_libretro_core "2048"
 }
 
 function install_lr-2048() {
@@ -34,9 +34,5 @@ function install_lr-2048() {
 }
 
 function configure_lr-2048() {
-    setConfigRoot "ports"
-
-    addPort "$md_id" "2048" "2048" "$md_inst/2048_libretro.so"
-
-    ensureSystemretroconfig "ports/2048"
+    _configure_libretro_port "2048" "2048" "2048_libretro.so"
 }
\ No newline at end of file
diff --git a/scriptmodules/libretrocores/lr-bk.sh b/scriptmodules/libretrocores/lr-bk.sh
index da92e35e..e7369d9a 100644
--- a/scriptmodules/libretrocores/lr-bk.sh
+++ b/scriptmodules/libretrocores/lr-bk.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="lr-bk"
 rp_module_desc="Elektronika БК-0010/0011/Terak 8510a emulator - BK port for libretro"
 rp_module_help="ROM Extension: .bin .zip .7z\n\nCopy your roms to $romdir/bk\n\nCopy the following BIOS files to $biosdir/bk:\nMONIT10.ROM (BK-0010/0010.01);\nFOCAL10.ROM (BK-0010);\nBASIC10.ROM (BK-0010.01);\nDISK_327.ROM (BK-0010.01/0011M + FDD);\nB11M_BOS.ROM, BAS11M_0.ROM, BAS11M_1.ROM and B11M_EXT.ROM (BK-0011M + FDD);\nTERAK.ROM (Terak 8510/a)."
@@ -23,9 +25,7 @@ function sources_lr-bk() {
 }
 
 function build_lr-bk() {
-    make -f Makefile.libretro clean
-    make -f Makefile.libretro
-    md_ret_require="$md_build/bk_libretro.so"
+    _build_libretro_core "bk"
 }
 
 function install_lr-bk() {
diff --git a/scriptmodules/libretrocores/lr-blastem.sh b/scriptmodules/libretrocores/lr-blastem.sh
index 91c75627..b0b04638 100644
--- a/scriptmodules/libretrocores/lr-blastem.sh
+++ b/scriptmodules/libretrocores/lr-blastem.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="lr-blastem"
 rp_module_desc="Sega Genesis emu - BlastEm port for libretro"
 rp_module_help="ROM Extensions: .md .bin .smd .zip .7z\n\nCopy the required BIOS file rom.db to $biosdir"
@@ -23,9 +25,7 @@ function sources_lr-blastem() {
 }
 
 function build_lr-blastem() {
-    make -f Makefile.libretro clean
-    make -f Makefile.libretro
-    md_ret_require="$md_build/blastem_libretro.so"
+    _build_libretro_core "blastem"
 }
 
 function install_lr-blastem() {
@@ -36,9 +36,5 @@ function install_lr-blastem() {
 }
 
 function configure_lr-blastem() {
-    mkRomDir "megadrive"
-    ensureSystemretroconfig "megadrive"
-
-    addEmulator 1 "$md_id" "megadrive" "$md_inst/blastem_libretro.so"
-    addSystem "megadrive"
+    _configure_libretro_system "megadrive" "blastem_libretro.so"
 }
\ No newline at end of file
diff --git a/scriptmodules/libretrocores/lr-craft.sh b/scriptmodules/libretrocores/lr-craft.sh
index d2f12776..f3a04c05 100644
--- a/scriptmodules/libretrocores/lr-craft.sh
+++ b/scriptmodules/libretrocores/lr-craft.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="lr-craft"
 rp_module_desc="Minecraft engine - Craft port for libretro"
 rp_module_licence="MIT https://raw.githubusercontent.com/libretro/Craft/master/LICENSE.md"
@@ -22,9 +24,7 @@ function sources_lr-craft() {
 }
 
 function build_lr-craft() {
-    make -f Makefile.libretro clean
-    make -f Makefile.libretro
-    md_ret_require="$md_build/craft_libretro.so"
+    _build_libretro_core "craft"
 }
 
 function install_lr-craft() {
@@ -34,9 +34,5 @@ function install_lr-craft() {
 }
 
 function configure_lr-craft() {
-    setConfigRoot "ports"
-
-    addPort "$md_id" "craft" "Craft" "$md_inst/craft_libretro.so"
-
-    ensureSystemretroconfig "ports/craft"
+    _configure_libretro_port "craft" "Craft" "craft_libretro.so"
 }
\ No newline at end of file
diff --git a/scriptmodules/libretrocores/lr-genesis-plus-gx-EX.sh b/scriptmodules/libretrocores/lr-genesis-plus-gx-EX.sh
index 08347ea7..f1019f63 100644
--- a/scriptmodules/libretrocores/lr-genesis-plus-gx-EX.sh
+++ b/scriptmodules/libretrocores/lr-genesis-plus-gx-EX.sh
@@ -10,6 +10,8 @@
 #
 # [lr-genesis-plus-gx-EX for Sega Channel Revival] https://github.com/BillyTimeGames/Genesis-Plus-GX-Expanded-Rom-Size.git +P4PR1UM Compatibility (202507)
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="lr-genesis-plus-gx-EX"
 rp_module_desc="Fork of lr-genesis-plus-gx + Expanded Rom Size Support"
 rp_module_help="ROM Extensions: .bin .cue .gen .gg .iso .md .sg .smd .sms .zip\nCopy your Game Gear roms to $romdir/gamegear\nMasterSystem roms to $romdir/mastersystem\nMegadrive / Genesis roms to $romdir/megadrive\nSG-1000 roms to $romdir/sg-1000\nSegaCD roms to $romdir/segacd\nThe Sega CD requires the BIOS files bios_CD_U.bin and bios_CD_E.bin and bios_CD_J.bin copied to $biosdir"
@@ -22,9 +24,7 @@ function sources_lr-genesis-plus-gx-EX() {
 }
 
 function build_lr-genesis-plus-gx-EX() {
-    make -f Makefile.libretro clean
-    make -f Makefile.libretro
-    md_ret_require="$md_build/genesis_plus_gx_libretro.so"
+    _build_libretro_core "genesis_plus_gx"
 }
 
 function install_lr-genesis-plus-gx-EX() {
diff --git a/scriptmodules/libretrocores/lr-numero.sh b/scriptmodules/libretrocores/lr-numero.sh
index 8b1add6e..eabec109 100644
--- a/scriptmodules/libretrocores/lr-numero.sh
+++ b/scriptmodules/libretrocores/lr-numero.sh
@@ -13,6 +13,8 @@
 # If no user is specified (for RetroPie below v4.8.9)
 if [[ -z "$__user" ]]; then __user="$SUDO_USER"; [[ -z "$__user" ]] && __user="$(id -un)"; fi
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="lr-numero"
 rp_module_desc="lr-numero - Numero is a libretro core for emulating the TI-83 family of graphing calculators."
 rp_module_help="ROM Extensions: .8xp .8xk .8xg\n\nPlace TI-83 ROMs in: $romdir/ti83/\n\nPlace TI-83 BIOS in: $biosdir/\nti83se.rom      TI-83 Silver Edition   *Recommended*\nti83plus.rom    TI-83 Plus\nti83.rom        TI-83\n\n{RESET/RESTART in RetroArch to CLEAR the Entire Memory}\n\nMore Info:\ngithub.com/nbarkhina/numero/blob/master/README.md\n\n{ti83se.rom}:\nhttps://web.archive.org/web/20230208002249/http://tiroms.weebly.com/uploads/1/1/0/5/110560031/ti83se.rom\n\n{ti83plus.rom}\nhttps://web.archive.org/web/20230208002249/http://tiroms.weebly.com/uploads/1/1/0/5/110560031/ti83plus.rom"
@@ -25,9 +27,7 @@ function sources_lr-numero() {
 }
 
 function build_lr-numero() {
-    make -f Makefile.libretro clean
-    make -f Makefile.libretro
-    md_ret_require="$md_build/numero_libretro.so"
+    _build_libretro_core "numero"
 }
 
 function install_lr-numero() {
diff --git a/scriptmodules/libretrocores/lr-oberon.sh b/scriptmodules/libretrocores/lr-oberon.sh
index 8d20d150..53d7bb77 100644
--- a/scriptmodules/libretrocores/lr-oberon.sh
+++ b/scriptmodules/libretrocores/lr-oberon.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="lr-oberon"
 rp_module_desc="Oberon RISC emulator for libretro"
 rp_module_help="ROM Extensions: .dsk\n\nOberon RISC disk images are copied to $romdir/ports/oberon"
@@ -27,9 +29,7 @@ function sources_lr-oberon() {
 }
 
 function build_lr-oberon() {
-    make -f Makefile.libretro clean
-    make -f Makefile.libretro
-    md_ret_require="$md_build/oberon_libretro.so"
+    _build_libretro_core "oberon"
 }
 
 function install_lr-oberon() {
diff --git a/scriptmodules/libretrocores/lr-potator.sh b/scriptmodules/libretrocores/lr-potator.sh
index 7b6ff2d1..b19e1ff3 100644
--- a/scriptmodules/libretrocores/lr-potator.sh
+++ b/scriptmodules/libretrocores/lr-potator.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="lr-potator"
 rp_module_desc="Watara Supervision emulator based on Normmatt version - Potator port for libretro"
 rp_module_help="ROM Extensions: .sv .zip .7z\n\nCopy your Watara Supervision roms to $romdir/svision"
@@ -37,9 +39,5 @@ function install_lr-potator() {
 }
 
 function configure_lr-potator() {
-        mkRomDir "potator"
-        ensureSystemretroconfig "potator"
-
-        addEmulator 1 "$md_id" "potator" "$md_inst/potator_libretro.so"
-        addSystem "potator" "Watara Supervision" ".sv .SV"
+    _configure_libretro_system "potator" "potator_libretro.so" 1 "Watara Supervision" ".sv .SV"
 }
\ No newline at end of file
diff --git a/scriptmodules/libretrocores/lr-uzem.sh b/scriptmodules/libretrocores/lr-uzem.sh
index bdd1b932..2d58817f 100644
--- a/scriptmodules/libretrocores/lr-uzem.sh
+++ b/scriptmodules/libretrocores/lr-uzem.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="lr-uzem"
 rp_module_desc="Uzebox engine - Uzem port for libretro"
 rp_module_help="ROM Extensions: .uze\n\nCopy your ROM files to $romdir/uzebox"
@@ -23,9 +25,7 @@ function sources_lr-uzem() {
 }
 
 function build_lr-uzem() {
-    make -f Makefile.libretro clean
-    make -f Makefile.libretro
-    md_ret_require="$md_build/uzem_libretro.so"
+    _build_libretro_core "uzem"
 }
 
 function install_lr-uzem() {
@@ -35,9 +35,5 @@ function install_lr-uzem() {
 }
 
 function configure_lr-uzem() {
-    mkRomDir "uzebox"
-    ensureSystemretroconfig "uzebox"
-
-    addEmulator 1 "$md_id" "uzebox" "$md_inst/uzem_libretro.so"
-    addSystem "uzebox" "Uzem" ".uze .zip"
+    _configure_libretro_system "uzebox" "uzem_libretro.so" 1 "Uzem" ".uze .zip"
 }
\ No newline at end of file
diff --git a/scriptmodules/ports/chocolate-doom-system.sh b/scriptmodules/ports/chocolate-doom-system.sh
index 08b60eba..40f5c267 100644
--- a/scriptmodules/ports/chocolate-doom-system.sh
+++ b/scriptmodules/ports/chocolate-doom-system.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="chocolate-doom-system"
 rp_module_desc="Chocolate Doom - Enhanced port of the official DOOM source"
 rp_module_licence="GPL2 https://raw.githubusercontent.com/chocolate-doom/chocolate-doom/sdl2-branch/COPYING"
@@ -52,18 +54,7 @@ function install_chocolate-doom-system() {
 }
 
 function game_data_chocolate-doom-system() {
-    mkRomDir "doom"
-    if [[ ! -f "$romdir/doom/doom1.wad" ]]; then
-        wget "$__archive_url/doom1.wad" -O "$romdir/doom/doom1.wad"
-    fi
-
-    if [[ ! -f "$romdir/doom/freedoom1.wad" ]]; then
-        wget "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip"
-        unzip freedoom-0.12.1.zip
-        mv freedoom-0.12.1/*.wad "$romdir/doom"
-        rm -rf freedoom-0.12.1
-        rm freedoom-0.12.1.zip
-    fi
+    _download_doom_system_wads
 }
 
 function configure_chocolate-doom-system() {
diff --git a/scriptmodules/ports/chocolate-doom.sh b/scriptmodules/ports/chocolate-doom.sh
index f75bdc5e..fabb3e1d 100644
--- a/scriptmodules/ports/chocolate-doom.sh
+++ b/scriptmodules/ports/chocolate-doom.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="chocolate-doom"
 rp_module_desc="Chocolate Doom - Enhanced port of the official DOOM source"
 rp_module_licence="GPL2 https://raw.githubusercontent.com/chocolate-doom/chocolate-doom/sdl2-branch/COPYING"
@@ -52,90 +54,15 @@ function install_chocolate-doom() {
 }
 
 function game_data_chocolate-doom() {
-    mkRomDir "ports"
-    mkRomDir "ports/doom"
-    if [[ ! -f "$romdir/ports/doom/doom1.wad" ]]; then
-        wget "$__archive_url/doom1.wad" -O "$romdir/ports/doom/doom1.wad"
-    fi
-
-    if [[ ! -f "$romdir/ports/doom/freedoom1.wad" ]]; then
-        wget "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip"
-        unzip freedoom-0.12.1.zip
-        mv freedoom-0.12.1/*.wad "$romdir/ports/doom"
-        rm -rf freedoom-0.12.1
-        rm freedoom-0.12.1.zip
-    fi
+    _download_doom_port_wads
 }
 
 function configure_chocolate-doom() {
     mkUserDir "$home/.config"
     moveConfigDir "$home/.chocolate-doom" "$md_conf_root/chocolate-doom"
 
-    # Temporary until the official RetroPie WAD selector is complete.
-    if [[ -f "$romdir/ports/doom/doom1.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doom1.wad"
-       addPort "$md_id" "chocolate-doom1" "Chocolate Doom Shareware" "$md_inst/chocolate-doom -iwad $romdir/ports/doom/doom1.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/doom.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doom.wad"
-       addPort "$md_id" "chocolate-doom" "Chocolate Doom Registered" "$md_inst/chocolate-doom -iwad $romdir/ports/doom/doom.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/freedoom1.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/freedoom1.wad"
-       addPort "$md_id" "chocolate-freedoom1" "Chocolate Free Doom: Phase 1" "$md_inst/chocolate-doom -iwad $romdir/ports/doom/freedoom1.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/freedoom2.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/freedoom2.wad"
-       addPort "$md_id" "chocolate-freedoom2" "Chocolate Free Doom: Phase 2" "$md_inst/chocolate-doom -iwad $romdir/ports/doom/freedoom2.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/doom2.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doom2.wad"
-       addPort "$md_id" "chocolate-doom2" "Chocolate Doom II: Hell on Earth" "$md_inst/chocolate-doom -iwad $romdir/ports/doom/doom2.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/doomu.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doomu.wad"
-       addPort "$md_id" "chocolate-doomu" "Chocolate Ultimate Doom" "$md_inst/chocolate-doom -iwad $romdir/ports/doom/doomu.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/tnt.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/tnt.wad"
-       addPort "$md_id" "chocolate-doomtnt" "Chocolate Final Doom - TNT: Evilution" "$md_inst/chocolate-doom -iwad $romdir/ports/doom/tnt.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/plutonia.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/plutonia.wad"
-       addPort "$md_id" "chocolate-doomplutonia" "Chocolate Final Doom - The Plutonia Experiment" "$md_inst/chocolate-doom -iwad $romdir/ports/doom/plutonia.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/heretic1.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/heretic1.wad"
-       addPort "$md_id" "chocolate-heretic1" "Chocolate Heretic Shareware" "$md_inst/chocolate-heretic -iwad $romdir/ports/doom/heretic1.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/heretic.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/heretic.wad"
-       addPort "$md_id" "chocolate-heretic" "Chocolate Heretic Registered" "$md_inst/chocolate-heretic -iwad $romdir/ports/doom/heretic.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/hexen.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/hexen.wad"
-       addPort "$md_id" "chocolate-hexen" "Chocolate Hexen" "$md_inst/chocolate-hexen -iwad $romdir/ports/doom/hexen.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/hexdd.wad" && -f "$romdir/ports/doom/hexen.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/hexdd.wad"
-       addPort "$md_id" "chocolate-hexdd" "Chocolate Hexen: Deathkings of the Dark Citadel" "$md_inst/chocolate-hexen -iwad $romdir/ports/doom/hexen.wad -file $romdir/ports/doom/hexdd.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/strife1.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/strife1.wad"
-       addPort "$md_id" "chocolate-strife1" "Chocolate Strife" "$md_inst/chocolate-strife -iwad $romdir/ports/doom/strife1.wad"
-    fi
+    _add_doom_wad_ports "chocolate" "Chocolate" "$md_inst/chocolate-doom"
+    _add_heretic_hexen_strife_ports "chocolate" "Chocolate" "$md_inst/chocolate-heretic" "$md_inst/chocolate-hexen" "$md_inst/chocolate-strife"
 
     [[ "$md_mode" == "install" ]] && game_data_chocolate-doom
     [[ "$md_mode" == "remove" ]] && return
diff --git a/scriptmodules/ports/crispy-doom-system.sh b/scriptmodules/ports/crispy-doom-system.sh
index a12b706b..8a2f52fa 100644
--- a/scriptmodules/ports/crispy-doom-system.sh
+++ b/scriptmodules/ports/crispy-doom-system.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="crispy-doom-system"
 rp_module_desc="Crispy Doom - Enhanced port of the official DOOM source"
 rp_module_licence="GPL2 https://raw.githubusercontent.com/fabiangreffrath/crispy-doom/master/COPYING"
@@ -43,21 +45,9 @@ function install_crispy-doom-system() {
 }
 
 function game_data_doom() {
-    mkRomDir "doom"
-    if [[ ! -f "$romdir/doom/doom1.wad" ]]; then
-        wget "$__archive_url/doom1.wad" -O "$romdir/doom/doom1.wad"
-    fi
-
-    if [[ ! -f "$romdir/doom/freedoom1.wad" ]]; then
-        wget "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip"
-        unzip freedoom-0.12.1.zip
-        mv freedoom-0.12.1/*.wad "$romdir/doom"
-        rm -rf freedoom-0.12.1
-        rm freedoom-0.12.1.zip
-    fi
+    _download_doom_system_wads
 }
 
-
 function configure_crispy-doom-system() {
     mkUserDir "$home/.config"
     setConfigRoot ""
diff --git a/scriptmodules/ports/crispy-doom.sh b/scriptmodules/ports/crispy-doom.sh
index e624917e..8d339556 100644
--- a/scriptmodules/ports/crispy-doom.sh
+++ b/scriptmodules/ports/crispy-doom.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="crispy-doom"
 rp_module_desc="Crispy Doom - Enhanced port of the official DOOM source"
 rp_module_licence="GPL2 https://raw.githubusercontent.com/fabiangreffrath/crispy-doom/master/COPYING"
@@ -43,65 +45,14 @@ function install_crispy-doom() {
 }
 
 function game_data_doom() {
-    mkRomDir "ports"
-    mkRomDir "ports/doom"
-    if [[ ! -f "$romdir/ports/doom/doom1.wad" ]]; then
-        wget "$__archive_url/doom1.wad" -O "$romdir/ports/doom/doom1.wad"
-    fi
-
-    if [[ ! -f "$romdir/ports/doom/freedoom1.wad" ]]; then
-        wget "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip"
-        unzip freedoom-0.12.1.zip
-        mv freedoom-0.12.1/*.wad "$romdir/ports/doom"
-        rm -rf freedoom-0.12.1
-        rm freedoom-0.12.1.zip
-    fi
+    _download_doom_port_wads
 }
 
 function configure_crispy-doom() {
     mkUserDir "$home/.config"
     moveConfigDir "$home/.crispy-doom" "$md_conf_root/crispy-doom"
 
-    # Temporary until the official RetroPie WAD selector is complete.
-    if [[ -f "$romdir/ports/doom/doom1.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doom1.wad"
-       addPort "$md_id" "crispy-doom1" "Crispy Doom Shareware" "$md_inst/crispy-doom -iwad $romdir/ports/doom/doom1.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/doom.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doom.wad"
-       addPort "$md_id" "crispy-doom" "Crispy Doom Registered" "$md_inst/crispy-doom -iwad $romdir/ports/doom/doom.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/freedoom1.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/freedoom1.wad"
-       addPort "$md_id" "crispy-freedoom1" "Crispy Free Doom: Phase 1" "$md_inst/crispy-doom -iwad $romdir/ports/doom/freedoom1.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/freedoom2.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/freedoom2.wad"
-       addPort "$md_id" "crispy-freedoom2" "Crispy Free Doom: Phase 2" "$md_inst/crispy-doom -iwad $romdir/ports/doom/freedoom2.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/doom2.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doom2.wad"
-       addPort "$md_id" "crispy-doom2" "Crispy Doom II: Hell on Earth" "$md_inst/crispy-doom -iwad $romdir/ports/doom/doom2.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/doomu.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doomu.wad"
-       addPort "$md_id" "crispy-doomu" "Crispy Ultimate Doom" "$md_inst/crispy-doom -iwad $romdir/ports/doom/doomu.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/tnt.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/tnt.wad"
-       addPort "$md_id" "crispy-doomtnt" "Crispy Final Doom - TNT: Evilution" "$md_inst/crispy-doom -iwad $romdir/ports/doom/tnt.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/plutonia.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/plutonia.wad"
-       addPort "$md_id" "crispy-doomplutonia" "Crispy Final Doom - The Plutonia Experiment" "$md_inst/crispy-doom -iwad $romdir/ports/doom/plutonia.wad"
-    fi
+    _add_doom_wad_ports "crispy" "Crispy" "$md_inst/crispy-doom"
 
     [[ "$md_mode" == "install" ]] && game_data_doom
     [[ "$md_mode" == "remove" ]] && return
diff --git a/scriptmodules/ports/eternity-system.sh b/scriptmodules/ports/eternity-system.sh
index 4e0cfdbe..57e8d929 100644
--- a/scriptmodules/ports/eternity-system.sh
+++ b/scriptmodules/ports/eternity-system.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="eternity-system"
 rp_module_desc="Eternity Doom - Enhanced port of the official DOOM source"
 rp_module_licence="GPL3 https://github.com/team-eternity/eternity/blob/master/COPYING"
@@ -43,18 +45,7 @@ function install_eternity-system() {
 }
 
 function game_data_doom() {
-    mkRomDir "doom"
-    if [[ ! -f "$romdir/doom/doom1.wad" ]]; then
-        wget "$__archive_url/doom1.wad" -O "$romdir/doom/doom1.wad"
-    fi
-
-    if [[ ! -f "$romdir/doom/freedoom1.wad" ]]; then
-        wget "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip"
-        unzip freedoom-0.12.1.zip
-        mv freedoom-0.12.1/*.wad "$romdir/doom"
-        rm -rf freedoom-0.12.1
-        rm freedoom-0.12.1.zip
-    fi
+    _download_doom_system_wads
 }
 
 function configure_eternity-system() {
diff --git a/scriptmodules/ports/eternity.sh b/scriptmodules/ports/eternity.sh
index 82ae2f4e..ba015b1f 100644
--- a/scriptmodules/ports/eternity.sh
+++ b/scriptmodules/ports/eternity.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="eternity"
 rp_module_desc="Eternity Doom - Enhanced port of the official DOOM source"
 rp_module_licence="GPL3 https://github.com/team-eternity/eternity/blob/master/COPYING"
@@ -43,80 +45,15 @@ function install_eternity() {
 }
 
 function game_data_eternity() {
-    mkRomDir "ports"
-    mkRomDir "ports/doom"
-    if [[ ! -f "$romdir/ports/doom/doom1.wad" ]]; then
-        wget "$__archive_url/doom1.wad" -O "$romdir/ports/doom/doom1.wad"
-    fi
-
-    if [[ ! -f "$romdir/ports/doom/freedoom1.wad" ]]; then
-        wget "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip"
-        unzip freedoom-0.12.1.zip
-        mv freedoom-0.12.1/*.wad "$romdir/ports/doom"
-        rm -rf freedoom-0.12.1
-        rm freedoom-0.12.1.zip
-    fi
+    _download_doom_port_wads
 }
 
 function configure_eternity() {
     mkUserDir "$home/.config"
     moveConfigDir "$home/.config/eternity" "$md_conf_root/eternity"
 
-    # Temporary until the official RetroPie WAD selector is complete.
-    if [[ -f "$romdir/ports/doom/doom1.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doom1.wad"
-       addPort "$md_id" "eternity-doom1" "Eternity Doom Shareware" "$md_inst/eternity -iwad $romdir/ports/doom/doom1.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/doom.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doom.wad"
-       addPort "$md_id" "eternity-doom" "Eternity Doom Registered" "$md_inst/eternity -iwad $romdir/ports/doom/doom.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/freedoom1.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/freedoom1.wad"
-       addPort "$md_id" "eternity-freedoom1" "Eternity Free Doom: Phase 1" "$md_inst/eternity -iwad $romdir/ports/doom/freedoom1.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/freedoom2.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/freedoom2.wad"
-       addPort "$md_id" "eternity-freedoom2" "Eternity Free Doom: Phase 2" "$md_inst/eternity -iwad $romdir/ports/doom/freedoom2.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/doom2.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doom2.wad"
-       addPort "$md_id" "eternity-doom2" "Eternity Doom II: Hell on Earth" "$md_inst/eternity -iwad $romdir/ports/doom/doom2.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/doomu.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/doomu.wad"
-       addPort "$md_id" "eternity-doomu" "Eternity Ultimate Doom" "$md_inst/eternity -iwad $romdir/ports/doom/doomu.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/tnt.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/tnt.wad"
-       addPort "$md_id" "eternity-doomtnt" "Eternity Final Doom - TNT: Evilution" "$md_inst/eternity -iwad $romdir/ports/doom/tnt.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/plutonia.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/plutonia.wad"
-       addPort "$md_id" "eternity-doomplutonia" "Eternity Final Doom - The Plutonia Experiment" "$md_inst/eternity -iwad $romdir/ports/doom/plutonia.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/heretic1.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/heretic1.wad"
-       addPort "$md_id" "eternity-heretic1" "Eternity Heretic Shareware" "$md_inst/eternity -iwad $romdir/ports/doom/heretic1.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/heretic.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/heretic.wad"
-       addPort "$md_id" "eternity-heretic" "Eternity Heretic Registered" "$md_inst/eternity -iwad $romdir/ports/doom/heretic.wad"
-    fi
-
-    if [[ -f "$romdir/ports/doom/strife1.wad" ]]; then
-       chown $user:$user "$romdir/ports/doom/strife1.wad"
-       addPort "$md_id" "eternity-strife1" "Eternity Strife" "$md_inst/eternity -iwad $romdir/ports/doom/strife1.wad"
-    fi
+    _add_doom_wad_ports "eternity" "Eternity" "$md_inst/eternity"
+    _add_heretic_hexen_strife_ports "eternity" "Eternity" "$md_inst/eternity" "" "$md_inst/eternity"
 
     [[ "$md_mode" == "install" ]] && game_data_eternity
     [[ "$md_mode" == "remove" ]] && return
diff --git a/scriptmodules/ports/gzdoom-system.sh b/scriptmodules/ports/gzdoom-system.sh
index ae7c9867..1312db5f 100644
--- a/scriptmodules/ports/gzdoom-system.sh
+++ b/scriptmodules/ports/gzdoom-system.sh
@@ -9,6 +9,8 @@
 # at https://raw.githubusercontent.com/RetroPie/RetroPie-Setup/master/LICENSE.md
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="gzdoom-system"
 rp_module_desc="GZDoom System - GZDoom as a system"
 rp_module_licence="GPL3 https://raw.githubusercontent.com/ZDoom/gzdoom/master/LICENSE"
@@ -81,18 +83,7 @@ function install_gzdoom-system() {
 
 
 function game_data_gzdoom-system() {
-    mkRomDir "doom"
-    if [[ ! -f "$romdir/doom/doom1.wad" ]]; then
-        wget "$__archive_url/doom1.wad" -O "$romdir/doom/doom1.wad"
-    fi
-
-    if [[ ! -f "$romdir/doom/freedoom1.wad" ]]; then
-        wget "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip"
-        unzip freedoom-0.12.1.zip
-        mv freedoom-0.12.1/*.wad "$romdir/doom"
-        rm -rf freedoom-0.12.1
-        rm freedoom-0.12.1.zip
-    fi
+    _download_doom_system_wads
 }
 
 function configure_gzdoom-system() {
diff --git a/scriptmodules/ports/prboom-plus-system.sh b/scriptmodules/ports/prboom-plus-system.sh
index cf7507d9..2fc7dfcc 100644
--- a/scriptmodules/ports/prboom-plus-system.sh
+++ b/scriptmodules/ports/prboom-plus-system.sh
@@ -10,6 +10,8 @@
 # https://raw.githubusercontent.com/Exarkuniv/RetroPie-Extra/master/LICENSE
 #
 
+source "$(dirname "${BASH_SOURCE[0]}")/../helpers.sh"
+
 rp_module_id="prboom-plus-system"
 rp_module_desc="Doom/Doom II engine - Enhanced PRBoom Port"
 rp_module_licence="https://github.com/coelckers/prboom-plus"
@@ -41,18 +43,7 @@ function install_prboom-plus-system() {
 }
 
 function game_data_prboom-plus() {
-    mkRomDir "doom"
-    if [[ ! -f "$romdir/doom/doom1.wad" ]]; then
-        wget "$__archive_url/doom1.wad" -O "$romdir/doom/doom1.wad"
-    fi
-
-    if [[ ! -f "$romdir/doom/freedoom1.wad" ]]; then
-        wget "https://github.com/freedoom/freedoom/releases/download/v0.12.1/freedoom-0.12.1.zip"
-        unzip freedoom-0.12.1.zip
-        mv freedoom-0.12.1/*.wad "$romdir/doom"
-        rm -rf freedoom-0.12.1
-        rm freedoom-0.12.1.zip
-    fi
+    _download_doom_system_wads
 }
 function configure_prboom-plus-system() {
     mkUserDir "$home/.config"