alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Adding crystal numbers to prizes in map check

Browse Source
This commit is contained in:
codemann8
2024-05-29 19:21:24 -05:00
parent 879b02387e
commit 6be3f57977
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LTTP_RND_GeneralBugfixes.asm
View File

@@ -82,7 +82,6 @@ incsrc ram.asm
incsrc sram.asm incsrc sram.asm
incsrc registers.asm incsrc registers.asm
incsrc vanillalabels.asm incsrc vanillalabels.asm
incsrc menu/overworldmap.asm ; Overwrites some code in bank $8A
org $A08000 ; bank $20 org $A08000 ; bank $20
incsrc itemdowngrade.asm incsrc itemdowngrade.asm
@@ -177,6 +176,7 @@ incsrc elder.asm
incsrc toast.asm incsrc toast.asm
incsrc fastcredits.asm incsrc fastcredits.asm
incsrc msu.asm incsrc msu.asm
incsrc menu/overworldmap.asm ; Overwrites some code in bank $8A
incsrc dungeonmap.asm incsrc dungeonmap.asm
incsrc hextodec.asm incsrc hextodec.asm
incsrc multiworld.asm incsrc multiworld.asm

32
menu/overworldmap.asm
View File

@@ -88,9 +88,13 @@ dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FF00,
.tr .tr
dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FFFF dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00, $FFFF
; FREE: 0x1E bytes, for any future usage of extra icons ^^^ ; FREE: 0x15 bytes, for any future usage of extra icons ^^^
warnpc $8ABF2B
org $8ABF2B
WorldMapIcon_Numbers:
db $7F, $79, $6C, $6D, $6E, $6F, $7C, $7D, $7E
warnpc $8ABF34
org $8ABF34 org $8ABF34
PrizeExists: PrizeExists:
dw $37F8 dw $37F8
@@ -283,16 +287,30 @@ CLC : RTS
SEC : RTS SEC : RTS
WorldMap_DrawTileOverlay: WorldMap_DrawTileOverlay:
LDA.b Scrap0C : PHA : AND.w #$0EFF LDA.l CompassMode : AND.w #$0040 : BEQ +
LDA.b Scrap05 : BIT.w #$0100 : BEQ .skip+1
LSR : AND.w #$000F : TAX
LDA.l CrystalPendantFlags_3,X : TAX : BEQ .skip+1
CPX.b #$08 : !BGE +
LDA.b Scrap0C : PHA
LDA.l WorldMapIcon_Numbers-1,X
AND.w #$00FF : ORA.w #$3A00 : STA.b Scrap08
BRA .do_overlay
+
LDA.b Scrap0C : PHA
AND.w #$FF00 : ORA.w #$006A : STA.b Scrap08 ; temp store overlay tile info
LDA.b 1,S : AND.w #$0EFF
CMP.w #$0264 : BEQ .do_overlay ; red crystal CMP.w #$0264 : BEQ .do_overlay ; red crystal
CMP.w #$0860 : BEQ .do_overlay ; green pendant CMP.w #$0860 : BEQ .do_overlay ; green pendant
.skip
PLA PLA
RTS RTS
.do_overlay .do_overlay
LDX.b Scrap0B : PHX LDX.b Scrap0B : PHX
LDX.b #$01 : STX.b Scrap0A LDX.b #$01 : STX.b Scrap0A
DEX : STX.b Scrap0B DEX : STX.b Scrap0B
LDA.b Scrap0C : AND.w #$FF00 : ORA.w #$006A : STA.w Scrap0C LDA.b Scrap08 : STA.w Scrap0C
JSR WorldMap_DrawTile JSR WorldMap_DrawTile
LDX.b #$00 : STX.b Scrap0A LDX.b #$00 : STX.b Scrap0A
PLX : PLA : STX.b Scrap0B : STA.b Scrap0C PLX : PLA : STX.b Scrap0B : STA.b Scrap0C
@@ -401,6 +419,9 @@ WorldMap_CheckPrizeCollected:
PLX : CLC PLX : CLC
RTS RTS
warnpc $8AC3B1
pullpc
WorldMap_LoadChrHalfSlot: WorldMap_LoadChrHalfSlot:
JSL Graphics_LoadChrHalfSlot ; what we wrote over JSL Graphics_LoadChrHalfSlot ; what we wrote over
@@ -442,6 +463,3 @@ dw #PreloadedGraphicsROM+$320, $7F1320, $E0-2
.list_flute .list_flute
dw #PreloadedGraphicsROM+$120, $7F13C0, $20-2 dw #PreloadedGraphicsROM+$120, $7F13C0, $20-2
.list_end .list_end
warnpc $8AC3B1
pullpc