From b1eb48e14b991ee3e54a7646b3a174432188bc8d Mon Sep 17 00:00:00 2001 From: scawful Date: Thu, 4 Jul 2024 16:04:18 -0400 Subject: [PATCH] cleanup sprites lib --- Sprites/ZSpriteLib/sprites.asm | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/Sprites/ZSpriteLib/sprites.asm b/Sprites/ZSpriteLib/sprites.asm index 7437398..4dfe4d4 100644 --- a/Sprites/ZSpriteLib/sprites.asm +++ b/Sprites/ZSpriteLib/sprites.asm @@ -327,14 +327,14 @@ org $0DBB8A Sound_SetSfx3PanLong: ; ========================================================= -;spawn a new sprite on screen, A = sprite id -;when using this function you have to set the position yourself -;these values belong to the sprite who used that function not the new one -;$00 low x, $01 high x -;$02 low y, $03 high y -;$04 height, $05 low x (overlord) -;$06 high x (overlord), $07 low y (overlord) -;$08 high y (overlord) +; spawn a new sprite on screen, A = sprite id +; when using this function you have to set the position yourself +; these values belong to the sprite who used that function not the new one +; $00 low x, $01 high x +; $02 low y, $03 high y +; $04 height, $05 low x (overlord) +; $06 high x (overlord), $07 low y (overlord) +; $08 high y (overlord) Sprite_SpawnDynamically = $1DF65D Player_ResetState = $07F1A3 @@ -344,15 +344,13 @@ Player_ResetState = $07F1A3 Sprite_ApplyConveyorAdjustment = $1D8010 ; ========================================================= -;set the hitbox of the player (i think) -;org $0683EA -;Sprite_SetupHitBoxLong: +; Setup sprite hitbox for comparison with scrap ram +Sprite_SetupHitBoxLong = $0683EA ; ========================================================= ; set tile of dungeon Dungeon_SpriteInducedTilemapUpdate = $01E7A9 - ; ========================================================= ; player can't pass through the sprite Sprite_PlayerCantPassThrough = $1EF4F3 @@ -393,7 +391,6 @@ UseImplicitRegIndexedLocalJumpTable = $008781 EnableForceBlank = $00893D - ; ========================================================= ; $04 = X ; $05 = HighX