replace sprite labels, more cleanup

This commit is contained in:
scawful
2024-07-07 11:11:10 -04:00
parent 1f2bb46559
commit 8c1ff13681
14 changed files with 55 additions and 56 deletions

View File

@@ -197,7 +197,7 @@ Sprite_Kydreeok_Main:
JSR StopIfOutOfBounds
JSL MoveBody
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
%GotoAction(4)
@@ -217,7 +217,7 @@ Sprite_Kydreeok_Main:
JSR StopIfOutOfBounds
JSL MoveBody
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
%GotoAction(4)
@@ -264,7 +264,7 @@ Sprite_Kydreeok_Main:
JSL MoveBody
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX ;restores X
@@ -325,7 +325,7 @@ Sprite_Kydreeok_Main:
LDA.b #$04 : STA.w SprHeight, X
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
LDA.w SprTimerA, X : BNE .continue

View File

@@ -90,7 +90,7 @@ Sprite_KydreeokHead_Main:
%PlayAnimation(0,2,10)
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -122,7 +122,7 @@ Sprite_KydreeokHead_Main:
%PlayAnimation(3,5,10)
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -143,7 +143,7 @@ Sprite_KydreeokHead_Main:
%StartOnFrame(6)
%PlayAnimation(6,8,10)
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
JSR KydreeokHead_RotationMove
@@ -163,7 +163,7 @@ Sprite_KydreeokHead_Main:
%PlayAnimation(9,11,10)
%MoveTowardPlayer(15)
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
JSR KydreeokHead_RotationMove
@@ -182,7 +182,7 @@ Sprite_KydreeokHead_Main:
%MoveTowardPlayer(15)
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX

View File

@@ -240,7 +240,7 @@ Sprite_KydrogBoss_Main:
%PlayAnimation(0, 2, 8)
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -260,7 +260,7 @@ Sprite_KydrogBoss_Main:
%PlayAnimation(3, 5, 8)
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -280,7 +280,7 @@ Sprite_KydrogBoss_Main:
%PlayAnimation(6, 8, 8)
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -300,7 +300,7 @@ Sprite_KydrogBoss_Main:
%PlayAnimation(9, 11, 8)
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -331,7 +331,7 @@ Sprite_KydrogBoss_Main:
.continue
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -361,7 +361,7 @@ Sprite_KydrogBoss_Main:
%PlayAnimation(15, 16, 8) ; Arms Crossed Animation
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -381,7 +381,7 @@ Sprite_KydrogBoss_Main:
%PlayAnimation(17, 17, 10)
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX

View File

@@ -205,7 +205,7 @@ Sprite_Manhandla_Main:
JSL Sprite_Move
JSL Sprite_DamageFlash_Long
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
RTS
@@ -219,7 +219,7 @@ Sprite_Manhandla_Main:
JSL Sprite_Move
JSL Sprite_DamageFlash_Long
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
RTS
@@ -234,7 +234,7 @@ Sprite_Manhandla_Main:
JSL Sprite_Move
JSL Sprite_DamageFlash_Long
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -258,7 +258,7 @@ Sprite_Manhandla_Main:
JSR Sprite_Manhandla_Move
JSL Sprite_DamageFlash_Long
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -331,7 +331,7 @@ Sprite_Manhandla_Main:
JSR Mothula_SpawnBeams
+
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
LDY.w Offspring1_Id

View File

@@ -251,7 +251,7 @@ Sprite_Twinrova_Main:
%Twinrova_Front()
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -271,7 +271,7 @@ Sprite_Twinrova_Main:
%Twinrova_Back()
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -404,7 +404,7 @@ Sprite_Twinrova_Main:
%Show_Koume()
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX
@@ -436,7 +436,7 @@ Sprite_Twinrova_Main:
%Show_Kotake()
PHX
JSL Sprite_CheckDamageFromPlayerLong
JSL Sprite_CheckDamageFromPlayer
%DoDamageToPlayerSameLayerOnContact()
PLX

View File

@@ -90,7 +90,7 @@ Sprite_Wolfos_CheckIfDefeated:
macro Wolfos_Move()
JSL Sprite_DamageFlash_Long
JSL Sprite_CheckDamageFromPlayerLong : BCC +
JSL Sprite_CheckDamageFromPlayer : BCC +
+
JSL Sprite_PlayerCantPassThrough