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

Applied labels and byte designators

Browse Source
This commit is contained in:
codemann8
2024-04-05 20:50:04 -05:00
committed by aerinon
parent 2e2b493240
commit a70251d2b2
114 changed files with 2786 additions and 2970 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
doorrando/bugfix/kholdstare_shell_collision.asm
View File

@@ -13,31 +13,31 @@ pullpc
CheckKholdShellCoordinates:
LDA.w $0D30, X
LDA.w SpritePosXHigh, X
XBA
LDA.w $0D10, X ; full 16 bit X coordinate of sprite
LDA.w SpritePosXLow, X ; full 16 bit X coordinate of sprite
REP #$21 ; carry is guaranteed clear
SBC.w #$0020
CMP.b $22
CMP.b LinkPosX
BCS .not_colliding
ADC.w #$0040 ; carry is guaranteed clear
CMP.b $22
CMP.b LinkPosX
BCC .not_colliding
SEP #$20
LDA.w $0D20, X
LDA.w SpritePosYHigh, X
XBA
LDA.w $0D00, X ; full 16 bit Y coordinate of sprite
LDA.w SpritePosYLow, X ; full 16 bit Y coordinate of sprite
REP #$21 ; carry is guaranteed clear
SBC.w #$001F ; could go to 27 and still let link squeeze in
CMP.b $20
CMP.b LinkPosY
BCS .not_colliding
ADC.w #$0037 ; carry is guaranteed clear
CMP.b $20
CMP.b LinkPosY
BCC .not_colliding
SEP #$20 ; collision detected