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

move farore and kydrog sprite

Browse Source
This commit is contained in:
scawful
2024-05-24 20:41:17 -04:00
parent 410f2ccaef
commit 12924d65cb
3 changed files with 23 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Sprites/Bosses/kydrog.asm
View File

@@ -1,6 +1,7 @@
;============================================================================== ; =========================================================
; Sprite Properties ; Cutscene Kydrog Sprite Properties
;============================================================================== ; =========================================================
!SPRID = $7B; The sprite ID you are overwriting (HEX) !SPRID = $7B; The sprite ID you are overwriting (HEX)
!NbrTiles = 6 ; Number of tiles used in a frame !NbrTiles = 6 ; Number of tiles used in a frame
!Harmless = 01 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless !Harmless = 01 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless
@@ -31,7 +32,7 @@
%Set_Sprite_Properties(Sprite_Kydrog_Prep, Sprite_Kydrog_Long) %Set_Sprite_Properties(Sprite_Kydrog_Prep, Sprite_Kydrog_Long)
;============================================================================== ; =========================================================
Sprite_Kydrog_Long: Sprite_Kydrog_Long:
{ {
@@ -47,7 +48,7 @@ Sprite_Kydrog_Long:
PLB ; Get back the databank we stored previously PLB ; Get back the databank we stored previously
RTL ; Go back to original code RTL ; Go back to original code
} }
;============================================================================== ; =========================================================
Sprite_Kydrog_Prep: Sprite_Kydrog_Prep:
{ {
@@ -63,7 +64,7 @@ Sprite_Kydrog_Prep:
RTL RTL
} }
;============================================================================== ; =========================================================
Sprite_Kydrog_Main: Sprite_Kydrog_Main:
{ {
@@ -153,7 +154,7 @@ Sprite_Kydrog_Main:
} }
} }
;============================================================================== ; =========================================================
Sprite_Kydrog_Draw: Sprite_Kydrog_Draw:
{ {
@@ -211,7 +212,7 @@ Sprite_Kydrog_Draw:
RTS RTS
;============================================================================== ; =========================================================
.start_index .start_index
db $00 db $00
@@ -228,16 +229,3 @@ Sprite_Kydrog_Draw:
.sizes .sizes
db $02, $02, $02, $02, $02, $02 db $02, $02, $02, $02, $02, $02
} }
; I forget what this is lol
; org $02ECF8
; dw $0029
; ==============================================================================
; 169BC
; org $02E9BC
; LoadOverworldFromSpecialOverworld:
; org $029E65
; JSR LoadOverworldFromSpecialOverworld

19
Sprites/NPCs/farore.asm
View File

@@ -1,6 +1,7 @@
;============================================================================== ; =========================================================
; Farore Sprite Properties ; Farore Sprite Properties
;============================================================================== ; =========================================================
!SPRID = $73; The sprite ID you are overwriting (HEX) !SPRID = $73; The sprite ID you are overwriting (HEX)
!NbrTiles = 2 ; Number of tiles used in a frame !NbrTiles = 2 ; Number of tiles used in a frame
!Harmless = 00 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless !Harmless = 00 ; 00 = Sprite is Harmful, 01 = Sprite is Harmless
@@ -29,11 +30,11 @@
!ImpervSwordHammer = 00 ; 01 = Impervious to sword and hammer attacks !ImpervSwordHammer = 00 ; 01 = Impervious to sword and hammer attacks
!Boss = 00 ; 00 = normal sprite, 01 = sprite is a boss !Boss = 00 ; 00 = normal sprite, 01 = sprite is a boss
;============================================================================== ; =========================================================
%Set_Sprite_Properties(Sprite_Farore_Prep, Sprite_Farore_Long) %Set_Sprite_Properties(Sprite_Farore_Prep, Sprite_Farore_Long)
;============================================================================== ; =========================================================
Sprite_Farore_Long: Sprite_Farore_Long:
{ {
@@ -50,7 +51,7 @@ Sprite_Farore_Long:
RTL ; Go back to original code RTL ; Go back to original code
} }
;============================================================================== ; =========================================================
Sprite_Farore_Prep: Sprite_Farore_Prep:
{ {
@@ -67,7 +68,7 @@ Sprite_Farore_Prep:
RTL RTL
} }
;============================================================================== ; =========================================================
; Movement key bitwise ---- udlr ; Movement key bitwise ---- udlr
@@ -229,7 +230,7 @@ Sprite_Farore_Main:
} }
} }
;============================================================================== ; =========================================================
Sprite_Farore_Draw: Sprite_Farore_Draw:
{ {
@@ -287,7 +288,7 @@ Sprite_Farore_Draw:
RTS RTS
;============================================================================== ; =========================================================
.start_index .start_index
db $00, $02, $04, $06, $08, $0A, $0C db $00, $02, $04, $06, $08, $0A, $0C
@@ -334,5 +335,3 @@ Sprite_Farore_Draw:
db $02, $02 db $02, $02
db $02, $02 db $02, $02
} }
;==============================================================================

10
Sprites/all_sprites.asm
View File

@@ -31,17 +31,17 @@ incsrc ZSpriteLib/sprite_hooks.asm
org $308000 org $308000
incsrc ZSpriteLib/sprite_new_table.asm incsrc ZSpriteLib/sprite_new_table.asm
;=========================================================
org $318000
incsrc ZSpriteLib/sprite_new_functions.asm
incsrc "Sprites/NPCs/farore.asm" incsrc "Sprites/NPCs/farore.asm"
print "End of farore.asm ", pc print "End of farore.asm ", pc
incsrc "Sprites/Bosses/kydrog.asm" incsrc "Sprites/Bosses/kydrog.asm"
print "End of kydrog.asm ", pc print "End of kydrog.asm ", pc
;=========================================================
org $318000
incsrc ZSpriteLib/sprite_new_functions.asm
incsrc "Sprites/Bosses/kydrog_boss.asm" incsrc "Sprites/Bosses/kydrog_boss.asm"
print "End of kydrog_boss.asm ", pc print "End of kydrog_boss.asm ", pc