for england james?

scripts/ge007.e-test_basis.csv

@@ -773,16 +773,16 @@ d41d8cd98f00b204e9800998ecf8427e,.code,build/e/src/game/rle.o
 d41d8cd98f00b204e9800998ecf8427e,.bss,build/e/src/game/rle.o
 d41d8cd98f00b204e9800998ecf8427e,.data,build/e/src/game/rle.o
 d41d8cd98f00b204e9800998ecf8427e,.rodata,build/e/src/game/rle.o
-e8b537a19dbef522cab0d218d9e0cd28,.text,build/e/src/game/unk_01B240.o
-d41d8cd98f00b204e9800998ecf8427e,.code,build/e/src/game/unk_01B240.o
-d41d8cd98f00b204e9800998ecf8427e,.bss,build/e/src/game/unk_01B240.o
-2e036a1e94af4dca08dbda3ca29bb9f1,.data,build/e/src/game/unk_01B240.o
-c1c2bef3d9452a0f148d8613ed14b3f1,.rodata,build/e/src/game/unk_01B240.o
-9dd182e36f7cdfc30e37c9479de46c22,.text,build/e/src/game/unk_01BAE0.o
-d41d8cd98f00b204e9800998ecf8427e,.code,build/e/src/game/unk_01BAE0.o
-d41d8cd98f00b204e9800998ecf8427e,.bss,build/e/src/game/unk_01BAE0.o
-d41d8cd98f00b204e9800998ecf8427e,.data,build/e/src/game/unk_01BAE0.o
-334b90953c5606d68014564e5eda0c1b,.rodata,build/e/src/game/unk_01BAE0.o
+e8b537a19dbef522cab0d218d9e0cd28,.text,build/e/src/game/title2.o
+d41d8cd98f00b204e9800998ecf8427e,.code,build/e/src/game/title2.o
+d41d8cd98f00b204e9800998ecf8427e,.bss,build/e/src/game/title2.o
+2e036a1e94af4dca08dbda3ca29bb9f1,.data,build/e/src/game/title2.o
+c1c2bef3d9452a0f148d8613ed14b3f1,.rodata,build/e/src/game/title2.o
+9dd182e36f7cdfc30e37c9479de46c22,.text,build/e/src/game/title3.o
+d41d8cd98f00b204e9800998ecf8427e,.code,build/e/src/game/title3.o
+d41d8cd98f00b204e9800998ecf8427e,.bss,build/e/src/game/title3.o
+d41d8cd98f00b204e9800998ecf8427e,.data,build/e/src/game/title3.o
+334b90953c5606d68014564e5eda0c1b,.rodata,build/e/src/game/title3.o
 d0f801f11337accd96ccf6967a01ce8c,.text,build/e/src/game/bondhead.o
 d41d8cd98f00b204e9800998ecf8427e,.code,build/e/src/game/bondhead.o
 d41d8cd98f00b204e9800998ecf8427e,.bss,build/e/src/game/bondhead.o
@@ -803,11 +803,11 @@ d41d8cd98f00b204e9800998ecf8427e,.code,build/e/src/game/unk_092E50.o
 d41d8cd98f00b204e9800998ecf8427e,.bss,build/e/src/game/unk_092E50.o
 2503662ee6318a7e4cb77c46c99506d5,.data,build/e/src/game/unk_092E50.o
 f1dbcb1438dbbb5e8506a728d9c4d142,.rodata,build/e/src/game/unk_092E50.o
-3288d6c4e46d199aa581307312d196d9,.text,build/e/src/game/unk_09B7A0.o
-d41d8cd98f00b204e9800998ecf8427e,.code,build/e/src/game/unk_09B7A0.o
-d41d8cd98f00b204e9800998ecf8427e,.bss,build/e/src/game/unk_09B7A0.o
-d41d8cd98f00b204e9800998ecf8427e,.data,build/e/src/game/unk_09B7A0.o
-d41d8cd98f00b204e9800998ecf8427e,.rodata,build/e/src/game/unk_09B7A0.o
+3288d6c4e46d199aa581307312d196d9,.text,build/e/src/game/vtxstore.o
+d41d8cd98f00b204e9800998ecf8427e,.code,build/e/src/game/vtxstore.o
+d41d8cd98f00b204e9800998ecf8427e,.bss,build/e/src/game/vtxstore.o
+d41d8cd98f00b204e9800998ecf8427e,.data,build/e/src/game/vtxstore.o
+d41d8cd98f00b204e9800998ecf8427e,.rodata,build/e/src/game/vtxstore.o
 8729ba49ddeb23c78aea1637f63dc141,.text,build/e/src/game/explosion.o
 d41d8cd98f00b204e9800998ecf8427e,.code,build/e/src/game/explosion.o
 d41d8cd98f00b204e9800998ecf8427e,.bss,build/e/src/game/explosion.o

scripts/ge007.j-test_basis.csv

@@ -768,16 +768,16 @@ d41d8cd98f00b204e9800998ecf8427e,.code,build/j/src/game/rle.o
 d41d8cd98f00b204e9800998ecf8427e,.bss,build/j/src/game/rle.o
 d41d8cd98f00b204e9800998ecf8427e,.data,build/j/src/game/rle.o
 d41d8cd98f00b204e9800998ecf8427e,.rodata,build/j/src/game/rle.o
-e8b537a19dbef522cab0d218d9e0cd28,.text,build/j/src/game/unk_01B240.o
-d41d8cd98f00b204e9800998ecf8427e,.code,build/j/src/game/unk_01B240.o
-d41d8cd98f00b204e9800998ecf8427e,.bss,build/j/src/game/unk_01B240.o
-2e036a1e94af4dca08dbda3ca29bb9f1,.data,build/j/src/game/unk_01B240.o
-c1c2bef3d9452a0f148d8613ed14b3f1,.rodata,build/j/src/game/unk_01B240.o
-9dd182e36f7cdfc30e37c9479de46c22,.text,build/j/src/game/unk_01BAE0.o
-d41d8cd98f00b204e9800998ecf8427e,.code,build/j/src/game/unk_01BAE0.o
-d41d8cd98f00b204e9800998ecf8427e,.bss,build/j/src/game/unk_01BAE0.o
-d41d8cd98f00b204e9800998ecf8427e,.data,build/j/src/game/unk_01BAE0.o
-334b90953c5606d68014564e5eda0c1b,.rodata,build/j/src/game/unk_01BAE0.o
+e8b537a19dbef522cab0d218d9e0cd28,.text,build/j/src/game/title2.o
+d41d8cd98f00b204e9800998ecf8427e,.code,build/j/src/game/title2.o
+d41d8cd98f00b204e9800998ecf8427e,.bss,build/j/src/game/title2.o
+2e036a1e94af4dca08dbda3ca29bb9f1,.data,build/j/src/game/title2.o
+c1c2bef3d9452a0f148d8613ed14b3f1,.rodata,build/j/src/game/title2.o
+9dd182e36f7cdfc30e37c9479de46c22,.text,build/j/src/game/title3.o
+d41d8cd98f00b204e9800998ecf8427e,.code,build/j/src/game/title3.o
+d41d8cd98f00b204e9800998ecf8427e,.bss,build/j/src/game/title3.o
+d41d8cd98f00b204e9800998ecf8427e,.data,build/j/src/game/title3.o
+334b90953c5606d68014564e5eda0c1b,.rodata,build/j/src/game/title3.o
 155f1fa47776a23483dca05a6d9d83c2,.text,build/j/src/game/bondhead.o
 d41d8cd98f00b204e9800998ecf8427e,.code,build/j/src/game/bondhead.o
 d41d8cd98f00b204e9800998ecf8427e,.bss,build/j/src/game/bondhead.o
@@ -798,11 +798,11 @@ d41d8cd98f00b204e9800998ecf8427e,.code,build/j/src/game/unk_092E50.o
 d41d8cd98f00b204e9800998ecf8427e,.bss,build/j/src/game/unk_092E50.o
 a64d97ec0061b70dcbcebed4ae05d125,.data,build/j/src/game/unk_092E50.o
 f1dbcb1438dbbb5e8506a728d9c4d142,.rodata,build/j/src/game/unk_092E50.o
-3288d6c4e46d199aa581307312d196d9,.text,build/j/src/game/unk_09B7A0.o
-d41d8cd98f00b204e9800998ecf8427e,.code,build/j/src/game/unk_09B7A0.o
-d41d8cd98f00b204e9800998ecf8427e,.bss,build/j/src/game/unk_09B7A0.o
-d41d8cd98f00b204e9800998ecf8427e,.data,build/j/src/game/unk_09B7A0.o
-d41d8cd98f00b204e9800998ecf8427e,.rodata,build/j/src/game/unk_09B7A0.o
+3288d6c4e46d199aa581307312d196d9,.text,build/j/src/game/vtxstore.o
+d41d8cd98f00b204e9800998ecf8427e,.code,build/j/src/game/vtxstore.o
+d41d8cd98f00b204e9800998ecf8427e,.bss,build/j/src/game/vtxstore.o
+d41d8cd98f00b204e9800998ecf8427e,.data,build/j/src/game/vtxstore.o
+d41d8cd98f00b204e9800998ecf8427e,.rodata,build/j/src/game/vtxstore.o
 8729ba49ddeb23c78aea1637f63dc141,.text,build/j/src/game/explosion.o
 d41d8cd98f00b204e9800998ecf8427e,.code,build/j/src/game/explosion.o
 d41d8cd98f00b204e9800998ecf8427e,.bss,build/j/src/game/explosion.o

scripts/make/build_hashtable.sh

@@ -2,6 +2,7 @@
 
 COUNTRY_CODE=""
 OUTFILE=""
+ARG_VERSION=""
 
 usage() {
     echo "$0 usage:"
@@ -11,168 +12,97 @@ usage() {
     echo "    -o        output filename. Optional. Defaults to full_hashtable_{version}.csv"
     echo "    -v        version. Supported options are: US,u, JP,j, EU,e"
     echo ""
-    exit 0;
+    exit 0
 }
 
 [ $# -eq 0 ] && usage
-while getopts "o:hv:" arg; do
-  case $arg in
-    v) # version
-        if [ "${OPTARG,,}" = "us" ]; then
-            COUNTRY_CODE="u"
-        elif [ "${OPTARG,,}" = "u" ]; then
-            COUNTRY_CODE="u"
-        elif [ "${OPTARG,,}" = "jp" ]; then
-            COUNTRY_CODE="j"
-        elif [ "${OPTARG,,}" = "j" ]; then
-            COUNTRY_CODE="j"
-        elif [ "${OPTARG,,}" = "eu" ]; then
-            COUNTRY_CODE="e"
-        elif [ "${OPTARG,,}" = "e" ]; then
-            COUNTRY_CODE="e"
-        fi
 
-        ARG_VERSION="${OPTARG}"
-      ;;
-    o) # out file
-        OUTFILE="${OPTARG}"
-      ;;
-    h | *) # Display help.
-      usage
-      exit 0
-      ;;
-  esac
+while getopts "o:hv:" arg; do
+    case $arg in
+        v)
+            case "${OPTARG,,}" in
+                us | u)
+                    COUNTRY_CODE="u"
+                    ;;
+                jp | j)
+                    COUNTRY_CODE="j"
+                    ;;
+                eu | e)
+                    COUNTRY_CODE="e"
+                    ;;
+                *)
+                    echo "Unsupported version: ${OPTARG}"
+                    usage
+                    ;;
+            esac
+
+            ARG_VERSION="${OPTARG}"
+            ;;
+        o)
+            OUTFILE="${OPTARG}"
+            ;;
+        h | *)
+            usage
+            ;;
+    esac
 done
 
+if [ -z "${COUNTRY_CODE}" ]; then
+    echo "No valid version provided."
+    usage
+fi
+
 if ! command -v "mips-linux-gnu-objcopy" &> /dev/null
 then
     echo "command mips-linux-gnu-objcopy not found"
     exit 1
 fi
 
-if [ "${OUTFILE}" = "" ] ; then
-    OUTFILE="full_hashtable_${version}.csv"
+    if ! command -v "md5sum" &> /dev/null
+then
+    echo "command md5sum not found"
+    exit 1
 fi
 
-TMP=$(mktemp /tmp/ge_test_files.XXXXXX)
+if [ -z "${OUTFILE}" ] ; then
+    OUTFILE="full_hashtable_${ARG_VERSION}.csv"
+fi
+
+TMP=$(mktemp /tmp/ge_test_files.XXXXXX) || { echo "Failed to create temp file"; exit 1; }
+trap 'rm -f "${TMP}"' EXIT
 
 rm -f "${OUTFILE}"
-
 touch "${OUTFILE}"
 
-# output format is simple csv, one entry per line
-# 32 character md5, name of section extracted from ELF binary, and path to file relative from repo root (where this script is)
-#
-# escaped csv, quotes or commas in filenames are not supported.
+SECTIONS=( ".text" ".code" ".bss" ".data" ".rodata" )
 
-for FILE in build/${COUNTRY_CODE}/src/*.o
+# Search roots: build country tree and repository root assets folder
+SEARCH_ROOTS=( "build/${COUNTRY_CODE}" )
+
+for ROOT in "${SEARCH_ROOTS[@]}"
 do
-    echo "adding ${FILE}"
+    if [ -d "${ROOT}" ]; then
+        # find all object files under this root, but skip build/${COUNTRY_CODE}/assets/images/*
+        find "${ROOT}" -type f -name '*.o' ! -path "*/assets/images/*" -print0 | while IFS= read -r -d '' FILE
+        do
+            echo "adding ${FILE}"
+            for SEC in "${SECTIONS[@]}"
+            do
+                # Extract section to TMP; suppress objcopy stderr (section may be missing)
+                mips-linux-gnu-objcopy -j "${SEC}" -O binary "${FILE}" "${TMP}" 2>/dev/null || true
 
-    mips-linux-gnu-objcopy -j .text -O binary "${FILE}" "${TMP}"
-    printf "%s,.text,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
+                # If TMP has content, compute md5 and append to OUTFILE
+                if [ -s "${TMP}" ]; then
+                    MD5=$(md5sum -b "${TMP}" | cut -c -32)
+                    printf "%s,%s,%s\n" "${MD5}" "${SEC}" "${FILE}" >> "${OUTFILE}"
+                fi
 
-    mips-linux-gnu-objcopy -j .code -O binary "${FILE}" "${TMP}"
-    printf "%s,.code,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .bss -O binary "${FILE}" "${TMP}"
-    printf "%s,.bss,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .data -O binary "${FILE}" "${TMP}"
-    printf "%s,.data,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .rodata -O binary "${FILE}" "${TMP}"
-    printf "%s,.rodata,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
+                # Clear TMP for next section
+                : > "${TMP}"
+            done
+        done
+    fi
 done
 
-for FILE in build/${COUNTRY_CODE}/src/game/*.o
-do
-    echo "adding ${FILE}"
-
-    mips-linux-gnu-objcopy -j .text -O binary "${FILE}" "${TMP}"
-    printf "%s,.text,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .code -O binary "${FILE}" "${TMP}"
-    printf "%s,.code,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .bss -O binary "${FILE}" "${TMP}"
-    printf "%s,.bss,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .data -O binary "${FILE}" "${TMP}"
-    printf "%s,.data,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .rodata -O binary "${FILE}" "${TMP}"
-    printf "%s,.rodata,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-done
-
-for FILE in build/${COUNTRY_CODE}/assets/obseg/bg/*.o
-do
-    echo "adding ${FILE}"
-
-    mips-linux-gnu-objcopy -j .bss -O binary "${FILE}" "${TMP}"
-    printf "%s,.bss,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .data -O binary "${FILE}" "${TMP}"
-    printf "%s,.data,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .rodata -O binary "${FILE}" "${TMP}"
-    printf "%s,.rodata,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-done
-
-for FILE in build/${COUNTRY_CODE}/assets/obseg/brief/*.o
-do
-    echo "adding ${FILE}"
-
-    mips-linux-gnu-objcopy -j .bss -O binary "${FILE}" "${TMP}"
-    printf "%s,.bss,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .data -O binary "${FILE}" "${TMP}"
-    printf "%s,.data,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .rodata -O binary "${FILE}" "${TMP}"
-    printf "%s,.rodata,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-done
-
-for FILE in build/${COUNTRY_CODE}/assets/obseg/setup/*.o
-do
-    echo "adding ${FILE}"
-
-    mips-linux-gnu-objcopy -j .bss -O binary "${FILE}" "${TMP}"
-    printf "%s,.bss,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .data -O binary "${FILE}" "${TMP}"
-    printf "%s,.data,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .rodata -O binary "${FILE}" "${TMP}"
-    printf "%s,.rodata,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-done
-
-for FILE in build/${COUNTRY_CODE}/assets/obseg/stan/*.o
-do
-    echo "adding ${FILE}"
-
-    mips-linux-gnu-objcopy -j .bss -O binary "${FILE}" "${TMP}"
-    printf "%s,.bss,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .data -O binary "${FILE}" "${TMP}"
-    printf "%s,.data,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .rodata -O binary "${FILE}" "${TMP}"
-    printf "%s,.rodata,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-done
-
-for FILE in build/${COUNTRY_CODE}/assets/obseg/text/*.o
-do
-    echo "adding ${FILE}"
-
-    mips-linux-gnu-objcopy -j .bss -O binary "${FILE}" "${TMP}"
-    printf "%s,.bss,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .data -O binary "${FILE}" "${TMP}"
-    printf "%s,.data,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-
-    mips-linux-gnu-objcopy -j .rodata -O binary "${FILE}" "${TMP}"
-    printf "%s,.rodata,%s\n" $(md5sum -b "${TMP}" | cut -c -32) "${FILE}" >> "${OUTFILE}"
-done
-
-rm -f "${TMP}"
+# TMP is removed by trap on exit
+exit 0

scripts/test_files.sh

@@ -66,8 +66,9 @@ do
         mips-linux-gnu-objcopy -j "${SECTION}" -O binary "${FILE}" "${TMP}"
         ACTUAL=$(md5sum -b "${TMP}" | cut -c -32 | tr '[:upper:]' '[:lower:]')
         EXPECTED=$(echo "${MD5}" | tr '[:upper:]' '[:lower:]')
-        FILENAME=$(echo $FILE | sed -E -e 's/build\/[uje]\/src\//src\//g;');
-        VERSION=$(echo $FILE | sed -E -e 's/build\/([uje])\/.*/\1/g;');
+        # derive VERSION (u/j/e) and relative path inside build/<version>/
+        VERSION=$(echo "${FILE}" | sed -E -e 's|build/([uje])(/.*)|\1|')
+        FILENAME=$(echo "${FILE}" | sed -E -e 's|build/[uje]/(.*)|\1|')
 
         if [ "${ACTUAL}" != "${EXPECTED}" ] ; then
             #if [ "${SECTION}" == ".data" ] || [ "${SECTION}" == ".rodata" ] ; then