Mask directory organization

This commit is contained in:
scawful
2023-01-15 17:35:34 -06:00
parent fb977da30e
commit 10e3133b0f
8 changed files with 18 additions and 12 deletions

View File

@@ -17,7 +17,6 @@
; (Default = 0D)
; db (10) $40 - Pegasus boots speed (Default = 40)
;
; TODO: draw sprite on link
;===========================================================
org $07A494
@@ -48,7 +47,7 @@ LinkItem_Ether:
}
org $378000
incbin bunny_link.4bpp
incbin gfx/bunny_link.4bpp
UpdateBunnyPalette:
{

View File

@@ -206,19 +206,16 @@ LinkItem_UsingDekuMask:
.recoiling
LDA $46 : BEQ .wait_maybe_not_recoiling
BRL $0783A1 ; Permabunny mode.
.wait_maybe_not_recoiling
LDA.b #$FF : STA $24 : STA $25 : STA $29
STZ $02C6
LDA $034A : BEQ .not_moving
LDA.b #$01 : STA $0335 : STA $0337
LDA.b #$80 : STA $0334 : STA $0336
BRL $9715
@@ -229,15 +226,12 @@ LinkItem_UsingDekuMask:
JSL Link_HandleYItems_Long ; $39B0E IN ROM
LDA $49 : AND.b #$0F : BNE .movement
LDA $F0 : AND.b #$0F : BNE .movement
STA $30 : STA $31 : STA $67 : STA $26
STZ $2E
LDA $48 : AND.b #$F6 : STA $48
LDX.b #$20 : STX $0371
; Ledge timer is reset here the same way as for normal link (unbunny).
@@ -281,7 +275,7 @@ LinkItem_UsingDekuMask:
; =============================================================================
org $358000
incbin deku_link.bin
incbin gfx/deku_link.bin
; =============================================================================

View File

@@ -45,8 +45,12 @@ LinkItem_WolfMask:
RTS
}
; =============================================================================
org $388000
incbin wolf_link.4bpp
incbin gfx/wolf_link.4bpp
; =============================================================================
UpdateWolfPalette:
{
@@ -62,6 +66,15 @@ UpdateWolfPalette:
RTL ; or RTS depending on where you need it
}
; =============================================================================
mypalette:
dw #$7BDE, #$7FFF, #$2F7D, #$19B5, #$3A9C, #$14A5, #$1A3D, #$14B6, #$4650, #$362A, #$3F4E, #$162B, #$318A, #$39CC, #$1CE7, #$76D1, #$6565, #$7271, #$14B5, #$459B, #$3D95, #$22D0, #$567C, #$1890, #$7616, #$0000
dw #$7BDE, #$7FFF, #$2F7D, #$19B5
dw #$3A9C, #$14A5, #$1A3D, #$14B6
dw #$4650, #$362A, #$3F4E, #$162B
dw #$318A, #$39CC, #$1CE7, #$76D1
dw #$6565, #$7271, #$14B5, #$459B
dw #$3D95, #$22D0, #$567C, #$1890
dw #$7616, #$0000
; =============================================================================

View File

@@ -27,4 +27,4 @@ LinkItem_ZoraMask:
}
org $368000
incbin zora_link.4bpp
incbin gfx/zora_link.4bpp