scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace sprite labels, more cleanup

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

33
Core/symbols.asm
View File

@@ -260,6 +260,15 @@ Sprite_AttemptDamageToPlayerPlusRecoil = $06F41F
; makes all the sprites on screen shaking ; makes all the sprites on screen shaking
ApplyRumbleToSprites = $0680FA ApplyRumbleToSprites = $0680FA
; =========================================================
Sprite_MoveLong = $1D808C
Sprite_ProjectSpeedTowardsPlayer = $06EA1A
Sprite_Decelerate_X = $05E657
Sprite_Decelerate_Y = $05E666
; ========================================================= ; =========================================================
; args: ; args:
; pos1_low = $00 ; pos1_low = $00
@@ -290,6 +299,9 @@ Sprite_PrepAndDrawSingleSmall = $06DBF8
; draw shadow (requires additional oam allocation) ; draw shadow (requires additional oam allocation)
Sprite_DrawShadow = $06DC54 Sprite_DrawShadow = $06DC54
Sprite_DrawWaterRipple = $059FFA
Sprite_DrawRippleIfInWater = $1EFF8D
; ========================================================= ; =========================================================
; check if the sprite is colliding with a solid tile set $0E70, X ; check if the sprite is colliding with a solid tile set $0E70, X
; ----udlr , u = up, d = down, l = left, r = right ; ----udlr , u = up, d = down, l = left, r = right
@@ -381,7 +393,6 @@ Sprite_NullifyHookshotDrag = $0FF540
; Y = high byte of message ID to use. ; Y = high byte of message ID to use.
Sprite_ShowMessageUnconditional = $05E219 Sprite_ShowMessageUnconditional = $05E219
; ========================================================= ; =========================================================
; show a message if we press A and face the sprite ; show a message if we press A and face the sprite
; A = low byte of message ID to use. ; A = low byte of message ID to use.
@@ -422,35 +433,23 @@ Sprite_ProjectSpeedTowardsEntityLong = $06EA22
Guard_ChaseLinkOnOneAxis = $05C542 Guard_ChaseLinkOnOneAxis = $05C542
Guard_ParrySwordAttacks = $06EB5E Guard_ParrySwordAttacks = $06EB5E
Sprite_SpawnProbeAlways_long = $05C66E
Probe_CheckTileSolidity = $0DC26E Probe_CheckTileSolidity = $0DC26E
Sprite_SpawnProbeAlways_long = $05C66E
Sprite_TrackBodyToHead = $05DCA2
; ========================================================= ; =========================================================
; Misc long functions ; Misc long functions
GetRandomInt = $0DBA71 GetRandomInt = $0DBA71
Sprite_TrackBodyToHead = $05DCA2
Sprite_Decelerate_X = $05E657
Sprite_Decelerate_Y = $05E666
Sprite_SpawnFireball = $0DDA06 Sprite_SpawnFireball = $0DDA06
Sprite_MoveLong = $1D808C
Sprite_DrawRippleIfInWater = $1EFF8D
SpriteDraw_WaterRipple = $059FFA
Sprite_SpawnSmallSplash = $1EA820 Sprite_SpawnSmallSplash = $1EA820
Sprite_SpawnSparkleGarnish = $058008 Sprite_SpawnSparkleGarnish = $058008
Sprite_ProjectSpeedTowardsPlayer = $06EA1A
Sprite_CheckDamageFromPlayerLong = $06F2AA
Sprite_CheckIfLifted = $06AA0C Sprite_CheckIfLifted = $06AA0C
Sprite_TransmuteToBomb = $06AD50 Sprite_TransmuteToBomb = $06AD50

2
Items/fishing_rod.asm
View File

@@ -360,7 +360,7 @@ Sprite_Floater:
{ {
; Floater Draw, allocate 4 tiles to use for the hud ; Floater Draw, allocate 4 tiles to use for the hud
LDA SprMiscG, X : BEQ + LDA SprMiscG, X : BEQ +
JSL SpriteDraw_WaterRipple JSL Sprite_DrawWaterRipple
+ +
JSR Sprite_Floater_Draw JSR Sprite_Floater_Draw

8
Sprites/Bosses/kydreeok.asm
View File

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

10
Sprites/Bosses/kydreeok_head.asm
View File

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

14
Sprites/Bosses/kydrog_boss.asm
View File

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

10
Sprites/Bosses/manhandla.asm
View File

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

8
Sprites/Bosses/twinrova.asm
View File

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

2
Sprites/Bosses/wolfos.asm
View File

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

6
Sprites/Enemies/anti_kirby.asm
View File

@@ -122,7 +122,7 @@ Sprite_AntiKirby_Main:
%PlayAnimation(0, 2, 10) ; Start %PlayAnimation(0, 2, 10) ; Start
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA #!RecoilTime : STA.w SprTimerA, X LDA #!RecoilTime : STA.w SprTimerA, X
%GotoAction(1) ; Hurt %GotoAction(1) ; Hurt
RTS RTS
@@ -152,7 +152,7 @@ Sprite_AntiKirby_Main:
{ {
%PlayAnimation(4, 5, 10) ; Suck %PlayAnimation(4, 5, 10) ; Suck
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA #!RecoilTime : STA.w SprTimerA, X LDA #!RecoilTime : STA.w SprTimerA, X
%GotoAction(1) ; Hurt %GotoAction(1) ; Hurt
RTS RTS
@@ -234,7 +234,7 @@ Sprite_AntiKirby_Main:
JSL Sprite_BounceFromTileCollision JSL Sprite_BounceFromTileCollision
JSL Sprite_PlayerCantPassThrough JSL Sprite_PlayerCantPassThrough
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA #!RecoilTime : STA.w SprTimerA, X LDA #!RecoilTime : STA.w SprTimerA, X
%GotoAction(6) ; Hurt %GotoAction(6) ; Hurt
.NoDamage .NoDamage

2
Sprites/Enemies/deku_scrub_enemy.asm
View File

@@ -221,7 +221,7 @@ Sprite_DekuScrubEnemy_Main:
STZ.w SprState, X STZ.w SprState, X
.no_collision .no_collision
JSL Sprite_CheckDamageFromPlayerLong : BCC .no_damage JSL Sprite_CheckDamageFromPlayer : BCC .no_damage
; Apply force in the opposite direction ; Apply force in the opposite direction
LDA #-16 : STA.w SprYSpeed, X LDA #-16 : STA.w SprYSpeed, X
.no_damage .no_damage

4
Sprites/Enemies/pols_voice.asm
View File

@@ -88,7 +88,7 @@ Sprite_PolsVoice_Main:
%GotoAction(1) %GotoAction(1)
.not_done .not_done
JSL Sprite_CheckDamageFromPlayerLong : BCC .no_damage JSL Sprite_CheckDamageFromPlayer : BCC .no_damage
JSL Sprite_DirectionToFacePlayer JSL Sprite_DirectionToFacePlayer
; Apply the speed positive or negative speed ; Apply the speed positive or negative speed
@@ -124,7 +124,7 @@ Sprite_PolsVoice_Main:
LDA SprTimerA, X : BNE .not_done LDA SprTimerA, X : BNE .not_done
%GotoAction(0) %GotoAction(0)
.not_done .not_done
JSL Sprite_CheckDamageFromPlayerLong : BCC .no_damage JSL Sprite_CheckDamageFromPlayer : BCC .no_damage
JSL Sprite_InvertSpeed_XY JSL Sprite_InvertSpeed_XY
.no_damage .no_damage
RTS RTS

2
Sprites/Enemies/sea_urchin.asm
View File

@@ -69,7 +69,7 @@ Sprite_SeaUrchin_Main:
%DoDamageToPlayerSameLayerOnContact() %DoDamageToPlayerSameLayerOnContact()
JSL Sprite_CheckDamageFromPlayerLong JSL Sprite_CheckDamageFromPlayer
BCC .NoDamage BCC .NoDamage
%GotoAction(1) %GotoAction(1)

2
Sprites/Objects/ice_block.asm
View File

@@ -99,7 +99,7 @@ Sprite_IceBlock_Main:
JSR Statue_BlockSprites JSR Statue_BlockSprites
JSL Sprite_CheckDamageFromPlayerLong JSL Sprite_CheckDamageFromPlayer
BCC .no_damage BCC .no_damage
LDA SprMiscD, X : STA.w SprX, X LDA SprMiscD, X : STA.w SprX, X
LDA SprMiscE, X : STA.w SprY, X LDA SprMiscE, X : STA.w SprY, X

8
Sprites/Objects/mineswitch.asm
View File

@@ -82,7 +82,7 @@ Sprite_LeverSwitch_Main:
{ {
%PlayAnimation(0,0,4) %PlayAnimation(0,0,4)
LDA SprTimerA, X : BNE .NoDamage LDA SprTimerA, X : BNE .NoDamage
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA #$25 : STA $012F LDA #$25 : STA $012F
STZ.w $37 STZ.w $37
@@ -96,7 +96,7 @@ Sprite_LeverSwitch_Main:
{ {
%PlayAnimation(1,1,4) %PlayAnimation(1,1,4)
LDA SprTimerA, X : BNE .NoDamage LDA SprTimerA, X : BNE .NoDamage
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA #$25 : STA $012F LDA #$25 : STA $012F
LDA #$01 : STA $37 LDA #$01 : STA $37
LDA #$10 : STA.w SprTimerA, X LDA #$10 : STA.w SprTimerA, X
@@ -108,7 +108,7 @@ Sprite_LeverSwitch_Main:
SpeedSwitchOff: SpeedSwitchOff:
{ {
%PlayAnimation(0,0,4) %PlayAnimation(0,0,4)
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA.b #$25 : STA $012F LDA.b #$25 : STA $012F
LDA.b #$01 : STA $36 LDA.b #$01 : STA $36
%GotoAction(3) %GotoAction(3)
@@ -119,7 +119,7 @@ Sprite_LeverSwitch_Main:
SpeedSwitchOn: SpeedSwitchOn:
{ {
%PlayAnimation(1,1,4) %PlayAnimation(1,1,4)
JSL Sprite_CheckDamageFromPlayerLong : BCC .NoDamage JSL Sprite_CheckDamageFromPlayer : BCC .NoDamage
LDA #$25 : STA $012F LDA #$25 : STA $012F
STZ.w $36 STZ.w $36
%GotoAction(2) %GotoAction(2)