From b45d2e27bf109d2233f373a3698ebf4f0117898b Mon Sep 17 00:00:00 2001 From: Lucas Scharenbroich Date: Tue, 6 Jun 2023 14:31:07 -0500 Subject: [PATCH] Fix bad color in overworld table --- demos/smb/mkswizzetbl.sh | 2 +- demos/smb/pal_w11.s | 32 ++++++++++++++++---------------- demos/smb/palette.s | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/demos/smb/mkswizzetbl.sh b/demos/smb/mkswizzetbl.sh index 5fc05a5..40e9b43 100644 --- a/demos/smb/mkswizzetbl.sh +++ b/demos/smb/mkswizzetbl.sh @@ -4,7 +4,7 @@ node swizzle.js AT1_T1 5 6 4 node swizzle.js AT1_T2 7 8 4 node swizzle.js AT1_T3 1 6 4 node swizzle.js AT1_S0 14 9 15 -node swizzle.js AT1_S1 10 7 6 +node swizzle.js AT1_S1 10 7 9 node swizzle.js AT1_S2 11 7 9 node swizzle.js AT1_S3 4 5 6 diff --git a/demos/smb/pal_w11.s b/demos/smb/pal_w11.s index f44a333..301d8f9 100644 --- a/demos/smb/pal_w11.s +++ b/demos/smb/pal_w11.s @@ -84,22 +84,22 @@ AT1_S0 dw $00f9,$0ef9,$09f9,$0ff9,$e0f9,$eef9,$e9f9,$eff9,$90f9,$9ef9,$99f9,$9ff9,$f0f9,$fef9,$f9f9,$fff9 dw $00ff,$0eff,$09ff,$0fff,$e0ff,$eeff,$e9ff,$efff,$90ff,$9eff,$99ff,$9fff,$f0ff,$feff,$f9ff,$ffff AT1_S1 - dw $0000,$0a00,$0700,$0600,$a000,$aa00,$a700,$a600,$7000,$7a00,$7700,$7600,$6000,$6a00,$6700,$6600 - dw $000a,$0a0a,$070a,$060a,$a00a,$aa0a,$a70a,$a60a,$700a,$7a0a,$770a,$760a,$600a,$6a0a,$670a,$660a - dw $0007,$0a07,$0707,$0607,$a007,$aa07,$a707,$a607,$7007,$7a07,$7707,$7607,$6007,$6a07,$6707,$6607 - dw $0006,$0a06,$0706,$0606,$a006,$aa06,$a706,$a606,$7006,$7a06,$7706,$7606,$6006,$6a06,$6706,$6606 - dw $00a0,$0aa0,$07a0,$06a0,$a0a0,$aaa0,$a7a0,$a6a0,$70a0,$7aa0,$77a0,$76a0,$60a0,$6aa0,$67a0,$66a0 - dw $00aa,$0aaa,$07aa,$06aa,$a0aa,$aaaa,$a7aa,$a6aa,$70aa,$7aaa,$77aa,$76aa,$60aa,$6aaa,$67aa,$66aa - dw $00a7,$0aa7,$07a7,$06a7,$a0a7,$aaa7,$a7a7,$a6a7,$70a7,$7aa7,$77a7,$76a7,$60a7,$6aa7,$67a7,$66a7 - dw $00a6,$0aa6,$07a6,$06a6,$a0a6,$aaa6,$a7a6,$a6a6,$70a6,$7aa6,$77a6,$76a6,$60a6,$6aa6,$67a6,$66a6 - dw $0070,$0a70,$0770,$0670,$a070,$aa70,$a770,$a670,$7070,$7a70,$7770,$7670,$6070,$6a70,$6770,$6670 - dw $007a,$0a7a,$077a,$067a,$a07a,$aa7a,$a77a,$a67a,$707a,$7a7a,$777a,$767a,$607a,$6a7a,$677a,$667a - dw $0077,$0a77,$0777,$0677,$a077,$aa77,$a777,$a677,$7077,$7a77,$7777,$7677,$6077,$6a77,$6777,$6677 - dw $0076,$0a76,$0776,$0676,$a076,$aa76,$a776,$a676,$7076,$7a76,$7776,$7676,$6076,$6a76,$6776,$6676 - dw $0060,$0a60,$0760,$0660,$a060,$aa60,$a760,$a660,$7060,$7a60,$7760,$7660,$6060,$6a60,$6760,$6660 - dw $006a,$0a6a,$076a,$066a,$a06a,$aa6a,$a76a,$a66a,$706a,$7a6a,$776a,$766a,$606a,$6a6a,$676a,$666a - dw $0067,$0a67,$0767,$0667,$a067,$aa67,$a767,$a667,$7067,$7a67,$7767,$7667,$6067,$6a67,$6767,$6667 - dw $0066,$0a66,$0766,$0666,$a066,$aa66,$a766,$a666,$7066,$7a66,$7766,$7666,$6066,$6a66,$6766,$6666 + dw $0000,$0a00,$0700,$0900,$a000,$aa00,$a700,$a900,$7000,$7a00,$7700,$7900,$9000,$9a00,$9700,$9900 + dw $000a,$0a0a,$070a,$090a,$a00a,$aa0a,$a70a,$a90a,$700a,$7a0a,$770a,$790a,$900a,$9a0a,$970a,$990a + dw $0007,$0a07,$0707,$0907,$a007,$aa07,$a707,$a907,$7007,$7a07,$7707,$7907,$9007,$9a07,$9707,$9907 + dw $0009,$0a09,$0709,$0909,$a009,$aa09,$a709,$a909,$7009,$7a09,$7709,$7909,$9009,$9a09,$9709,$9909 + dw $00a0,$0aa0,$07a0,$09a0,$a0a0,$aaa0,$a7a0,$a9a0,$70a0,$7aa0,$77a0,$79a0,$90a0,$9aa0,$97a0,$99a0 + dw $00aa,$0aaa,$07aa,$09aa,$a0aa,$aaaa,$a7aa,$a9aa,$70aa,$7aaa,$77aa,$79aa,$90aa,$9aaa,$97aa,$99aa + dw $00a7,$0aa7,$07a7,$09a7,$a0a7,$aaa7,$a7a7,$a9a7,$70a7,$7aa7,$77a7,$79a7,$90a7,$9aa7,$97a7,$99a7 + dw $00a9,$0aa9,$07a9,$09a9,$a0a9,$aaa9,$a7a9,$a9a9,$70a9,$7aa9,$77a9,$79a9,$90a9,$9aa9,$97a9,$99a9 + dw $0070,$0a70,$0770,$0970,$a070,$aa70,$a770,$a970,$7070,$7a70,$7770,$7970,$9070,$9a70,$9770,$9970 + dw $007a,$0a7a,$077a,$097a,$a07a,$aa7a,$a77a,$a97a,$707a,$7a7a,$777a,$797a,$907a,$9a7a,$977a,$997a + dw $0077,$0a77,$0777,$0977,$a077,$aa77,$a777,$a977,$7077,$7a77,$7777,$7977,$9077,$9a77,$9777,$9977 + dw $0079,$0a79,$0779,$0979,$a079,$aa79,$a779,$a979,$7079,$7a79,$7779,$7979,$9079,$9a79,$9779,$9979 + dw $0090,$0a90,$0790,$0990,$a090,$aa90,$a790,$a990,$7090,$7a90,$7790,$7990,$9090,$9a90,$9790,$9990 + dw $009a,$0a9a,$079a,$099a,$a09a,$aa9a,$a79a,$a99a,$709a,$7a9a,$779a,$799a,$909a,$9a9a,$979a,$999a + dw $0097,$0a97,$0797,$0997,$a097,$aa97,$a797,$a997,$7097,$7a97,$7797,$7997,$9097,$9a97,$9797,$9997 + dw $0099,$0a99,$0799,$0999,$a099,$aa99,$a799,$a999,$7099,$7a99,$7799,$7999,$9099,$9a99,$9799,$9999 AT1_S2 dw $0000,$0b00,$0700,$0900,$b000,$bb00,$b700,$b900,$7000,$7b00,$7700,$7900,$9000,$9b00,$9700,$9900 dw $000b,$0b0b,$070b,$090b,$b00b,$bb0b,$b70b,$b90b,$700b,$7b0b,$770b,$790b,$900b,$9b0b,$970b,$990b diff --git a/demos/smb/palette.s b/demos/smb/palette.s index b8d0ca8..2115526 100644 --- a/demos/smb/palette.s +++ b/demos/smb/palette.s @@ -105,7 +105,7 @@ nesPalette ; T2: --- $30 $21 $0F ; T3: --- RRR $17 $0F ; S0: --- $16 $27 $18 --> $37 $27 $16 -; S1: --- $1A $30 $17 +; S1: --- $1A $30 $27 ; S2: --- $16 $30 $27 $16 $18 ; S3: --- $0F $36 $17 --> $22 RR $29 $1A $0F $36 $17 $30 $21 $27 $1A $16 --- --- SS1 SS2 : 2 free colors ; --> $00 $01 $02 $03 $04 $05 $06 $07 $08 $09 $0A $0B $0C $0D $0E $0F @@ -116,7 +116,7 @@ nesPalette ; T2: 0 7 8 4 ; T3: 0 1 6 4 ; S0: 0 E 9 F -; S1: 0 A 7 6 +; S1: 0 A 7 9 ; S2: 0 B 7 9 ; S3: 0 4 5 6 ;