From 663ba966a159f576815fa051bf543727bbc48ae0 Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Mon, 13 Feb 2023 13:14:35 -0500 Subject: [PATCH] file select --- LTTP_RND_GeneralBugfixes.asm | 2 +- ...{fileselect.chr.gfx => fileselectgfx.2bpp} | Bin 4096 -> 4096 bytes data/fileselectgfx.png | Bin 0 -> 4180 bytes fileselect.asm | 44 ++++++++++++++++++ hooks.asm | 6 +++ 5 files changed, 51 insertions(+), 1 deletion(-) rename data/{fileselect.chr.gfx => fileselectgfx.2bpp} (98%) create mode 100644 data/fileselectgfx.png 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 858c3f29b44070033e4f261ccc883f8d638720cd..942d55ea9b9827afb9df787388920634479326fd 100644 GIT binary patch delta 44 lcmZorXi(VjfLr1J|L6Y?|8E4s!$8*m{|*hPaPdQK764zF7~22< delta 16 XcmZorXi(VjfO|6|&wu900z8TUG(!b$ diff --git a/data/fileselectgfx.png b/data/fileselectgfx.png new file mode 100644 index 0000000000000000000000000000000000000000..67228d72cfa6c3af1dc42054f112476b3fb9fd5e GIT binary patch literal 4180 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 + 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 +