From 90230c6a76e8e488e7dfc5ef8acd58b064bfa890 Mon Sep 17 00:00:00 2001 From: bryanthaboi Date: Mon, 28 Sep 2026 07:49:36 -0400 Subject: [PATCH] tiny fix --- build-linux-arm-sbc.sh | 4 ++-- build-rg34xxsp.sh | 4 ++-- scripts/build.sh | 4 ++-- scripts/build_android.sh | 7 ++++++- scripts/linux-arm64/build_appimage.sh | 2 ++ scripts/linux-arm64/selftest_build_linux_arm64.sh | 2 ++ scripts/pack_love.sh | 4 ++-- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/build-linux-arm-sbc.sh b/build-linux-arm-sbc.sh index ea602890..38e2f0a3 100755 --- a/build-linux-arm-sbc.sh +++ b/build-linux-arm-sbc.sh @@ -136,7 +136,7 @@ rm -f "$WORK/game-payload.zip" tools/rom_manifest.json tools/rom_manifest_blue.json \ tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \ tools/rom_manifest_silver.json tools/rom_manifest_crystal.json \ - tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \ + tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \ -x '*.DS_Store' 'data/generated/*' 'assets/generated/*') unzip -Z1 "$WORK/game-payload.zip" > "$WORK/payload-listing.txt" if grep -Eq '^(data|assets)/generated/[^/]+|^(data|assets)/generated/.+/' "$WORK/payload-listing.txt"; then @@ -144,7 +144,7 @@ if grep -Eq '^(data|assets)/generated/[^/]+|^(data|assets)/generated/.+/' "$WORK fi for manifest in rom_manifest.json rom_manifest_blue.json rom_manifest_yellow.json \ rom_manifest_gold.json rom_manifest_silver.json rom_manifest_crystal.json \ - rom_manifest_firered.json rom_manifest_leafgreen.json; do + rom_manifest_firered.json rom_manifest_leafgreen.json rom_manifest_emerald.json; do grep -qxF "tools/$manifest" "$WORK/payload-listing.txt" \ || fail "payload is missing tools/$manifest" done diff --git a/build-rg34xxsp.sh b/build-rg34xxsp.sh index 3d3d08d0..73fd22e3 100755 --- a/build-rg34xxsp.sh +++ b/build-rg34xxsp.sh @@ -94,7 +94,7 @@ rm -f "$WORK/game-payload.zip" tools/rom_manifest.json tools/rom_manifest_blue.json \ tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \ tools/rom_manifest_silver.json tools/rom_manifest_crystal.json \ - tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \ + tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \ -x '*.DS_Store' 'data/generated/*' 'assets/generated/*') unzip -Z1 "$WORK/game-payload.zip" > "$WORK/payload-listing.txt" if grep -Eq '^(data|assets)/generated/[^/]+|^(data|assets)/generated/.+/' "$WORK/payload-listing.txt"; then @@ -102,7 +102,7 @@ if grep -Eq '^(data|assets)/generated/[^/]+|^(data|assets)/generated/.+/' "$WORK fi for manifest in rom_manifest.json rom_manifest_blue.json rom_manifest_yellow.json \ rom_manifest_gold.json rom_manifest_silver.json rom_manifest_crystal.json \ - rom_manifest_firered.json rom_manifest_leafgreen.json; do + rom_manifest_firered.json rom_manifest_leafgreen.json rom_manifest_emerald.json; do grep -qxF "tools/$manifest" "$WORK/payload-listing.txt" \ || fail "payload is missing tools/$manifest" done diff --git a/scripts/build.sh b/scripts/build.sh index 9c0c4367..b3d6cc2d 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -80,7 +80,7 @@ else tools/rom_manifest.json tools/rom_manifest_blue.json \ tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \ tools/rom_manifest_silver.json tools/rom_manifest_crystal.json \ - tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \ + tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \ -x '*.DS_Store' 'data/generated/*' 'assets/generated/*') fi # Materialize the listing once and grep the file: piping unzip straight into @@ -104,7 +104,7 @@ for required in tools/save-editor/App.lua tools/save-editor/Kit.lua \ tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \ tools/rom_manifest_silver.json \ tools/rom_manifest_crystal.json \ - tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json; do + tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json; do grep -qxF "$required" "$LOVE_LISTING" \ || fail "game.love is missing $required" done diff --git a/scripts/build_android.sh b/scripts/build_android.sh index 56705a16..3951ae9a 100755 --- a/scripts/build_android.sh +++ b/scripts/build_android.sh @@ -449,6 +449,7 @@ pack_game_love() { ensure_crystal_manifest ensure_firered_manifest [ -f "$ROOT/tools/rom_manifest_leafgreen.json" ] || fail "LeafGreen import manifest is missing" + [ -f "$ROOT/tools/rom_manifest_emerald.json" ] || fail "Emerald import manifest is missing" mkdir -p "$EMBED_ASSETS" rm -f "$LOVE_FILE" # tools/save-editor ships with the app: the launcher's Edit button on a save @@ -464,7 +465,7 @@ pack_game_love() { tools/rom_manifest.json tools/rom_manifest_blue.json \ tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \ tools/rom_manifest_silver.json tools/rom_manifest_crystal.json \ - tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \ + tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \ -x '*.DS_Store' -x '*/.git/*' -x '*/.DS_Store' \ -x 'data/generated/*' -x 'assets/generated/*') # List once and match against the captured text: piping unzip straight into @@ -492,6 +493,10 @@ pack_game_love() { || fail "game.love is missing the Crystal ROM import manifest" grep -qx "$FIRERED_MANIFEST_RELATIVE" <<< "$archive_entries" \ || fail "game.love is missing the FireRed ROM import manifest" + grep -qx 'tools/rom_manifest_leafgreen.json' <<< "$archive_entries" \ + || fail "game.love is missing the LeafGreen ROM import manifest" + grep -qx 'tools/rom_manifest_emerald.json' <<< "$archive_entries" \ + || fail "game.love is missing the Emerald ROM import manifest" # This gate exists because the launcher's UI toolkit once lived outside # src/ (libs/flexlove) and was added to scripts/build.sh's payload and to # no other packager, so Android and iOS built an APK/IPA whose launcher diff --git a/scripts/linux-arm64/build_appimage.sh b/scripts/linux-arm64/build_appimage.sh index dd4606fc..6e2910c4 100755 --- a/scripts/linux-arm64/build_appimage.sh +++ b/scripts/linux-arm64/build_appimage.sh @@ -382,6 +382,8 @@ grep -qxF "tools/rom_manifest_firered.json" "$WORK/love-listing.txt" \ || fail "game.love is missing tools/rom_manifest_firered.json" grep -qxF "tools/rom_manifest_leafgreen.json" "$WORK/love-listing.txt" \ || fail "game.love is missing tools/rom_manifest_leafgreen.json" +grep -qxF "tools/rom_manifest_emerald.json" "$WORK/love-listing.txt" \ + || fail "game.love is missing tools/rom_manifest_emerald.json" # The .desktop's Icon= resolves against the AppDir root by basename, and # .DirIcon is what appimaged and file-manager thumbnailers read. cp "$IN/icon.png" "$APPDIR/$APP_NAME.png" diff --git a/scripts/linux-arm64/selftest_build_linux_arm64.sh b/scripts/linux-arm64/selftest_build_linux_arm64.sh index 9612eea8..a7777dc2 100755 --- a/scripts/linux-arm64/selftest_build_linux_arm64.sh +++ b/scripts/linux-arm64/selftest_build_linux_arm64.sh @@ -177,5 +177,7 @@ grep -qxF "tools/rom_manifest_firered.json" "$temp_dir/love-listing.txt" \ || fail "shared payload is missing tools/rom_manifest_firered.json" grep -qxF "tools/rom_manifest_leafgreen.json" "$temp_dir/love-listing.txt" \ || fail "shared payload is missing tools/rom_manifest_leafgreen.json" +grep -qxF "tools/rom_manifest_emerald.json" "$temp_dir/love-listing.txt" \ + || fail "shared payload is missing tools/rom_manifest_emerald.json" say "Linux arm64 self-test passed" diff --git a/scripts/pack_love.sh b/scripts/pack_love.sh index 9c8735c3..4ca4a9e0 100755 --- a/scripts/pack_love.sh +++ b/scripts/pack_love.sh @@ -51,7 +51,7 @@ rm -f "$OUTPUT" tools/rom_manifest.json tools/rom_manifest_blue.json \ tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \ tools/rom_manifest_silver.json tools/rom_manifest_crystal.json \ - tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \ + tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \ -x '*.DS_Store' 'data/generated/*' 'assets/generated/*') if [ -f "$ROOT/PATCH_NOTES.md" ]; then (cd "$ROOT" && zip -q "$OUTPUT" PATCH_NOTES.md) @@ -98,7 +98,7 @@ for required in tools/save-editor/App.lua tools/save-editor/Kit.lua \ tools/rom_manifest_yellow.json tools/rom_manifest_gold.json \ tools/rom_manifest_silver.json \ tools/rom_manifest_crystal.json \ - tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json \ + tools/rom_manifest_firered.json tools/rom_manifest_leafgreen.json tools/rom_manifest_emerald.json \ src/ui/kit/Kit.lua \ src/import/LauncherView.lua; do grep -qxF "$required" "$LISTING" \