diff --git a/Masks/bunny_hood.asm b/Masks/bunny_hood.asm index ae01b50..27540bf 100644 --- a/Masks/bunny_hood.asm +++ b/Masks/bunny_hood.asm @@ -20,6 +20,29 @@ ; TODO: draw sprite on link ;=========================================================== +org $07A494 +LinkItem_Ether: +{ + JSR Link_CheckNewY_ButtonPress : BCC .return + + LDA $6C : BNE .return ; doorway + + LDA $0FFC : BNE .return ; cantopen menu + + LDY.b #$04 + LDA.b #$23 + + JSL AddTransformationCloud + + LDA #$37 : STA $BC + +.return + RTS +} + +org $378000 +incbin bunny_link.4bpp + namespace BunnyHood { Main: @@ -50,4 +73,5 @@ namespace BunnyHood org $20AF70 ; this selects the new speed values db $20, $12, $0a, $18, $10, $08, $08, $04, $0c, $10, $09, $19, $14, $0d, $10, $08, $40 } ; label Main + } ; namespace BunnyHood diff --git a/Masks/bunny_link.4bpp b/Masks/bunny_link.4bpp new file mode 100644 index 0000000..7cc5285 Binary files /dev/null and b/Masks/bunny_link.4bpp differ diff --git a/Masks/deku_link.bin b/Masks/deku_link.bin index fa70214..dbbde37 100644 Binary files a/Masks/deku_link.bin and b/Masks/deku_link.bin differ diff --git a/Masks/deku_mask.asm b/Masks/deku_mask.asm index 2fe8def..af26b8a 100644 --- a/Masks/deku_mask.asm +++ b/Masks/deku_mask.asm @@ -1,14 +1,10 @@ ; Hooks incsrc "../Sprites/sprite_functions_hooks.asm" - ; ============================================================================= org $008A01 LDA $BC -org $07B073 ; *$3B073-$3B086 LOCAL -Link_CheckNewY_ButtonPress: - org $07A64B LinkItem_Quake: { @@ -18,16 +14,20 @@ LinkItem_Quake: LDA $0FFC : BNE .return ; cantopen menu - LDA #$40 : STA $BC + LDY.b #$04 + LDA.b #$23 + + JSL AddTransformationCloud + + LDA #$35 : STA $BC .return RTS } -org $408000 +org $358000 incbin deku_link.bin - org $1BEDF9 JSL Palette_ArmorAndGloves ; 4bytes RTL ; 1byte diff --git a/Masks/mask_routines.asm b/Masks/mask_routines.asm new file mode 100644 index 0000000..e5cecc2 --- /dev/null +++ b/Masks/mask_routines.asm @@ -0,0 +1,9 @@ +org $09912C +AddTransformationCloud: + +org $07B073 +Link_CheckNewY_ButtonPress: + +org $078028 +Player_DoSfx2: + diff --git a/Masks/wolf_link.4bpp b/Masks/wolf_link.4bpp new file mode 100644 index 0000000..59fb3c6 Binary files /dev/null and b/Masks/wolf_link.4bpp differ diff --git a/Masks/wolf_mask.asm b/Masks/wolf_mask.asm new file mode 100644 index 0000000..2d9bf9c --- /dev/null +++ b/Masks/wolf_mask.asm @@ -0,0 +1,9 @@ +org $318000 +LinkItem_WolfMask: +{ + +} + + +org $388000 +incbin wolf_link.4bpp \ No newline at end of file diff --git a/Masks/zora_mask.asm b/Masks/zora_mask.asm index a85ad02..78a50c3 100644 --- a/Masks/zora_mask.asm +++ b/Masks/zora_mask.asm @@ -9,11 +9,18 @@ LinkItem_ZoraMask: LDA $0FFC : BNE .return ; cantopen menu - LDA #$41 : STA $BC + LDY.b #$04 + LDA.b #$23 + + JSL AddTransformationCloud + + LDA.b #$14 : JSR Player_DoSfx2 + + LDA #$36 : STA $BC .return RTS } -org $418000 +org $368000 incbin zora_link.4bpp \ No newline at end of file