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

Portal Rod Portal Sprite cleanup

Browse Source
This commit is contained in:
scawful
2024-11-28 14:54:56 -05:00
parent 97e7b7cc78
commit 8a76b19e07
1 changed files with 42 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Sprites/Objects/portal_sprite.asm
View File

@@ -1,4 +1,3 @@
; ========================================================= ; =========================================================
; Portal Sprite ; Portal Sprite
; ========================================================= ; =========================================================
@@ -39,16 +38,12 @@
Sprite_Portal_Long: Sprite_Portal_Long:
{ {
PHB : PHK : PLB PHB : PHK : PLB
JSR Sprite_Portal_Draw
JSR Sprite_Portal_Draw ; Call the draw code JSL Sprite_CheckActive : BCC .SpriteIsNotActive
JSL Sprite_CheckActive ; Check if game is not paused JSR Sprite_Portal_Main
BCC .SpriteIsNotActive ; Skip Main code is sprite is innactive
JSR Sprite_Portal_Main ; Call the main sprite code
.SpriteIsNotActive .SpriteIsNotActive
PLB ; Get back the databank we stored previously PLB
RTL ; Go back to original code RTL
} }
@@ -58,13 +53,11 @@ Sprite_Portal_Long:
Sprite_Portal_Prep: Sprite_Portal_Prep:
{ {
PHB : PHK : PLB PHB : PHK : PLB
; Persist outside of camera ; Persist outside of camera
LDA #$00 : STA.w SprDefl, X LDA #$00 : STA.w SprDefl, X
LDA.w SprHitbox, X : AND.b #$C0 : STA.w SprHitbox, X LDA.w SprHitbox, X : AND.b #$C0 : STA.w SprHitbox, X
STZ.w SprTileDie, X STZ.w SprTileDie, X
LDA.b #$FF : STA.w SprBulletproof, X LDA.b #$FF : STA.w SprBulletproof, X
PLB PLB
RTL RTL
} }
@@ -115,7 +108,6 @@ Sprite_Portal_Main:
LDA.w SprY, X : STA.w OrangePortal_X LDA.w SprY, X : STA.w OrangePortal_X
LDA.w SprX, X : STA.w OrangePortal_Y LDA.w SprX, X : STA.w OrangePortal_Y
LDA.b #$01 : STA.w SprSubtype, X LDA.b #$01 : STA.w SprSubtype, X
%GotoAction(2) %GotoAction(2)
RTS RTS
.BluePortal .BluePortal
@@ -142,7 +134,6 @@ Sprite_Portal_Main:
LDA.w SprTimerD, X : BNE .NoOverlap LDA.w SprTimerD, X : BNE .NoOverlap
JSL Link_SetupHitBox JSL Link_SetupHitBox
JSL $0683EA ; Sprite_SetupHitbox_long JSL $0683EA ; Sprite_SetupHitbox_long
JSL CheckIfHitBoxesOverlap : BCC .NoOverlap JSL CheckIfHitBoxesOverlap : BCC .NoOverlap
CLC CLC
@@ -175,13 +166,11 @@ Sprite_Portal_Main:
LDA $1B : BEQ .outdoors LDA $1B : BEQ .outdoors
%GotoAction(4) ; OrangePortal_WarpDungeon %GotoAction(4) ; OrangePortal_WarpDungeon
.NoOverlap .NoOverlap
RTS RTS
.outdoors .outdoors
%GotoAction(6) ; OrangePortal_WarpOverworld %GotoAction(6) ; OrangePortal_WarpOverworld
RTS RTS
} }
@@ -237,7 +226,6 @@ Sprite_Portal_Main:
STA.w OrangePortal_X STA.w OrangePortal_X
PLX PLX
LDA #$14 : STA $11 LDA #$14 : STA $11
%GotoAction(2) ; Return to OrangePortal %GotoAction(2) ; Return to OrangePortal
RTS RTS
@@ -259,10 +247,8 @@ Sprite_Portal_Main:
LDA #$40 : STA.w SprTimerD, X LDA #$40 : STA.w SprTimerD, X
PLX PLX
LDA #$01 : STA $5D LDA #$01 : STA $5D
;LDA #$2A : STA $11 ;LDA #$2A : STA $11
%GotoAction(1) ; Return to BluePortal %GotoAction(1) ; Return to BluePortal
RTS RTS
} }
@@ -424,4 +410,3 @@ Sprite_Portal_Draw:
db $22 db $22
db $62 db $62
} }