alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clean up CanSeeConnector

Browse Source
This commit is contained in:
Kara Alexandra
2026-01-12 16:39:32 -06:00
parent cacc640a4f
commit 91fab07e5c
1 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
dungeon_map/current_room_map.asm
View File

@@ -298,58 +298,35 @@ GetConnection:
RTS RTS
CheckCanSeeConnector: CheckCanSeeConnector:
LDA.b $0C : PHA
LDA.b $0A LDA.b $0A
CMP.w #$0001 CMP.w #$0001
BCS .yep BCS .yep
PHX PHX
LDA.b $0C LDA.b $0C
AND.w #$00FF AND.w #$00FF
ASL A ASL A
TAX TAX
LDA.l SaveDataWRAM, X LDA.l SaveDataWRAM, X
AND.w #$00FF AND.w #$000F
XBA BEQ .plx_nope
ORA.b $00
EOR.w #$0002
XBA
STA.b $0E
PLX
JSR GetQuadrantMask
AND.b $0E
BEQ .nope
LDA.l CurrentDisplayedRoom
XBA
ORA.b $04
XBA
STA.b $0C
PHX
LDA.l CurrentDisplayedRoom LDA.l CurrentDisplayedRoom
ASL A ASL A
TAX TAX
LDA.l SaveDataWRAM, X LDA.l SaveDataWRAM, X
AND.w #$00FF AND.w #$000F
XBA BEQ .plx_nope
ORA.b $00
XBA
STA.b $0E
PLX PLX
JSR GetQuadrantMask
AND.b $0E
BEQ .nope
.yep .yep
PLA : STA.b $0C
SEC SEC
RTS RTS
.nope
PLA : STA.b $0C .plx_nope
PLX
CLC CLC
RTS RTS