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

Update map coordinates and fix red crystals showing junk

Browse Source
This commit is contained in:
karafruit
2026-01-31 13:01:14 -06:00
parent f8917c461a
commit ed2746a27b
1 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
menu/overworldmap.asm
View File

@@ -49,27 +49,27 @@ WorldMapIcon_pos:
.hc .hc
dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00 dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00
.ep .ep
dw $0F30, $06E0, $FF00, $FF00, $0F30, $06E0 dw $0F40, $0660, $FF00, $FF00, $0F40, $0660
.dp .dp
dw $0170, $0E50, $FF00, $FF00, $0170, $0E50 dw $0140, $0D00, $FF00, $FF00, $0140, $0D00
.at .at
dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00 dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00
.sp .sp
dw $8790, $0FD0, $FF00, $FF00, $8790, $0FD0 dw $8778, $0F50, $FF00, $FF00, $8778, $0F50
.pod .pod
dw $8F30, $06E0, $FF00, $FF00, $8F30, $06E0 dw $8F40, $0660, $FF00, $FF00, $8F40, $0660
.mm .mm
dw $8160, $0D80, $FF00, $FF00, $8160, $0D80 dw $8148, $0D00, $FF00, $FF00, $8148, $0D00
.sw .sw
dw $80F0, $0160, $FF00, $FF00, $80F0, $0160 dw $80B0, $00C0, $FF00, $FF00, $80B0, $00C0
.ip .ip
dw $8CB0, $0E80, $FF00, $FF00, $8CB0, $0E80 dw $8CA0, $0E00, $FF00, $FF00, $8CA0, $0E00
.toh .toh
dw $0900, $0130, $FF00, $FF00, $0900, $0130 dw $0900, $0100, $FF00, $FF00, $0900, $0100
.tt .tt
dw $8240, $0840, $FF00, $FF00, $8240, $0840 dw $81F8, $0800, $FF00, $FF00, $81F8, $0800
.tr .tr
dw $8F30, $01B0, $FF00, $FF00, $8F30, $01B0 dw $8F20, $0100, $FF00, $FF00, $8F20, $0100
.gt .gt
dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00 dw $FF00, $FF00, $FF00, $FF00, $FF00, $FF00
@@ -262,8 +262,8 @@ DrawPrizesOverride:
; determine if draw and/or continue ; determine if draw and/or continue
JSR WorldMap_ValidateCoords : BCS .advance JSR WorldMap_ValidateCoords : BCS .advance
JSR WorldMap_DrawTileOverlay
JSR WorldMap_DrawTile JSR WorldMap_DrawTile
JSR WorldMap_DrawTileOverlay
.advance .advance
LDY.b Scrap05 : DEY #2 : BMI + : JMP .next_dungeon : + LDY.b Scrap05 : DEY #2 : BMI + : JMP .next_dungeon : +
PLB PLB
@@ -321,18 +321,14 @@ RTS
WorldMap_DrawTile: WorldMap_DrawTile:
LDA.b Scrap00 : PHA LDA.b Scrap00 : PHA
SEP #$20
LDX.b Scrap0B : TXA : STA.b (OAMPtr+2)
INC.b OAMPtr+2
REP #$20
LDA.l $7EC10A : BIT.w #$4000 : SEP #$20 : BNE .raw_coords ; use raw OAM coordinates LDA.l $7EC10A : BIT.w #$4000 : SEP #$20 : BNE .raw_coords ; use raw OAM coordinates
JSR WorldMap_CalculateOAMCoordinates JSR WorldMap_CalculateOAMCoordinates
BCS .apply_offsets BCS .apply_offsets
REP #$20 REP #$20
BRA .exit BRA .exit
.raw_coords .raw_coords
STA.b Scrap0E STA.b Scrap0E
LDA.l $7EC108 : STA.b Scrap0F LDA.l $7EC108 : STA.b Scrap0F
.apply_offsets .apply_offsets
LDX.b Scrap0A : BNE .aligned ; prize number/overlay: no offset LDX.b Scrap0A : BNE .aligned ; prize number/overlay: no offset
LDX.b Scrap0B : BEQ + LDX.b Scrap0B : BEQ +
@@ -345,6 +341,8 @@ WorldMap_DrawTile:
LDA.b Scrap0E : SEC : SBC.b #$04 : STA.b Scrap0E LDA.b Scrap0E : SEC : SBC.b #$04 : STA.b Scrap0E
LDA.b Scrap0F : SBC.b #$04 : STA.b Scrap0F LDA.b Scrap0F : SBC.b #$04 : STA.b Scrap0F
.aligned .aligned
LDX.b Scrap0B : TXA : STA.b (OAMPtr+2)
INC.b OAMPtr+2
REP #$20 REP #$20
LDA.b Scrap0E : STA.b (OAMPtr) LDA.b Scrap0E : STA.b (OAMPtr)
INC.b OAMPtr : INC.b OAMPtr INC.b OAMPtr : INC.b OAMPtr