replace warnpc with assert pc <=

This commit is contained in:
scawful
2024-09-18 18:21:55 -04:00
parent 5c98331ddf
commit db9f28bf2a
28 changed files with 120 additions and 119 deletions

View File

@@ -1,6 +1,6 @@
; =========================================================
; =========================================================
; Sprite Properties
; =========================================================
; =========================================================
!SPRID = Sprite_BeanVendor
!NbrTiles = 04 ; Number of tiles used in a frame
@@ -11,7 +11,7 @@
!DeathAnimation = 00 ; 00 = normal death, 01 = no death animation
!ImperviousAll = 00 ; 00 = Can be attack, 01 = attack will clink on it
!SmallShadow = 00 ; 01 = small shadow, 00 = no shadow
!Shadow = 00 ; 00 = don't draw shadow, 01 = draw a shadow
!Shadow = 00 ; 00 = don't draw shadow, 01 = draw a shadow
!Palette = 00 ; Unused in this template (can be 0 to 7)
!Hitbox = 03 ; 00 to 31, can be viewed in sprite draw tool
!Persist = 00 ; 01 = your sprite continue to live offscreen
@@ -74,13 +74,13 @@ Sprite_BeanVendor_Prep:
LDA.b #$40 : STA.w SprTimerA, X
LDA.w SprSubtype, X : STA.w SprAction, X
CMP.b #$02 : BEQ .OldMan
LDA.b $8A : CMP.b #$0E : BNE .NotGaebora
LDA.b #$05 : STA.w SprAction, X
.NotGaebora
LDA.b $8A : CMP.b #$00 : BEQ .RanchFlower
.OldMan
PLB
RTL
@@ -466,4 +466,4 @@ Sprite_KaeoporaGaebora_Draw:
db $3B, $3B, $7B, $7B
.sizes
db $02, $02, $02, $02
}
}

View File

@@ -285,7 +285,7 @@ SpritePrep_Locksmith:
RTS
}
warnpc $068D7F
assert pc() <= $068D7F
SpriteDraw_Locksmith = $06BDAC
Sprite_CheckIfActive_Bank06 = $06D9EC
@@ -425,7 +425,7 @@ Sprite_39_ZoraBaby:
}
}
print "End of Sprite 39 Locksmith ", pc
warnpc $06BD9C
assert pc() <= $06BD9C
pullpc

View File

@@ -187,4 +187,4 @@ JMP.w FortuneTeller_DisplayMessage
#_0DC92A: LDA.b #$0F
#_0DC92C: JSR FortuneTeller_PrepareNextMessage
warnpc $0DC92F
assert pc() <= $0DC92F

View File

@@ -122,9 +122,10 @@ Sprite_MakuTree_Main:
{
%ShowSolicitedMessage($22) : BCC .no_talk
LDA.l $7EF3D6 : ORA.b #$02 : STA.l $7EF3D6
LDA.l CRYSTALS : BNE .no_essences
INC.w SprAction, X
.no_essences
; TODO: Activate when dreams are implemented
; LDA.l CRYSTALS : BNE .no_essences
; INC.w SprAction, X
; .no_essences
.no_talk
RTS
}

View File

@@ -92,5 +92,5 @@ ChickenLady:
#_1AFEFF: RTS
}
warnpc $01AFEFF
assert pc() <= $01AFEFF
pullpc