Merge pull request #232 from idlechild/master

Combine preset data for efficiency

Author: idlechild

.github/workflows/main.yml

@@ -34,8 +34,10 @@ jobs:
     - name: Build practice hack patches
       run: |
         cp ./asar/asar-1.81/asar/asar-standalone ./tools/asar
+        chmod +x ./build_presets.sh
         chmod +x ./build.sh
         chmod +x ./build_PAL.sh
+        ./build_presets.sh
         ./build.sh
         ./build_PAL.sh
         mkdir ./web/public/patches

.github/workflows/pullrequest.yml

@@ -33,9 +33,11 @@ jobs:
     - name: Build practice hack patches
       run: |
         cp ./asar/asar-1.81/asar/asar-standalone ./tools/asar
+        chmod +x ./build_presets.sh
         chmod +x ./build_dev.sh
         chmod +x ./build.sh
         chmod +x ./build_PAL.sh
+        ./build_presets.sh
         ./build_dev.sh
         ./build.sh -DPRERELEASE=$(git rev-parse --short HEAD)
         ./build_PAL.sh -DPRERELEASE=$(git rev-parse --short HEAD)

Dockerfile

@@ -27,6 +27,7 @@ RUN mkdir -p /app/build \
 COPY build.sh /app/build.sh
 COPY build_dev.sh /app/build_dev.sh
 COPY build_PAL.sh /app/build_PAL.sh
+COPY build_presets.sh /app/build_presets.sh
 
 ARG now
 
@@ -44,6 +45,7 @@ COPY resources/ resources/
 RUN rm -rf src
 COPY src/ src/
 
+RUN ./build_presets.sh
 RUN ./build_dev.sh
 RUN ./build_PAL.sh
 RUN ./build.sh

build_presets.bat

@@ -0,0 +1,10 @@
+@echo off
+
+echo Building Combined Preset Data
+cd src\presets
+if exist combined_map_preset_data.asm del combined_map_preset_data.asm
+if exist combined_preset_data.asm del combined_preset_data.asm
+python combine_map_preset_data.py
+python combine_preset_data.py
+cd ..\..
+

build_presets.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+echo "Building Combined Preset Data"
+cd src/presets
+rm -f combined_map_preset_data.asm
+rm -f combined_preset_data.asm
+python3 combine_map_preset_data.py
+python3 combine_preset_data.py
+cd ../..
+

resources/cm_gfx.bin

@@ -92,7 +92,7 @@
    elif in_source_files:
       if new_file:
          new_file.write(row)
-      parts = re.split(" |\.|\/", row)
+      parts = re.split(" |\\.|\\/", row)
       if len(parts) > 3:
          named_source = parts[len(parts) - 2]
          if named_source in sources_dict.values():

resources/cm_gfx2.bin

@@ -55,10 +55,10 @@ brb_menu_timer_mode:
     db #$FF
 
 brb_menu_timer_min:
-    %cm_numfield("Minutes on Timer", !ram_cm_brb_mins, 0, 99, 1, 2, #0)
+    %cm_numfield_word("Minutes on Timer", !ram_cm_brb_mins, 0, 99, 1, 2, #0)
 
 brb_menu_timer_sec:
-    %cm_numfield("Seconds on Timer", !ram_cm_brb_secs, 0, 59, 1, 2, #0)
+    %cm_numfield_word("Seconds on Timer", !ram_cm_brb_secs, 0, 59, 1, 2, #0)
 
 brb_menu_timer_clear:
     %cm_jsl("Clear Timer", .routine, #0)
@@ -94,9 +94,12 @@ brb_menu_music_toggle:
     db #$FF
   .routine
     ; Clear music queue
-    STZ !MUSIC_QUEUE_TIMERS : STZ !MUSIC_QUEUE_TIMERS+$2 : STZ !MUSIC_QUEUE_TIMERS+$4 : STZ !MUSIC_QUEUE_TIMERS+$6
-    STZ !MUSIC_QUEUE_TIMERS+$8 : STZ !MUSIC_QUEUE_TIMERS+$A : STZ !MUSIC_QUEUE_TIMERS+$C : STZ !MUSIC_QUEUE_TIMERS+$E
-    STZ !MUSIC_QUEUE_NEXT : STZ !MUSIC_QUEUE_START : STZ !MUSIC_ENTRY : STZ !MUSIC_TIMER
+    STZ !MUSIC_QUEUE_TIMERS : STZ !MUSIC_QUEUE_TIMERS+$2
+    STZ !MUSIC_QUEUE_TIMERS+$4 : STZ !MUSIC_QUEUE_TIMERS+$6
+    STZ !MUSIC_QUEUE_TIMERS+$8 : STZ !MUSIC_QUEUE_TIMERS+$A
+    STZ !MUSIC_QUEUE_TIMERS+$C : STZ !MUSIC_QUEUE_TIMERS+$E
+    STZ !MUSIC_QUEUE_NEXT : STZ !MUSIC_QUEUE_START
+    STZ !MUSIC_ENTRY : STZ !MUSIC_TIMER
     CMP #$0001 : BEQ .resume_music
     STZ $2140
     RTL

resources/sort_debug_symbols.py

@@ -206,7 +206,9 @@ CrashViewer:
     %ai16()
     JSL crash_next_frame
     JSL crash_cgram_transfer
+    LDA $C1 : PHA : LDA $C3 : PHA
     JSL cm_transfer_custom_tileset
+    PLA : STA $C3 : PLA : STA $C1
 
     LDA #$0000 : STA !ram_crash_page : STA !ram_crash_palette : STA !ram_crash_cursor
     STA !ram_crash_input : STA !ram_crash_input_new