fix usage of GetDistance8bit in various sprites
This commit is contained in:
@@ -414,6 +414,7 @@ Sprite_BehaveAsBarrier = $1EF4F3
|
||||
Sprite_PlayerCantPassThrough = $1EF4F3
|
||||
|
||||
; player can't hookshot to that sprite
|
||||
Sprite_CancelHookshot = $0FF540
|
||||
Sprite_NullifyHookshotDrag = $0FF540
|
||||
|
||||
; show a message box without any condition
|
||||
|
||||
@@ -32,8 +32,6 @@
|
||||
|
||||
%Set_Sprite_Properties(Sprite_Darknut_Prep, Sprite_Darknut_Long)
|
||||
|
||||
; =========================================================
|
||||
|
||||
Sprite_Darknut_Long:
|
||||
{
|
||||
PHB : PHK : PLB
|
||||
@@ -46,8 +44,6 @@ Sprite_Darknut_Long:
|
||||
RTL
|
||||
}
|
||||
|
||||
; =========================================================
|
||||
|
||||
Sprite_Darknut_Prep:
|
||||
{
|
||||
PHB : PHK : PLB
|
||||
@@ -62,16 +58,10 @@ Sprite_Darknut_Prep:
|
||||
db $04, $06, $08, $0A
|
||||
}
|
||||
|
||||
; =========================================================
|
||||
|
||||
DarknutSpeed = 04
|
||||
|
||||
Sprite_Darknut_Main:
|
||||
{
|
||||
LDA.w POSX : STA $02
|
||||
LDA.w POSY : STA $03
|
||||
LDA.w SprX, X : STA $04
|
||||
LDA.w SprY, X : STA $05
|
||||
JSL GetDistance8bit_Long : CMP.b #$80 : BCS .no_probe
|
||||
; JSL Sprite_SendOutProbe
|
||||
JSL Sprite_SpawnProbeAlways_long
|
||||
@@ -82,7 +72,6 @@ Sprite_Darknut_Main:
|
||||
|
||||
JSL Sprite_Move
|
||||
JSL Sprite_BounceFromTileCollision
|
||||
JSL Sprite_PlayerCantPassThrough
|
||||
JSL Sprite_DamageFlash_Long
|
||||
|
||||
JSL Sprite_CheckIfRecoiling
|
||||
@@ -184,8 +173,6 @@ Sprite_Darknut_BasicMove:
|
||||
}
|
||||
}
|
||||
|
||||
; =========================================================
|
||||
|
||||
Sprite_Darknut_Draw:
|
||||
{
|
||||
JSL Sprite_PrepOamCoord
|
||||
@@ -242,8 +229,6 @@ Sprite_Darknut_Draw:
|
||||
|
||||
RTS
|
||||
|
||||
|
||||
; =======================================================
|
||||
.start_index
|
||||
db $00, $03, $06, $09, $0C, $0E, $10, $12
|
||||
.nbr_of_tiles
|
||||
@@ -293,5 +278,4 @@ Sprite_Darknut_Draw:
|
||||
db $02, $02
|
||||
db $02, $02
|
||||
db $02, $02
|
||||
|
||||
}
|
||||
|
||||
@@ -33,10 +33,6 @@ Sprite_EonScrub_Main:
|
||||
JSL Sprite_IsBelowPlayer : TYA
|
||||
CMP #$00 : BNE .is_below_player
|
||||
; Check if the player is too close
|
||||
LDA $22 : STA $02
|
||||
LDA $20 : STA $03
|
||||
LDA.w SprX, X : STA $04
|
||||
LDA.w SprY, X : STA $05
|
||||
JSL GetDistance8bit_Long : CMP.b #$24 : BCC .too_close
|
||||
; The player is below the scrub, so it should pop up
|
||||
LDA #$20 : STA.w SprTimerA, X
|
||||
@@ -60,10 +56,6 @@ Sprite_EonScrub_Main:
|
||||
INC.w SprAction, X
|
||||
.not_done
|
||||
|
||||
LDA.w POSX : STA $02
|
||||
LDA.w POSY : STA $03
|
||||
LDA.w SprX, X : STA $04
|
||||
LDA.w SprY, X : STA $05
|
||||
JSL GetDistance8bit_Long : CMP #$18 : BCS .not_too_close
|
||||
%GotoAction(0)
|
||||
.not_too_close
|
||||
|
||||
@@ -97,10 +97,6 @@ Sprite_EonOwl_Main:
|
||||
EonOwl_Idle:
|
||||
{
|
||||
%PlayAnimation(0,1,16)
|
||||
LDA.w POSX : STA $02
|
||||
LDA.w POSY : STA $03
|
||||
LDA.w SprX, X : STA $04
|
||||
LDA.w SprY, X : STA $05
|
||||
JSL GetDistance8bit_Long : CMP #$28 : BCS .not_too_close
|
||||
%GotoAction(1)
|
||||
.not_too_close
|
||||
|
||||
@@ -80,10 +80,6 @@ Sprite_MakuTree_Main:
|
||||
|
||||
MakuTree_MeetLink:
|
||||
{
|
||||
LDA.w POSX : STA $02
|
||||
LDA.w POSY : STA $03
|
||||
LDA.w SprX, X : STA $04
|
||||
LDA.w SprY, X : STA $05
|
||||
JSL GetDistance8bit_Long : CMP #$28 : BCS .not_too_close
|
||||
%ShowUnconditionalMessage($20)
|
||||
LDA.b #$01 : STA.l MakuTreeQuest
|
||||
|
||||
Reference in New Issue
Block a user