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

add withered deku, deku butler, and deku princess to deku scrub npc

Browse Source
This commit is contained in:
scawful
2024-06-13 11:00:44 -04:00
parent 29f3bd0b11
commit 5fa44e73cb
1 changed files with 84 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

107
Sprites/NPCs/deku_scrub.asm
View File

@@ -54,8 +54,8 @@ Sprite_DekuScrub_Prep:
LDA.l $7EF301 LDA.l $7EF301
BEQ .PlayIntro BEQ .PlayIntro
STZ.w $0DD0, X ; Kill the sprite LDA.b #$04 : STA.w SprAction, X
.PlayIntro .PlayIntro
PLB PLB
RTL RTL
@@ -71,11 +71,15 @@ Sprite_DekuScrub_Main:
dw EstadoInactivo dw EstadoInactivo
dw QuiereCuracion dw QuiereCuracion
dw DarMascara dw DarMascara
dw Untitled dw Regalo
dw Withered
dw DekuButler
dw DekuPrincess
EstadoInactivo: EstadoInactivo:
{ {
%PlayAnimation(0, 1, 16) %PlayAnimation(0, 1, 16)
JSL Sprite_PlayerCantPassThrough
%ShowSolicitedMessage($140) : BCC .no_hablaba %ShowSolicitedMessage($140) : BCC .no_hablaba
%GotoAction(1) %GotoAction(1)
@@ -86,6 +90,7 @@ Sprite_DekuScrub_Main:
QuiereCuracion: QuiereCuracion:
{ {
%PlayAnimation(0, 1, 16) %PlayAnimation(0, 1, 16)
JSL Sprite_PlayerCantPassThrough
LDA $FE : BEQ .ninguna_cancion LDA $FE : BEQ .ninguna_cancion
STZ $FE STZ $FE
LDA.b #$C0 : STA.w SprTimerD, X LDA.b #$C0 : STA.w SprTimerD, X
@@ -107,7 +112,7 @@ Sprite_DekuScrub_Main:
RTS RTS
} }
Untitled: Regalo:
{ {
LDA.w SprTimerD, X : BNE + LDA.w SprTimerD, X : BNE +
@@ -118,6 +123,27 @@ Sprite_DekuScrub_Main:
+ +
RTS RTS
} }
Withered:
{
%PlayAnimation(2, 2, 10)
JSL Sprite_PlayerCantPassThrough
RTS
}
DekuButler:
{
%PlayAnimation(3, 3, 10)
JSL Sprite_PlayerCantPassThrough
RTS
}
DekuPrincess:
{
%PlayAnimation(4, 4, 10)
JSL Sprite_PlayerCantPassThrough
RTS
}
} }
; ============================================================================= ; =============================================================================
@@ -178,23 +204,58 @@ Sprite_DekuScrub_Draw:
RTS RTS
.start_index .start_index
db $00, $04 db $00, $04, $08, $0C, $10
.nbr_of_tiles .nbr_of_tiles
db 3, 3 db 3, 3, 3, 3, 3
.x_offsets .x_offsets
dw 4, -4, -4, 4 dw 4, 4, -4, -4
dw 4, -4, -4, 4 dw 4, -4, -4, 4
.y_offsets dw -8, -8, 8, 8
dw 0, 0, -8, -8 dw -4, 4, -4, 4
dw 0, 0, -8, -8 dw -4, -4, 4, 4
.chr .y_offsets
db $2C, $2C, $0C, $0C dw 4, -4, -4, 4
db $2E, $2E, $0E, $0E dw 4, 4, -4, -4
.properties dw 4, -12, -12, 4
db $33, $73, $33, $73 dw -12, -12, 4, 4
db $33, $73, $33, $73 dw 4, -12, 4, -12
.sizes .chr
db $02, $02, $02, $02 db $2E, $0E, $0E, $2E
db $02, $02, $02, $02 db $2C, $2C, $0C, $0C
db $20, $00, $02, $22
db $04, $05, $24, $25
db $27, $07, $27, $07
.properties
db $3B, $7B, $3B, $7B
db $3B, $7B, $3B, $7B
db $3B, $3B, $3B, $3B
db $3B, $3B, $3B, $3B
db $3B, $3B, $7B, $7B
.sizes
db $02, $02, $02, $02
db $02, $02, $02, $02
db $02, $02, $02, $02
db $02, $02, $02, $02
db $02, $02, $02, $02
; .start_index
; db $00, $04
; .nbr_of_tiles
; db 3, 3
; .x_offsets
; dw 4, -4, -4, 4
; dw 4, -4, -4, 4
; .y_offsets
; dw 0, 0, -8, -8
; dw 0, 0, -8, -8
; .chr
; db $2C, $2C, $0C, $0C
; db $2E, $2E, $0E, $0E
; .properties
; db $33, $73, $33, $73
; db $33, $73, $33, $73
; .sizes
; db $02, $02, $02, $02
; db $02, $02, $02, $02
} }