From 16a58951fc34eb6acb0314689af035cedbd35629 Mon Sep 17 00:00:00 2001 From: SimonM Date: Sun, 26 Jun 2016 21:32:21 +0100 Subject: [PATCH] Moved data files to data folder --- beebtrk.6502 | 14 +++++++------- Mode7 Font.url => data/Mode7 Font.url | 0 Mode7 Layout.url => data/Mode7 Layout.url | 0 Mode7 Loading.url => data/Mode7 Loading.url | 0 font_5x5.mode7 => data/font_5x5.mode7 | 0 .../font_5x5_shifted.mode7 | 0 .../font_5x5_shifted_trimmed.mode7.bin | 0 menu_overlay.mode7 => data/menu_overlay.mode7 | 0 .../menu_overlay_trimmed.mode7.bin | 0 screen2.mode7 => data/screen2.mode7 | 0 screen3.mode7 => data/screen3.mode7 | 0 11 files changed, 7 insertions(+), 7 deletions(-) rename Mode7 Font.url => data/Mode7 Font.url (100%) rename Mode7 Layout.url => data/Mode7 Layout.url (100%) rename Mode7 Loading.url => data/Mode7 Loading.url (100%) rename font_5x5.mode7 => data/font_5x5.mode7 (100%) rename font_5x5_shifted.mode7 => data/font_5x5_shifted.mode7 (100%) rename font_5x5_shifted_trimmed.mode7.bin => data/font_5x5_shifted_trimmed.mode7.bin (100%) rename menu_overlay.mode7 => data/menu_overlay.mode7 (100%) rename menu_overlay_trimmed.mode7.bin => data/menu_overlay_trimmed.mode7.bin (100%) rename screen2.mode7 => data/screen2.mode7 (100%) rename screen3.mode7 => data/screen3.mode7 (100%) diff --git a/beebtrk.6502 b/beebtrk.6502 index 51e18ec..f53b0f9 100644 --- a/beebtrk.6502 +++ b/beebtrk.6502 @@ -258,17 +258,17 @@ EQUS "Loading... ", 0 .mode7_data_start .mode7_screen_data -INCBIN "screen3.mode7" +INCBIN "data/screen3.mode7" MENU_original_src_addr = mode7_screen_data + MENU_overlay_ypos * MODE7_char_width .mode7_font_data ; we use 16/25 lines of this screen -INCBIN "font_5x5_shifted_trimmed.mode7.bin" +INCBIN "data/font_5x5_shifted_trimmed.mode7.bin" mode7_font_data_shifted = mode7_font_data + 8 * 40 .mode7_menu_data -INCBIN "menu_overlay_trimmed.mode7.bin" ; ditto, we only use ~8/25 lines of this screen +INCBIN "data/menu_overlay_trimmed.mode7.bin" ; ditto, we only use ~8/25 lines of this screen MENU_overlay_src_addr = mode7_menu_data ; stripped this off (+ MENU_overlay_ypos * MODE7_char_width) @@ -334,8 +334,8 @@ PUTFILE "volume1/insurmountable.raw.exo", "insur", 0 PUTFILE "volume1/MISSION76496.raw.exo", "mission", 0 IF _DEBUG ; only needed for debug purposes -PUTFILE "screen3.mode7", "screen", &7C00 -PUTFILE "font_5x5.mode7", "font", &7C00 -PUTFILE "font_5x5_shifted.mode7", "font2", &7C00 -PUTFILE "menu_overlay.mode7", "menu", &7C00 +PUTFILE "data/screen3.mode7", "screen", &7C00 +PUTFILE "data/font_5x5.mode7", "font", &7C00 +PUTFILE "data/font_5x5_shifted.mode7", "font2", &7C00 +PUTFILE "data/menu_overlay.mode7", "menu", &7C00 ENDIF \ No newline at end of file diff --git a/Mode7 Font.url b/data/Mode7 Font.url similarity index 100% rename from Mode7 Font.url rename to data/Mode7 Font.url diff --git a/Mode7 Layout.url b/data/Mode7 Layout.url similarity index 100% rename from Mode7 Layout.url rename to data/Mode7 Layout.url diff --git a/Mode7 Loading.url b/data/Mode7 Loading.url similarity index 100% rename from Mode7 Loading.url rename to data/Mode7 Loading.url diff --git a/font_5x5.mode7 b/data/font_5x5.mode7 similarity index 100% rename from font_5x5.mode7 rename to data/font_5x5.mode7 diff --git a/font_5x5_shifted.mode7 b/data/font_5x5_shifted.mode7 similarity index 100% rename from font_5x5_shifted.mode7 rename to data/font_5x5_shifted.mode7 diff --git a/font_5x5_shifted_trimmed.mode7.bin b/data/font_5x5_shifted_trimmed.mode7.bin similarity index 100% rename from font_5x5_shifted_trimmed.mode7.bin rename to data/font_5x5_shifted_trimmed.mode7.bin diff --git a/menu_overlay.mode7 b/data/menu_overlay.mode7 similarity index 100% rename from menu_overlay.mode7 rename to data/menu_overlay.mode7 diff --git a/menu_overlay_trimmed.mode7.bin b/data/menu_overlay_trimmed.mode7.bin similarity index 100% rename from menu_overlay_trimmed.mode7.bin rename to data/menu_overlay_trimmed.mode7.bin diff --git a/screen2.mode7 b/data/screen2.mode7 similarity index 100% rename from screen2.mode7 rename to data/screen2.mode7 diff --git a/screen3.mode7 b/data/screen3.mode7 similarity index 100% rename from screen3.mode7 rename to data/screen3.mode7