From 4a2470b1c421b95b79f162efa05081497a5d8499 Mon Sep 17 00:00:00 2001 From: Pecusx Date: Thu, 17 Apr 2025 12:14:33 +0200 Subject: [PATCH] PAL->NTSC speed correction --- lumber.asm | 21 ++++++++++++++++++--- lumber.xex | Bin 25871 -> 25897 bytes 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lumber.asm b/lumber.asm index e42e8b0..cb61483 100644 --- a/lumber.asm +++ b/lumber.asm @@ -26,6 +26,7 @@ display = $a000 .zpvar temp2 .word .zpvar tempbyte .byte .zpvar SyncByte .byte + .zpvar NTSCCounter .byte .zpvar StateFlag .byte ; 0 - game, 1 - start screen, 2 game over screen, etc. .zpvar PowerValue .byte ; power: 0 - 48 .zpvar PowerTimer .byte @@ -172,7 +173,7 @@ c_greyRIP = 18 ;-------------------------------------------------- vdli IngameDLI1 - + ; over horizon ; PMG horizontal coordinates and sizes txa @@ -279,6 +280,19 @@ cloud3_fly no_new_cloud3 no_clouds_change + + ; NTSC speed correction + lda PAL + and #%00001110 + beq is_PAL + inc NTSCCounter + lda NTSCCounter + cmp #6 + bne is_PAL + mva #0 NTSCCounter + jmp VBI_end +is_PAL + lda StateFlag cmp #1 bne wait_for_timer @@ -292,7 +306,6 @@ no_clouds_change wait_for_timer - ; mva #13 VSCROL ; FOX gfx mode only /* bit RMT_blocked @@ -330,6 +343,8 @@ SkipRMTVBL lab2 jsr RASTERMUSICTRACKER+3 skipSoundFrame */ + +VBI_end ; key release flag lda LastKey cmp #$ff @@ -872,7 +887,7 @@ no_branch_l ;VBI - + mva #0 NTSCCounter vmain vint,7 rts diff --git a/lumber.xex b/lumber.xex index c73ae4da2d3e278bbffc9e4b00f35937471cd79d..a70f7dd4d1d02f463a219aea74386c8a790e5acf 100644 GIT binary patch delta 3905 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