diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index dc37f11..20241c1 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -220,7 +220,7 @@ warnpc $31D001 org $31D000 FileSelectNewGraphics: -incbin "data/fileselect.chr.gfx" +incbin "data/fileselectgfx.2bpp" warnpc $31E001 org $31E000 diff --git a/data/fileselect.chr.gfx b/data/fileselectgfx.2bpp similarity index 98% rename from data/fileselect.chr.gfx rename to data/fileselectgfx.2bpp index 858c3f2..942d55e 100644 Binary files a/data/fileselect.chr.gfx and b/data/fileselectgfx.2bpp differ diff --git a/data/fileselectgfx.png b/data/fileselectgfx.png new file mode 100644 index 0000000..67228d7 Binary files /dev/null and b/data/fileselectgfx.png differ diff --git a/fileselect.asm b/fileselect.asm index dc7361f..f29207f 100644 --- a/fileselect.asm +++ b/fileselect.asm @@ -115,6 +115,50 @@ DrawPlayerFile: ; re-enable Stripe Image format upload on this frame ; Value loaded must match what gets set by AltBufferTable LDA.w #$0161 : STA.w GFXStripes+2 + + LDA.w #$C000>>1 + XBA + STA.w GFXStripes+$0402 + + LDA.w #$C03E>>1 + XBA + STA.w GFXStripes+$0408 + + LDA.w #$C000|57 + XBA + STA.w GFXStripes+$0404 + STA.w GFXStripes+$040A + + LDA.w #$12BF + STA.w GFXStripes+$0406 + ORA.w #$4000 + STA.w GFXStripes+$040C + + LDA.w #$C0C6>>1 + XBA + STA.w GFXStripes+$040E + + LDA.w #$4001 + XBA + STA.w GFXStripes+$0410 + + LDA.l DisableFlashing + AND.w #$00FF + BEQ .flashing + + LDA.w #$26BE + BRA .draw_access_icon + +.flashing + LDA.w #$0188 + NOP ; 2 cycles wasted to be equal + +.draw_access_icon + STA.w GFXStripes+$0412 + + LDA.w #$FFFF + STA.w GFXStripes+$0414 + BRA .done .normal STZ.w SkipOAM ; ensure core animated tile updates are not suppressed diff --git a/hooks.asm b/hooks.asm index 6f092c2..1310820 100644 --- a/hooks.asm +++ b/hooks.asm @@ -2496,3 +2496,9 @@ endif ;-------------------------------------------------------------------------------- org $008BE5 ; hijack stripes JSL.l TransferVRAMStripes + +;=================================================================================================== +; Fix fairy palette on file select +;=================================================================================================== +org $9BF029+1 : db $10 +