git.y1.nz

commit c5c3a451ce49dc4b9f36fba0a28e6ade0d422ddb
parent 01777708810b347f83994b9486bacd6009800b4c
Author: Michel Iwaniec <46843052+michel-iwaniec@users.noreply.github.com>
Date:   Sat,  9 May 2026 12:51:35 +0100

NES: Replace some magic numbers with constants (#886)

Co-authored-by: Michel Iwaniec <michel_iwaniec@yahoo.com>
Diffstat:
M
gbdk-lib/libc/targets/mos6502/nes/crt0.s
4
++--
M
gbdk-lib/libc/targets/mos6502/nes/set_1bit_data.s
2
+-
M
gbdk-lib/libc/targets/mos6502/nes/vram_transfer_buffer.s
4
++--

3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/gbdk-lib/libc/targets/mos6502/nes/crt0.s b/gbdk-lib/libc/targets/mos6502/nes/crt0.s
@@ -251,7 +251,7 @@ __crt0_NMI:
   
     ; Write PPUCTRL and force NMI enabled to avoid deadlock from buggy isr handlers
     lda __lcd_isr_PPUCTRL,y
-    ora #0x80
+    ora #PPUCTRL_NMI
     sta PPUCTRL
 
     ; Write PPUMASK, in case it was disabled
@@ -558,7 +558,7 @@ __crt0_RESET_bankSwitchValue:
     ; 
     lda #(PPUMASK_SHOW_BG | PPUMASK_SHOW_SPR | PPUMASK_SHOW_BG_LC | PPUMASK_SHOW_SPR_LC)
     sta *_shadow_PPUMASK
-    lda #0x80
+    lda #OAM_VALID_MASK
     sta *__oam_valid_display_on
     ; enable NMI
     lda #(PPUCTRL_NMI | PPUCTRL_SPR_CHR)
diff --git a/gbdk-lib/libc/targets/mos6502/nes/set_1bit_data.s b/gbdk-lib/libc/targets/mos6502/nes/set_1bit_data.s
@@ -34,7 +34,7 @@ _set_bkg_1bpp_data::
     sta *src+1
     ;
     lda *_shadow_PPUCTRL
-    and #0x10
+    and #PPUCTRL_BG_CHR
     ora *src+1
     sta *ppuaddr+1
     lda *src
diff --git a/gbdk-lib/libc/targets/mos6502/nes/vram_transfer_buffer.s b/gbdk-lib/libc/targets/mos6502/nes/vram_transfer_buffer.s
@@ -76,7 +76,7 @@ __vram_transfer_buffer_pos_old::        .ds 1
     sta PPUADDR
     ; Clear inc-by-32 bit in both PPUCTRL and _shadow_PPUCTRL, as NMI may re-write PPUCTRL
     lda *_shadow_PPUCTRL
-    and #0xFB
+    and #~PPUCTRL_INC32
     sta *_shadow_PPUCTRL
     sta PPUCTRL
     rts
@@ -93,7 +93,7 @@ __vram_transfer_buffer_pos_old::        .ds 1
     sta PPUADDR
     ; Set inc-by-32 bit in both PPUCTRL and _shadow_PPUCTRL, as NMI may re-write PPUCTRL
     lda *_shadow_PPUCTRL
-    ora #0x04
+    ora #PPUCTRL_INC32
     sta *_shadow_PPUCTRL
     sta PPUCTRL
     rts

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.