replace warnpc with assert pc <=
This commit is contained in:
@@ -572,7 +572,7 @@ Lanmola_DrawMound:
|
||||
|
||||
; ==============================================================================
|
||||
|
||||
warnpc $05A880
|
||||
assert pc() <= $05A880
|
||||
|
||||
; ==============================================================================
|
||||
org $1DCFCB
|
||||
@@ -632,4 +632,4 @@ Sprite_Shrapnel:
|
||||
|
||||
; ==============================================================================
|
||||
|
||||
warnpc $1DD02A
|
||||
assert pc() <= $1DD02A
|
||||
@@ -1164,7 +1164,7 @@ Follower_BasicMover:
|
||||
LDA.b #$15 : STA.w $012C
|
||||
|
||||
RTS
|
||||
warnpc $09A23A
|
||||
assert pc() <= $09A23A
|
||||
|
||||
org $09A23A
|
||||
.no_blind_transform
|
||||
@@ -1260,7 +1260,7 @@ Blind_SpawnFromMaiden:
|
||||
RTL
|
||||
}
|
||||
|
||||
warnpc $1DA081
|
||||
assert pc() <= $1DA081
|
||||
|
||||
; =========================================================
|
||||
; We are using space from this function to insert the
|
||||
@@ -1303,7 +1303,7 @@ SpritePrep_Blind_PrepareBattle:
|
||||
RTL
|
||||
}
|
||||
|
||||
warnpc $1DA0B1
|
||||
assert pc() <= $1DA0B1
|
||||
|
||||
org $01B3E1
|
||||
RoomDraw_BombableFloor:
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -187,4 +187,4 @@ JMP.w FortuneTeller_DisplayMessage
|
||||
#_0DC92A: LDA.b #$0F
|
||||
#_0DC92C: JSR FortuneTeller_PrepareNextMessage
|
||||
|
||||
warnpc $0DC92F
|
||||
assert pc() <= $0DC92F
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -92,5 +92,5 @@ ChickenLady:
|
||||
#_1AFEFF: RTS
|
||||
}
|
||||
|
||||
warnpc $01AFEFF
|
||||
assert pc() <= $01AFEFF
|
||||
pullpc
|
||||
@@ -207,7 +207,7 @@ print "End of ice_block.asm ", pc
|
||||
incsrc "Sprites/NPCs/ranch_girl.asm"
|
||||
print "End of Ranch Girl.asm ", pc
|
||||
|
||||
warnpc $328000
|
||||
assert pc() <= $328000
|
||||
|
||||
; =========================================================
|
||||
|
||||
@@ -314,7 +314,7 @@ org $0083F8
|
||||
.notInCutscene
|
||||
RTS
|
||||
|
||||
warnpc $00841E
|
||||
assert pc() <= $00841E
|
||||
|
||||
; =========================================================
|
||||
|
||||
@@ -344,7 +344,7 @@ ShopItem_Banana:
|
||||
.error
|
||||
JSR $F38A ; ShopItem_PlayBeep
|
||||
}
|
||||
warnpc $1EF2AB
|
||||
assert pc() <= $1EF2AB
|
||||
|
||||
; =========================================================
|
||||
|
||||
|
||||
Reference in New Issue
Block a user