PAL/NTSC display moved back to BASIC, reuses string compression
This commit is contained in:
1 parent
92fd4552c4
commit
20ce3b5405
12 files changed
+27
-68
No files matched your search
@@ -313,16 +313,10 @@ Richer banners need more BASIC segment, varies between brands.
|
|||||||
|
|
||||||
### `CONFIG_SHOW_FEATURES`
|
### `CONFIG_SHOW_FEATURES`
|
||||||
|
|
||||||
If enabled, shows the most important compiled-in features on the startup screen.
|
If enabled, shows the most important compiled-in features on the startup screen. Also shows the video system (PAL/NTSC).
|
||||||
|
|
||||||
It is recommended to keep it enabled for informational purposes.
|
It is recommended to keep it enabled for informational purposes.
|
||||||
|
|
||||||
### `CONFIG_BANNER_PAL_NTSC`
|
|
||||||
|
|
||||||
If enabled, prints video system on startup banner. Eye candy only.
|
|
||||||
|
|
||||||
Feature needs few bytes in BASIC and about 25 bytes in KERNAL segment.
|
|
||||||
|
|
||||||
## Debug options
|
## Debug options
|
||||||
|
|
||||||
Options in this section are for debug purposes only. If unsure - disable.
|
Options in this section are for debug purposes only. If unsure - disable.
|
||||||
|
|||||||
@@ -128,7 +128,6 @@
|
|||||||
#define CONFIG_BANNER_FANCY
|
#define CONFIG_BANNER_FANCY
|
||||||
// #define CONFIG_BANNER_BRAND
|
// #define CONFIG_BANNER_BRAND
|
||||||
// #define CONFIG_SHOW_FEATURES
|
// #define CONFIG_SHOW_FEATURES
|
||||||
// #define CONFIG_SHOW_PAL_NTSC
|
|
||||||
|
|
||||||
|
|
||||||
// Debug options
|
// Debug options
|
||||||
|
|||||||
@@ -126,7 +126,6 @@
|
|||||||
#define CONFIG_BANNER_FANCY
|
#define CONFIG_BANNER_FANCY
|
||||||
// #define CONFIG_BANNER_BRAND
|
// #define CONFIG_BANNER_BRAND
|
||||||
#define CONFIG_SHOW_FEATURES
|
#define CONFIG_SHOW_FEATURES
|
||||||
#define CONFIG_SHOW_PAL_NTSC
|
|
||||||
|
|
||||||
|
|
||||||
// Debug options
|
// Debug options
|
||||||
|
|||||||
@@ -126,7 +126,6 @@
|
|||||||
// #define CONFIG_BANNER_FANCY
|
// #define CONFIG_BANNER_FANCY
|
||||||
#define CONFIG_BANNER_BRAND
|
#define CONFIG_BANNER_BRAND
|
||||||
// #define CONFIG_SHOW_FEATURES
|
// #define CONFIG_SHOW_FEATURES
|
||||||
// #define CONFIG_SHOW_PAL_NTSC
|
|
||||||
|
|
||||||
|
|
||||||
// Debug options
|
// Debug options
|
||||||
|
|||||||
@@ -126,7 +126,6 @@
|
|||||||
// #define CONFIG_BANNER_FANCY
|
// #define CONFIG_BANNER_FANCY
|
||||||
// #define CONFIG_BANNER_BRAND
|
// #define CONFIG_BANNER_BRAND
|
||||||
#define CONFIG_SHOW_FEATURES
|
#define CONFIG_SHOW_FEATURES
|
||||||
#define CONFIG_SHOW_PAL_NTSC
|
|
||||||
|
|
||||||
|
|
||||||
// Debug options
|
// Debug options
|
||||||
|
|||||||
@@ -126,7 +126,6 @@
|
|||||||
#define CONFIG_BANNER_FANCY
|
#define CONFIG_BANNER_FANCY
|
||||||
// #define CONFIG_BANNER_BRAND
|
// #define CONFIG_BANNER_BRAND
|
||||||
#define CONFIG_SHOW_FEATURES
|
#define CONFIG_SHOW_FEATURES
|
||||||
#define CONFIG_SHOW_PAL_NTSC
|
|
||||||
|
|
||||||
|
|
||||||
// Debug options
|
// Debug options
|
||||||
|
|||||||
@@ -47,10 +47,6 @@
|
|||||||
.label print_features = KERNAL().print_features
|
.label print_features = KERNAL().print_features
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CONFIG_SHOW_PAL_NTSC
|
|
||||||
.label print_pal_ntsc = KERNAL().print_pal_ntsc
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if CONFIG_TAPE_HEAD_ALIGN
|
#if CONFIG_TAPE_HEAD_ALIGN
|
||||||
.label tape_head_align = KERNAL().tape_head_align
|
.label tape_head_align = KERNAL().tape_head_align
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ initmsg_real:
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Clear the screen first, some cartridges (like IEEE-488) leeave a mess on the screen
|
// Clear the screen first, some cartridges (like IEEE-488) are leaving a mess on the screen
|
||||||
lda #147
|
lda #147
|
||||||
jsr JCHROUT
|
jsr JCHROUT
|
||||||
|
|
||||||
@@ -55,16 +55,10 @@ initmsg_real:
|
|||||||
ldx #$05
|
ldx #$05
|
||||||
#endif
|
#endif
|
||||||
ldy #$00
|
ldy #$00
|
||||||
#if CONFIG_SHOW_PAL_NTSC && CONFIG_SHOW_FEATURES
|
#if CONFIG_SHOW_FEATURES
|
||||||
jsr plot_set
|
jsr plot_set
|
||||||
jsr print_features
|
jsr print_features
|
||||||
jmp print_pal_ntsc
|
jmp print_pal_ntsc
|
||||||
#elif CONFIG_SHOW_PAL_NTSC
|
|
||||||
jsr plot_set
|
|
||||||
jmp print_pal_ntsc
|
|
||||||
#elif CONFIG_SHOW_FEATURES
|
|
||||||
jsr plot_set
|
|
||||||
jmp print_features
|
|
||||||
#else
|
#else
|
||||||
jmp plot_set
|
jmp plot_set
|
||||||
#endif
|
#endif
|
||||||
@@ -115,16 +109,10 @@ initmsg_real:
|
|||||||
ldx #$05
|
ldx #$05
|
||||||
#endif
|
#endif
|
||||||
ldy #$00
|
ldy #$00
|
||||||
#if CONFIG_SHOW_PAL_NTSC && CONFIG_SHOW_FEATURES
|
#if CONFIG_SHOW_FEATURES
|
||||||
jsr plot_set
|
jsr plot_set
|
||||||
jsr print_features
|
jsr print_features
|
||||||
jmp print_pal_ntsc
|
jmp print_pal_ntsc
|
||||||
#elif CONFIG_SHOW_PAL_NTSC
|
|
||||||
jsr plot_set
|
|
||||||
jmp print_pal_ntsc
|
|
||||||
#elif CONFIG_SHOW_FEATURES
|
|
||||||
jsr plot_set
|
|
||||||
jmp print_features
|
|
||||||
#else
|
#else
|
||||||
jmp plot_set
|
jmp plot_set
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
// #LAYOUT# STD * #TAKE
|
||||||
|
// #LAYOUT# M65 BASIC_1 #TAKE
|
||||||
|
// #LAYOUT# X16 BASIC_0 #TAKE
|
||||||
|
// #LAYOUT# * * #IGNORE
|
||||||
|
|
||||||
|
//
|
||||||
|
// Print video system on startup banner
|
||||||
|
//
|
||||||
|
|
||||||
|
#if CONFIG_SHOW_FEATURES
|
||||||
|
|
||||||
|
print_pal_ntsc:
|
||||||
|
|
||||||
|
ldx #IDX__STR_NTSC
|
||||||
|
lda TVSFLG
|
||||||
|
beq !+
|
||||||
|
ldx #IDX__STR_PAL
|
||||||
|
!:
|
||||||
|
jmp print_packed_misc_str
|
||||||
|
|
||||||
|
#endif // CONFIG_SHOW_FEATURES
|
||||||
@@ -26,11 +26,6 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CONFIG_SHOW_PAL_NTSC
|
|
||||||
.label __MSG_KERNAL_PAL = __msg_kernalpal - __msg_kernal_first
|
|
||||||
.label __MSG_KERNAL_NTSC = __msg_kernalntsc - __msg_kernal_first
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if CONFIG_PANIC_SCREEN
|
#if CONFIG_PANIC_SCREEN
|
||||||
.label __MSG_KERNAL_PANIC = __msg_kernalpanic - __msg_kernal_first
|
.label __MSG_KERNAL_PANIC = __msg_kernalpanic - __msg_kernal_first
|
||||||
.label __MSG_KERNAL_PANIC_ROM_MISMATCH = __msg_kernalpanic_rom_mismatch - __msg_kernal_first
|
.label __MSG_KERNAL_PANIC_ROM_MISMATCH = __msg_kernalpanic_rom_mismatch - __msg_kernal_first
|
||||||
@@ -93,18 +88,6 @@ __msg_kernaloksearching:
|
|||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if CONFIG_SHOW_PAL_NTSC
|
|
||||||
|
|
||||||
__msg_kernalpal:
|
|
||||||
.text "PAL"
|
|
||||||
.byte $80 + $0D // end of string mark + return
|
|
||||||
|
|
||||||
__msg_kernalntsc:
|
|
||||||
.text "NTSC"
|
|
||||||
.byte $80 + $0D // end of string mark + return
|
|
||||||
|
|
||||||
#endif // CONFIG_SHOW_PAL_NTSC
|
|
||||||
|
|
||||||
#if CONFIG_PANIC_SCREEN
|
#if CONFIG_PANIC_SCREEN
|
||||||
|
|
||||||
__msg_kernalpanic:
|
__msg_kernalpanic:
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
// #LAYOUT# STD * #TAKE
|
|
||||||
// #LAYOUT# * KERNAL_0 #TAKE
|
|
||||||
// #LAYOUT# * * #IGNORE
|
|
||||||
|
|
||||||
//
|
|
||||||
// Print video system on startup banner
|
|
||||||
//
|
|
||||||
|
|
||||||
#if CONFIG_SHOW_PAL_NTSC
|
|
||||||
|
|
||||||
print_pal_ntsc:
|
|
||||||
|
|
||||||
ldx #__MSG_KERNAL_NTSC
|
|
||||||
lda TVSFLG
|
|
||||||
beq !+
|
|
||||||
ldx #__MSG_KERNAL_PAL
|
|
||||||
!:
|
|
||||||
jmp print_kernal_message
|
|
||||||
|
|
||||||
#endif // CONFIG_SHOW_PAL_NTSC
|
|
||||||
@@ -313,6 +313,8 @@ const StringEntryList GLOBAL_MiscStrings = { ListType::STRINGS_BASIC, "misc",
|
|||||||
{ true, true, true, "STR_ERROR", " ERROR" }, // simply the word error that is attached to the other parts of messages https://fjkraan.home.xs4all.nl/comp/apple2faq/app2asoftfaq.html
|
{ true, true, true, "STR_ERROR", " ERROR" }, // simply the word error that is attached to the other parts of messages https://fjkraan.home.xs4all.nl/comp/apple2faq/app2asoftfaq.html
|
||||||
{ true, true, true, "STR_IN", " IN " },
|
{ true, true, true, "STR_IN", " IN " },
|
||||||
// STD M65 X16 --- misc strings specific to OpenROMs, not present in CBM ROMs
|
// STD M65 X16 --- misc strings specific to OpenROMs, not present in CBM ROMs
|
||||||
|
{ true, true, true, "STR_PAL", "PAL\r" },
|
||||||
|
{ true, true, true, "STR_NTSC", "NTSC\r" },
|
||||||
{ true, true, true, "STR_BRK_AT", "\rBRK AT $" },
|
{ true, true, true, "STR_BRK_AT", "\rBRK AT $" },
|
||||||
} };
|
} };
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user