scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

handle portal sprite dismissal on tile collision

Browse Source
This commit is contained in:
scawful
2024-06-28 00:18:14 -04:00
parent ee8cc02955
commit ede818c57f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Sprites/Objects/portal_sprite.asm
View File

@@ -311,7 +311,7 @@ CheckForDismissPortal:
STZ.w $0DD0, X STZ.w $0DD0, X
DEC.w $06FE DEC.w $06FE
PLX PLX
JMP .return
.DespawnOrange .DespawnOrange
@@ -320,6 +320,7 @@ CheckForDismissPortal:
STZ.w $0DD0, X STZ.w $0DD0, X
DEC.w $06FE DEC.w $06FE
PLX PLX
RTS
.return .return
INC $06FE ; This ticker needs to be reset when transitioning rooms and maps. INC $06FE ; This ticker needs to be reset when transitioning rooms and maps.
@@ -336,12 +337,14 @@ RejectOnTileCollision:
; Load the tile index ; Load the tile index
LDA $0FA5 : CLC : CMP.b #$00 : BEQ .not_out_of_bounds LDA $0FA5 : CLC : CMP.b #$00 : BEQ .not_out_of_bounds
CMP.b #$48 : BEQ .not_out_of_bounds
; Clear the sprite and make an error sound ; Clear the sprite and make an error sound
LDA #$3C ; SFX2.3C Error beep LDA #$3C ; SFX2.3C Error beep
STA $012E ; Queue sound effect STA $012E ; Queue sound effect
LDA #$00 : STA $0DD0, X LDA #$00 : STA $0DD0, X
DEC $06FE
.not_out_of_bounds .not_out_of_bounds
RTS RTS