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

sprite housekeeping

Browse Source
This commit is contained in:
scawful
2024-12-08 20:13:11 -05:00
parent 87784b7693
commit f779a90864
2 changed files with 24 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
Sprites/NPCs/ranch_girl.asm
View File

@@ -2,17 +2,9 @@
; Ranch Girl (Chicken Easter Egg Sprite) ; Ranch Girl (Chicken Easter Egg Sprite)
; Gives Link the Ocarina ; Gives Link the Ocarina
pushpc Sprite_ShowMessageMinimal = $05FA8E
org $05FA8E SpriteDraw_RaceGameLady = $1AF92C
Sprite_ShowMessageMinimal: Sprite_CheckIfActive_Bank1A = $1AF954
org $1AF92C
SpriteDraw_RaceGameLady:
org $1AF954
Sprite_CheckIfActive_Bank1A:
pullpc
RanchGirl_Message: RanchGirl_Message:
{ {
@@ -48,48 +40,40 @@ RanchGirl_TeachSong:
LDA #$01 : STA $7EF34C ; The item gives 02 by default, so decrement that for now LDA #$01 : STA $7EF34C ; The item gives 02 by default, so decrement that for now
.not_started .not_started
.running_dialog .running_dialog
.has_song .has_song
#_1AFEF4: LDA.b $1A LDA.b $1A
#_1AFEF6: LSR A LSR A
#_1AFEF7: LSR A LSR A
#_1AFEF8: LSR A LSR A
#_1AFEF9: LSR A LSR A
#_1AFEFA: AND.b #$01 AND.b #$01
#_1AFEFC: STA.w $0DC0,X STA.w $0DC0,X
RTL RTL
} }
pushpc pushpc
org $01AFECF org $01AFECF
ChickenLady: ChickenLady:
{ {
#_1AFECF: JSR .main JSR .main
RTL
#_1AFED2: RTL
.main .main
#_1AFED3: LDA.b #$01 LDA.b #$01 : STA.w SprMiscC, X
#_1AFED5: STA.w SprMiscC,X
#_1AFED8: JSL SpriteDraw_RaceGameLady JSL SpriteDraw_RaceGameLady
#_1AFEDC: JSR Sprite_CheckIfActive_Bank1A JSR Sprite_CheckIfActive_Bank1A
#_1AFEDF: LDA.w SprTimerA,X
#_1AFEE2: CMP.b #$01
#_1AFEE4: BNE .no_message
JSL RanchGirl_Message
LDA.w SprTimerA, X : CMP.b #$01 : BNE .no_message
JSL RanchGirl_Message
.no_message .no_message
JSL RanchGirl_TeachSong JSL RanchGirl_TeachSong
.return .return
#_1AFEFF: RTS RTS
} }
assert pc() <= $01AFEFF assert pc() <= $01AFEFF

11
Sprites/all_sprites.asm
View File

@@ -100,16 +100,13 @@ Graphics_Transfer:
print "End of Sprites Bank 30 ", pc print "End of Sprites Bank 30 ", pc
; UnderworldTransition_ScrollRoom ; UnderworldTransition_ScrollRoom
org $02BE5E org $02BE5E : JSL Graphics_Transfer
JSL Graphics_Transfer
; Whirlpool ; Whirlpool
org $1EEEE4 org $1EEEE4 : JSL DontTeleportWithoutFlippers
JSL DontTeleportWithoutFlippers
; SpriteDraw_Roller ; SpriteDraw_Roller
org $058EE6 org $058EE6 : JSL PutRollerBeneathLink
JSL PutRollerBeneathLink
; ========================================================= ; =========================================================
@@ -198,8 +195,6 @@ Sprite_IceBlock = $D5
incsrc "Sprites/Objects/ice_block.asm" incsrc "Sprites/Objects/ice_block.asm"
print "End of ice_block.asm ", pc print "End of ice_block.asm ", pc
; =========================================================
incsrc "Sprites/NPCs/ranch_girl.asm" incsrc "Sprites/NPCs/ranch_girl.asm"
print "End of Ranch Girl.asm ", pc print "End of Ranch Girl.asm ", pc