788cceaab9
Deleted several unused modules and some commented code Reorganized some routines to clean up modules Moved some memory into mirrored WRAM Refactored NMI hook aux routine Removed old fake flipper fix
87 lines
2.5 KiB
NASM
87 lines
2.5 KiB
NASM
;================================================================================
|
|
; Fairy Changes & Fixes
|
|
;--------------------------------------------------------------------------------
|
|
RefillHealthPlusMagic:
|
|
LDA.l BigFairyHealth : STA.l HeartsFiller
|
|
RTL
|
|
;--------------------------------------------------------------------------------
|
|
RefillHealthPlusMagic8bit:
|
|
LDA.l BigFairyHealth : STA.l HeartsFiller
|
|
LDA.l BigFairyMagic : STA.l MagicFiller
|
|
RTL
|
|
;--------------------------------------------------------------------------------
|
|
CheckFullHealth:
|
|
LDA.l BigFairyHealth : BEQ +
|
|
LDA.l CurrentHealth : CMP.l MaximumHealth : BNE .player_hp_not_full_yet
|
|
+
|
|
LDA.l BigFairyMagic : BEQ +
|
|
LDA.l CurrentMagic : CMP.b #$80 : BNE .player_mp_not_full_yet
|
|
+
|
|
LDA.b #$00
|
|
RTL
|
|
.player_hp_not_full_yet
|
|
.player_mp_not_full_yet
|
|
LDA.b #$01
|
|
RTL
|
|
;--------------------------------------------------------------------------------
|
|
FairyPond_Init:
|
|
LDA.l Restrict_Ponds : BNE +
|
|
LDA.b #$48
|
|
JML.l Sprite_ShowMessageFromPlayerContact
|
|
+
|
|
PHY : JSL.l Sprite_CheckDamageToPlayerSameLayerLong : BCC +
|
|
LDA.l BottleContentsOne : CMP.b #$02 : BNE ++ : LDA.b #$1C : PHA : BRA .emptyBottle : ++
|
|
LDA.l BottleContentsTwo : CMP.b #$02 : BNE ++ : LDA.b #$1D : PHA : BRA .emptyBottle : ++
|
|
LDA.l BottleContentsThree : CMP.b #$02 : BNE ++ : LDA.b #$1E : PHA : BRA .emptyBottle : ++
|
|
LDA.l BottleContentsFour : CMP.b #$02 : BNE ++ : LDA.b #$1F : PHA : BRA .emptyBottle : ++
|
|
.noInventory
|
|
LDA.b #$0A : STA.w $0D80, X
|
|
LDA.b #$51
|
|
LDY.b #$01
|
|
JSL.l Sprite_ShowMessageFromPlayerContact
|
|
JMP .cleanup
|
|
|
|
.emptyBottle
|
|
LDA.b #$02 : STA.w $0D80, X
|
|
STZ $2F
|
|
LDA.b #$01 : STA.w $02E4
|
|
PLA : STA.w $1CE8
|
|
.cleanup
|
|
STZ.w $0EB0, X ; Clear the sprite's item-given variable
|
|
CLC ; skip rest of original function
|
|
+ : PLY
|
|
RTL
|
|
;--------------------------------------------------------------------------------
|
|
HappinessPond_Check:
|
|
LDA.b RoomIndex : CMP.b #$15 ;what we wrote over
|
|
BNE .done
|
|
PHP
|
|
|
|
LDA.b #$72
|
|
JSL Sprite_SpawnDynamically
|
|
|
|
LDA.w $0FD8 : STA.w $0D10, Y
|
|
LDA.w $0FD9 : STA.w $0D30, Y
|
|
|
|
LDA.w $0FDA : !SUB.b #$40 : STA.w $0D00, Y
|
|
LDA.w $0FDB : SBC.b #$00 : STA.w $0D20, Y
|
|
|
|
LDA.b #$01 : STA.w $0DA0, Y
|
|
|
|
LDA.b #$BB
|
|
JSL Sprite_SpawnDynamically
|
|
|
|
LDA.b #$08 : STA.w $0DD0, Y ; ensure we run prep for the shopkeeper
|
|
|
|
LDA.w $0FD8 : STA.w $0D10, Y
|
|
LDA.w $0FD9 : STA.w $0D30, Y
|
|
|
|
LDA.w $0FDA : !SUB.b #$20 : STA.w $0D00, Y
|
|
LDA.w $0FDB : SBC.b #$00 : STA.w $0D20, Y
|
|
|
|
STZ.w $0DD0, X ; self terminate
|
|
|
|
PLP
|
|
.done
|
|
RTL
|