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

cleanup all_sprites.asm

Browse Source
This commit is contained in:
scawful
2024-12-04 18:18:09 -05:00
parent 335cd261e0
commit d9bd2ad4aa
1 changed files with 21 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
Sprites/all_sprites.asm
View File

@@ -286,20 +286,19 @@ print "End of goron.asm ", pc
; Sprite Recoil and Death ; Sprite Recoil and Death
; TODO: Sprite_AttemptKillingOfKin ; TODO: Sprite_AttemptKillingOfKin
; Kydreeok Head die like Sidenexx ; Kydreeok Head die like Sidenexx
org $06F003 org $06F003 : CMP.b #$CF
CMP.b #$CF
; Remove sidenexx death from booki
org $06EFFF : NOP #4
; Make Dark Link die like sidenexx ; Make Dark Link die like sidenexx
org $06F003 org $06F003 : CMP.b #$C1
CMP.b #$C1
; Make Helmet ChuChu recoil link ; Make Helmet ChuChu recoil link
org $06F37D org $06F37D : CMP.b #$05
CMP.b #$05
; Make Kydreeok head recoil Link ; Make Kydreeok head recoil Link
org $06F381 org $06F381 : CMP.b #$CF
CMP.b #$CF
; ========================================================= ; =========================================================
@@ -336,11 +335,9 @@ ShopItem_Banana:
BCC $F1A1 ; ShopItem_GiveFailureMessage BCC $F1A1 ; ShopItem_GiveFailureMessage
STZ.w SprState,X STZ.w SprState,X
INC.b Bananas INC.b Bananas
LDY.b #$42 LDY.b #$42 : JSR $F366 ; ShopItem_HandleReceipt
JSR $F366 ; ShopItem_HandleReceipt
.exit .exit
RTS RTS
@@ -364,59 +361,42 @@ org $1EF42E
; Octoballoon_FormBabby ; Octoballoon_FormBabby
; Reduce by half the number of babies spawned ; Reduce by half the number of babies spawned
org $06D814 org $06D814 : LDA.b #$02
LDA.b #$02
; SpritePrep_HauntedGroveOstritch ; SpritePrep_HauntedGroveOstritch
org $068BB2 org $068BB2 : NOP #11
NOP #11
; HauntedGroveRabbit_Idle ; HauntedGroveRabbit_Idle
org $1E9A8F org $1E9A8F : NOP #5
NOP #5
; MedallionTablet (Goron) ; MedallionTablet (Goron)
org $05F274 org $05F274 : LDA.l $7EF378 ; Unused SRAM
LDA.l $7EF378 ; Unused SRAM
org $08C2E3 org $08C2E3 : dw $006F ; BUTTER SWORD DIALOGUE
dw $006F ; BUTTER SWORD DIALOGUE
; Fix the capital 'B' debug item cheat. ; Fix the capital 'B' debug item cheat.
org $0CDC26 org $0CDC26 : db $80 ; replace a $F0 (BEQ) with a $80 (BRA).
db $80 ; replace a $F0 (BEQ) with a $80 (BRA).
; Update Catfish Item Get to Bottle ; Update Catfish Item Get to Bottle
org $1DE184 org $1DE184 : LDA.b #$16 : STA.w $0D90, X
#_1DE184: LDA.b #$16 ; ITEMGET 11
#_1DE186: STA.w $0D90,X
; Follower_Disable ; Follower_Disable
; Don't disable Kiki so we can switch maps with him. ; Don't disable Kiki so we can switch maps with him.
org $09ACF3 org $09ACF3 : LDA.l $7EF3CC : CMP.b #$0E
LDA.l $7EF3CC
CMP.b #$0E
; Kiki, don't care if we're not in dark world ; Kiki, don't care if we're not in dark world
org $099FEB org $099FEB : LDA.b $8A : AND.b #$FF
#_099FEB: LDA.b $8A
#_099FED: AND.b #$FF
org $1EE48E org $1EE48E : NOP #6
NOP #6
; Kiki activate cutscene 3 (tail palace) ; Kiki activate cutscene 3 (tail palace)
org $1EE630 org $1EE630 : LDA.b #$03 : STA.w $04C6
LDA.b #$03 : STA.w $04C6
; Kid at ranch checks for flute ; Kid at ranch checks for flute
org $05FF7D org $05FF7D : LDA.l $7EF34C : CMP.b #$01
LDA.l $7EF34C
CMP.b #$01
; Raven Damage (LW/DW) ; Raven Damage (LW/DW)
org $068963 org $068963 : db $81, $84
db $81, $84
; Running Man draw palette ; Running Man draw palette
org $05E9CD org $05E9CD