From 3deca59f2e6a6b40dfb1e9212a9a4cd34dc9717d Mon Sep 17 00:00:00 2001 From: codemann8 Date: Wed, 29 May 2024 03:36:56 -0500 Subject: [PATCH] Adding colorblind friendly red crystal gfx --- custompalettes.asm | 2 -- data/customitems.4bpp | Bin 5120 -> 5120 bytes data/customitems.png | Bin 4217 -> 18835 bytes itemdatatables.asm | 8 ++++---- menu/overworldmap.asm | 25 ++++++++++++++++++++++++- 5 files changed, 28 insertions(+), 7 deletions(-) diff --git a/custompalettes.asm b/custompalettes.asm index 801fa3a..d19f52b 100644 --- a/custompalettes.asm +++ b/custompalettes.asm @@ -13,7 +13,5 @@ dw $0000, $7FFF, $27FF, $5E2D, $4F5F, $1CE7, $2E9C, $14B6 dw $0000, $7E4E, $6F44, $1CF5, $7399, $1CE7, $02F9, $0233 .crystal dw $7FFF, $7FFF, $0000, $5907, $6E0E, $0000, $7FBB, $7672 -.red_crystal -dw $7FFF, $7FFF, $0000, $0C94, $2D99, $0000, $6F3D, $4A3B .off_black dw $0000, $14A5, $14A5, $14A5, $14A5, $14A5, $14A5, $14A5 diff --git a/data/customitems.4bpp b/data/customitems.4bpp index 1ef9107f636d917169f4a7968bc4c981dfa94283..ef422c955c970cbe373710ddb147360410acf4a0 100644 GIT binary patch delta 154 zcmZqBXwcZ;#AC~dd$Iizt#?Jr*4Gaf>@Bt8B0C9nQ zhX#iRg#!u)3?6KDE}Ah(Ccr tfkQ^Aj=|1xAA^h%14qGw7bpJx`?l}#|7~`5b{rf)lN=Z~AK-Uj0RZi#AjALw delta 34 ocmZqBXwcZ;#Iw1D$BA+B1Rkf!$9StYH}SZDI5wLP@H?;o0MvsE-2eap diff --git a/data/customitems.png b/data/customitems.png index 345d1b4f40dda3d2245052651523c2b9990eec7e..e9f608ad74a2275917f4dbe2e475aad565009659 100644 GIT binary patch literal 18835 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 CSM}lm delta 4185 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 : PHA : PLB LDA.l CurrentWorld : STA.b Scrap04 + LDY.b #$00 : STY.b Scrap0A REP #$20 LDA.w #$0800+8 : STA.b OAMPtr LDA.w #$0A20+2 : STA.b OAMPtr+2 @@ -249,6 +251,7 @@ DrawPrizesOverride: ; determine if draw and/or continue JSR WorldMap_ValidateCoords : BCS .advance + JSR WorldMap_DrawTileOverlay JSR WorldMap_DrawTile .advance LDY.b Scrap05 : DEY #2 : BMI + : JMP .next_dungeon : + @@ -275,6 +278,22 @@ CLC : RTS .fail SEC : RTS +WorldMap_DrawTileOverlay: + LDA.b Scrap0C : PHA : AND.w #$0EFF + CMP.w #$0264 : BEQ .do_overlay ; red crystal + CMP.w #$0860 : BEQ .do_overlay ; green pendant + PLA +RTS + .do_overlay + LDX.b Scrap0B : PHX + LDX.b #$01 : STX.b Scrap0A + DEX : STX.b Scrap0B + LDA.b Scrap0C : AND.w #$FF00 : ORA.w #$006A : STA.w Scrap0C + JSR WorldMap_DrawTile + LDX.b #$00 : STX.b Scrap0A + PLX : PLA : STX.b Scrap0B : STA.b Scrap0C +RTS + WorldMap_DrawTile: SEP #$20 LDX.b Scrap0B : TXA : STA.b (OAMPtr+2) @@ -282,6 +301,10 @@ WorldMap_DrawTile: LDA.b Scrap00 : PHA JSR WorldMap_CalculateOAMCoordinates PLA : STA.b Scrap00 + LDX.b Scrap0A : BEQ + + LDA.b Scrap0E : CLC : ADC.b #$04 : STA.b Scrap0E + LDA.b Scrap0F : CLC : ADC.b #$04 : STA.b Scrap0F + + LDX.b Scrap0B : BEQ + LDA.b Scrap0E : SEC : SBC.b #$04 : STA.b Scrap0E LDA.b Scrap0F : SEC : SBC.b #$04 : STA.b Scrap0F