diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 0748a16..1b360ca 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -219,7 +219,7 @@ warnpc $B1D001 org $B1D000 FileSelectNewGraphics: -incbin "data/fileselect.chr.gfx" +incbin "data/fileselectgfx.2bpp" warnpc $B1E001 org $B1E000 diff --git a/data/fileselect.chr.gfx b/data/fileselectgfx.2bpp old mode 100755 new mode 100644 similarity index 98% rename from data/fileselect.chr.gfx rename to data/fileselectgfx.2bpp index 858c3f2..942d55e 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 97511e0..1543ad5 100644 --- a/fileselect.asm +++ b/fileselect.asm @@ -110,11 +110,57 @@ JMP DrawItem DrawPlayerFile: LDA.b FrameCounter : AND.w #$0001 : BNE .normal JSR DrawPlayerFileShared + INC.w SkipOAM ; Suppress animated tile updates for this frame ; 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/invertedmaps.asm b/invertedmaps.asm index fb6dede..86829e0 100644 --- a/invertedmaps.asm +++ b/invertedmaps.asm @@ -74,7 +74,7 @@ Overworld_LoadNewTiles: BRA .next_tile - ; when using commands, the parameters will never have bit-15 set + ; when using commands, list parameters will never have bit-15 set ; so we use that as our sentinel in data lists ; we could encode the size for everything ; but that makes adjustments more burdensome @@ -107,7 +107,6 @@ Overworld_LoadNewTiles: ; dw !OWW_StripeRLEINC|!OWW_|RLESize() ; dw , - ; use !SKIP to not place a tile but continue the stripe !OWW_StripeRLEINC = $8002 dw .stripe_rle_inc ; 02 @@ -170,6 +169,7 @@ Overworld_LoadNewTiles: .inverted_skip LDX.w $0000,Y + INY INY @@ -280,7 +280,6 @@ Overworld_LoadNewTiles: RTS - ;--------------------------------------------------------------------------------------------------- .get_rle_size_and_tile @@ -422,6 +421,8 @@ dw .map3C ; 3C dw $0000 ; 3D dw $0000 ; 3E dw $0000 ; 3F + +; dark world dw $0000 ; 40 dw $0000 ; 41 dw $0000 ; 42 @@ -1208,7 +1209,7 @@ dw $0000 ; 7F dw $015E, $2E14 dw $0174, $2E16 -RTS + dw !OWW_END ;---------------------------------------------------------------------------------------------------