update

.github/workflows/EU.yml

@@ -18,7 +18,7 @@ on:
 jobs:
   buildeu:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/JPN.yml

@@ -18,7 +18,7 @@ on:
 jobs:
   buildjp:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2
@@ -64,7 +64,7 @@ jobs:
 
       - name: Upload output files
 
-        uses: dmnemec/copy_file_to_another_repo_action@main
+        uses: dmnemec/copy_file_to_another_repo_action@v1.0.4
 
         env:
           API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
@@ -75,6 +75,7 @@ jobs:
           destination_repo: 'kholdfuzion/goldeneyestatus'
           user_email: $API_TOKEN_EMAIL
           user_name: $API_TOKEN_USER
-          source_file: 'tools/report/JPN.htm'
+          source_file: |
+            tools/report/JPN.htm
       
 #need way of telling report that JP passed/failed

.github/workflows/main.yml

@@ -34,7 +34,7 @@ jobs:
    
   buildus:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -28,7 +28,7 @@ assets/jfont_dl.bin
 assets/font_chardataj.bin
 assets/font_chardatae.bin
 assets/ge007.u.29D160.Globalimagetable.bin
-assets/Globalimagetable_commandblock.bin
+assets/rarewarelogo.bin
 assets/ge007.u.2A4D50.usedby7F008DE4.bin
 assets/ge007.u.117880.jfont_dl.bin
 assets/ge007.u.117940.jfont_chardata.bin
@@ -93,3 +93,17 @@ uld_c.c
 umerge_c.c
 uopt_c.c
 usplit_c.c
+
+#exclude local user scripts in root folder
+/my_*.sh
+assets/obseg/em/data/alien8.seg
+assets/obseg/em/data/atic.seg
+assets/obseg/em/data/cookie.seg
+assets/obseg/em/data/gunfright.seg
+assets/obseg/em/data/jetman.seg
+assets/obseg/em/data/jetpac.seg
+assets/obseg/em/data/knightlore.seg
+assets/obseg/em/data/pssst.seg
+assets/obseg/em/data/sabre.seg
+assets/obseg/em/data/spec_rom.seg
+assets/obseg/em/data/under.seg

Makefile

@@ -8,7 +8,7 @@ default: colour
 FINAL := YES
 VERSION := US
 IDO_RECOMP := YES
-VERBOSE := 0
+VERBOSE := 2
 # If COMPARE is 1, check the output sha1sum when building 'all', and if fail to match
 # then compare ELF sections to known md5 checksums.
 # If compare is 2, it will just compare the sha1sum.
@@ -298,7 +298,7 @@ GAMEOBJECTS := $(foreach file,$(GAMEFILES_S),$(BUILD_DIR)/$(file:.s=.o)) \
 				$(foreach file,$(GAMEFILES_C),$(BUILD_DIR)/$(file:.c=.o))
 
 
-ASSET_DATAFILES := assets/GlobalImageTable.c assets/animationtable_data.c assets/animationtable_entries.c assets/font_dl.c assets/font_chardataj.c assets/font_chardatae.c assets/Globalimagetable_commandblock.c
+ASSET_DATAFILES := assets/GlobalImageTable.c assets/animationtable_data.c assets/animationtable_entries.c assets/font_dl.c assets/font_chardataj.c assets/font_chardatae.c assets/rarewarelogo.c
 ASSET_DATAOBJECTS := $(foreach file,$(ASSET_DATAFILES),$(BUILD_DIR)/$(file:.c=.o))
 
 ROMFILES2 := assets/romfiles2.s
@@ -447,21 +447,16 @@ $(BUILD_DIR)/assets/images/split/%.o: assets/images/split/%.bin pb5
 $(BUILD_DIR)/$(OBSEGMENT): $(OBSEG_RZ) $(IMAGE_OBJS) pb6
 	$(call PRINT_STATUS,Compressing6:,$<,$@)
 
-#Build C files in root/
-$(BUILD_DIR)/%.o: src/%.c pb7
-	$(call PRINT_STATUS,Compiling7:,$<,$@)
-	$(ASM_PREPROC) $(OPTIMIZATION) $< | $(CC) -c $(CFLAGS) tools/asmpreproc/include-stdin.c -o $@ $(OPTIMIZATION)
-	$(ASM_PREPROC) $(OPTIMIZATION) $< --post-process $@ --assembler "$(AS) $(ASFLAGS)" --asm-prelude tools/asmpreproc/prelude.s
-
 
 #Build C files in src/
-$(BUILD_DIR)/src/%.o: src/%.c pb8
+$(BUILD_DIR)/src/%.o: src/%.c 
 	$(call PRINT_STATUS,Compiling8:,$<,$@)
-    # convert AI_PRINT commands from readable to byte-array
-    #	echo $<
-    #	echo filter =  $(filter-out %chraidata.c,$<)
-    # for some reason, normal ifeq doesnt work, so has to be single line...
-	$(if $(filter %chraidata.c,$<), $(ConvertAIPRINT) $< | $(CC) -c $(CFLAGS) tools/asmpreproc/include-stdin.c -o $@ $(OPTIMIZATION), $(ASM_PREPROC) $(OPTIMIZATION) $< | $(CC) -c $(CFLAGS) tools/asmpreproc/include-stdin.c -o $@ $(OPTIMIZATION); $(ASM_PREPROC) $(OPTIMIZATION) $< --post-process $@ --assembler "$(AS) $(ASFLAGS)" --asm-prelude tools/asmpreproc/prelude.s)
+	@if grep -q 'GLOBAL_ASM(' $<; then \
+		$(ASM_PREPROC) $(OPTIMIZATION) $< | $(CC) -c $(CFLAGS) tools/asmpreproc/include-stdin.c -o $@ $(OPTIMIZATION); \
+		$(ASM_PREPROC) $(OPTIMIZATION) $< --post-process $@ --assembler "$(AS) $(ASFLAGS)" --asm-prelude tools/asmpreproc/prelude.s; \
+	else \
+		$(CC) -c $(CFLAGS) -o $@ $(OPTIMIZATION) $<; \
+	fi
 
 
 #Build RamRom
@@ -490,8 +485,7 @@ $(BUILD_DIR)/assets/%.o: assets/%.c pb4
 ifeq ($(filter-out %setup%,$<),)
 	$(ConvertAIPRINT) $< | $(CC) -c $(CFLAGS) tools/asmpreproc/include-stdin.c -o $@ $(OPTIMIZATION) 
 else
-	$(ASM_PREPROC) $(OPTIMIZATION) $< | $(CC) -c $(CFLAGS) tools/asmpreproc/include-stdin.c -o $@ $(OPTIMIZATION)
-	$(ASM_PREPROC) $(OPTIMIZATION) $< --post-process $@ --assembler "$(AS) $(ASFLAGS)" --asm-prelude tools/asmpreproc/prelude.s
+	$(CC) -c $(CFLAGS) -o $@ $(OPTIMIZATION) $<
 endif
 
 #$(BUILD_DIR)/src/random.o: OPTIMIZATION := -O3
@@ -744,8 +738,8 @@ testPB:
 	$(call IncrementProgressBarFromAtRate,0,0.125)
 
 textures:
-	for file in assets/images/split/*.bin; do ../../tools/mktex/build/tex2png $file .assets/images/out; done
-
+	$(foreach x,$(IMAGE_BINS),tools/mktex/build/tex2png $(x) assets/images/out ${\n})
+	
 colour:
 	@echo "\033[3A"
   ifeq ($(VERBOSE),0)