From 9d109df4cb9bcbc21553388ccdd0bbe08ece4c0c Mon Sep 17 00:00:00 2001 From: chrisly42 Date: Mon, 16 Sep 2024 21:21:33 +0200 Subject: [PATCH] Minor path fixes and removal of workaround now covered by -Z flag in vc.cfg. --- source/blend/blend.asm | 8 ++------ source/bulb/bulb.asm | 8 ++------ source/endpart/endpart.asm | 4 ++-- source/gotham/gotham.asm | 8 ++------ source/gouraud/gouraud.asm | 4 ++-- source/hexagon/hexagon.asm | 4 ++-- source/kaleidoscope/kaleidoscope.asm | 4 ++-- source/stham/stham.asm | 4 ++-- source/virgillbars/virgillbars.asm | 4 ++-- 9 files changed, 18 insertions(+), 30 deletions(-) diff --git a/source/blend/blend.asm b/source/blend/blend.asm index 8ab8cc4..a19d988 100644 --- a/source/blend/blend.asm +++ b/source/blend/blend.asm @@ -6,9 +6,9 @@ IFD FW_DEMO_PART IFD FW_HD_DEMO_PART - include "../hamazing/hdtrackmo_settings.i" + include "hdtrackmo_settings.i" ELSE - include "../hamazing/trackmo_settings.i" + include "trackmo_settings.i" ENDC ELSE FW_STANDALONE_FILE_MODE = 1 ; enable standalone (part testing) @@ -5678,10 +5678,6 @@ bln_greets_lines: dc.w 0 dc.w 0 - IFND FW_DEMO_PART - dc.w 1 ; avoid hunk shortening that leaves dirty memory on kick 1.3 - ENDC - ;******************************************************************** section "bln_copper",data,chip diff --git a/source/bulb/bulb.asm b/source/bulb/bulb.asm index faabf21..074e7a8 100644 --- a/source/bulb/bulb.asm +++ b/source/bulb/bulb.asm @@ -6,9 +6,9 @@ IFD FW_DEMO_PART IFD FW_HD_DEMO_PART - include "../hamazing/hdtrackmo_settings.i" + include "hdtrackmo_settings.i" ELSE - include "../hamazing/trackmo_settings.i" + include "trackmo_settings.i" ENDC ELSE FW_STANDALONE_FILE_MODE = 1 ; enable standalone (part testing) @@ -3543,10 +3543,6 @@ blb_paint_data: blb_textpaint_data: include "textpaint.asm" - IFND FW_DEMO_PART - dc.w 1 ; avoid hunk shortening that leaves dirty memory on kick 1.3 - ENDC - ;******************************************************************** ;-------------------------------------------------------------------- diff --git a/source/endpart/endpart.asm b/source/endpart/endpart.asm index c74651a..90786e4 100644 --- a/source/endpart/endpart.asm +++ b/source/endpart/endpart.asm @@ -5,9 +5,9 @@ IFD FW_DEMO_PART IFD FW_HD_DEMO_PART - include "../hamazing/hdtrackmo_settings.i" + include "hdtrackmo_settings.i" ELSE - include "../hamazing/trackmo_settings.i" + include "trackmo_settings.i" ENDC ELSE FW_STANDALONE_FILE_MODE = 1 ; enable standalone (part testing) diff --git a/source/gotham/gotham.asm b/source/gotham/gotham.asm index d7774db..7b3be40 100644 --- a/source/gotham/gotham.asm +++ b/source/gotham/gotham.asm @@ -2,9 +2,9 @@ IFD FW_DEMO_PART IFD FW_HD_DEMO_PART - include "../hamazing/hdtrackmo_settings.i" + include "hdtrackmo_settings.i" ELSE - include "../hamazing/trackmo_settings.i" + include "trackmo_settings.i" ENDC ELSE FW_STANDALONE_FILE_MODE = 1 ; enable standalone (part testing) @@ -908,10 +908,6 @@ gth_ham_line_m: TDPOINT 194,74 dc.w 0 - IFND FW_DEMO_PART - dc.w 1 ; avoid hunk shortening that leaves dirty memory on kick 1.3 - ENDC - ;******************************************************************** ;-------------------------------------------------------------------- diff --git a/source/gouraud/gouraud.asm b/source/gouraud/gouraud.asm index 939e918..c14a8fb 100755 --- a/source/gouraud/gouraud.asm +++ b/source/gouraud/gouraud.asm @@ -5,9 +5,9 @@ IFD FW_DEMO_PART IFD FW_HD_DEMO_PART - include "../hamazing/hdtrackmo_settings.i" + include "hdtrackmo_settings.i" ELSE - include "../hamazing/trackmo_settings.i" + include "trackmo_settings.i" ENDC ELSE FW_STANDALONE_FILE_MODE = 1 ; enable standalone (part testing) diff --git a/source/hexagon/hexagon.asm b/source/hexagon/hexagon.asm index 277a167..94ba541 100644 --- a/source/hexagon/hexagon.asm +++ b/source/hexagon/hexagon.asm @@ -2,9 +2,9 @@ IFD FW_DEMO_PART IFD FW_HD_DEMO_PART - include "../hamazing/hdtrackmo_settings.i" + include "hdtrackmo_settings.i" ELSE - include "../hamazing/trackmo_settings.i" + include "trackmo_settings.i" ENDC ELSE FW_STANDALONE_FILE_MODE = 1 ; enable standalone (part testing) diff --git a/source/kaleidoscope/kaleidoscope.asm b/source/kaleidoscope/kaleidoscope.asm index 1e7b09e..955c97e 100644 --- a/source/kaleidoscope/kaleidoscope.asm +++ b/source/kaleidoscope/kaleidoscope.asm @@ -7,9 +7,9 @@ IFD FW_DEMO_PART IFD FW_HD_DEMO_PART - include "../hamazing/hdtrackmo_settings.i" + include "hdtrackmo_settings.i" ELSE - include "../hamazing/trackmo_settings.i" + include "trackmo_settings.i" ENDC ELSE FW_STANDALONE_FILE_MODE = 1 ; enable standalone (part testing) diff --git a/source/stham/stham.asm b/source/stham/stham.asm index a492192..b22aad4 100644 --- a/source/stham/stham.asm +++ b/source/stham/stham.asm @@ -5,9 +5,9 @@ IFD FW_DEMO_PART IFD FW_HD_DEMO_PART - include "../hamazing/hdtrackmo_settings.i" + include "hdtrackmo_settings.i" ELSE - include "../hamazing/trackmo_settings.i" + include "trackmo_settings.i" ENDC ELSE FW_STANDALONE_FILE_MODE = 1 ; enable standalone (part testing) diff --git a/source/virgillbars/virgillbars.asm b/source/virgillbars/virgillbars.asm index e50b482..ec36c7a 100644 --- a/source/virgillbars/virgillbars.asm +++ b/source/virgillbars/virgillbars.asm @@ -5,9 +5,9 @@ IFD FW_DEMO_PART IFD FW_HD_DEMO_PART - include "../hamazing/hdtrackmo_settings.i" + include "hdtrackmo_settings.i" ELSE - include "../hamazing/trackmo_settings.i" + include "trackmo_settings.i" ENDC ELSE FW_STANDALONE_FILE_MODE = 1 ; enable standalone (part testing)