From 193e7071ec6d34ec5b7ec0e011ee4ede59bcf9a9 Mon Sep 17 00:00:00 2001 From: Justin Scofield <47263509+scawful@users.noreply.github.com> Date: Tue, 4 Oct 2022 22:10:39 -0500 Subject: [PATCH] deku link --- Debug/debug.asm | 6 ++--- Masks/deku_link.bin | Bin 28672 -> 28672 bytes Masks/deku_mask.asm | 52 +++++++++++++++++++++++--------------------- Menu/menu.asm | 2 +- 4 files changed, 31 insertions(+), 29 deletions(-) diff --git a/Debug/debug.asm b/Debug/debug.asm index 7fd9a57..f0c127c 100644 --- a/Debug/debug.asm +++ b/Debug/debug.asm @@ -73,11 +73,11 @@ namespace Debug STA $7EF356 LDA #$01 ; 0 - nothing. 1 - moon pearl. STA $7EF357 - LDA #$04 ; 0-No sword. 1-Fighter Sword. 2-Master Sword. 3-Tempered Sword. 4-Golden Sword + LDA #$01 ; 0-No sword. 1-Fighter Sword. 2-Master Sword. 3-Tempered Sword. 4-Golden Sword STA $7EF359 - LDA #$03 ; 0-No shield. 1-Blue Shield. 2-Hero's Shield. 3-Mirror Shield + LDA #$01 ; 0-No shield. 1-Blue Shield. 2-Hero's Shield. 3-Mirror Shield STA $7EF35A - LDA #$02 ; 0-Green Jerkin. 1-Blue Mail. 2-Red Mail + LDA #$00 ; 0-Green Jerkin. 1-Blue Mail. 2-Red Mail STA $7EF35B LDA #$02 ; 0-No bottle. 1-Mushroom (no use). 2-Empty bottle. 3-Red Potion. 4-Green Potion. 5-Blue Potion. 6-Fairy. 7-Bee. 8-Good Bee STA $7EF35C diff --git a/Masks/deku_link.bin b/Masks/deku_link.bin index 550fcb873b6438c3c5d729bfcc4591af839a42f9..3f22da279242ba219b56f9c9f0fcdb090ce564ea 100644 GIT binary patch delta 2281 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 B@Hzkh diff --git a/Masks/deku_mask.asm b/Masks/deku_mask.asm index 62e7279..91fb3b4 100644 --- a/Masks/deku_mask.asm +++ b/Masks/deku_mask.asm @@ -1,6 +1,31 @@ -; ; Hooks : +; Hooks incsrc "../Sprites/sprite_functions_hooks.asm" +; ============================================================================= +org $008A01 + LDA $BC + +org $07B073 ; *$3B073-$3B086 LOCAL +Link_CheckNewY_ButtonPress: + +org $07A64B +LinkItem_Quake: +{ + JSR Link_CheckNewY_ButtonPress : BCC .return + + LDA $6C : BNE .return ; doorway + + LDA $0FFC : BNE .return ; cantopen menu + + LDA #$40 : STA $BC + +.return + RTS +} + +org $408000 +incbin deku_link.bin + ; org $07A666 ; Deku_Entry: ; { @@ -11,9 +36,6 @@ incsrc "../Sprites/sprite_functions_hooks.asm" ; RTS ; } -org $008A01 - LDA $BC - ; org $1BEDF9 ; JSL Palette_ArmorAndGloves ; 4bytes ; RTL ; 1byte @@ -26,7 +48,7 @@ org $008A01 ; org $06F40C ; JSL change_sprite : NOP #$01 ; LDA $0E20, X : CMP.b #$61 -; ; ; Code : +; Code : ; org $308000 ; Palette_ArmorAndGloves: ; { @@ -95,23 +117,3 @@ org $008A01 ; changing the DP address $BC would now* change the bank link's gfx is read from -; ============================================================================= - -org $07B073 ; *$3B073-$3B086 LOCAL -Link_CheckNewY_ButtonPress: - -org $07A64B -LinkItem_Quake: - JSR Link_CheckNewY_ButtonPress : BCC .return - - LDA $6C : BNE .return ; doorway - - LDA $0FFC : BNE .return ; cantopen menu - - LDA #$40 : STA $BC - - .return -RTS - -org $408000 -incbin deku_link.bin \ No newline at end of file diff --git a/Menu/menu.asm b/Menu/menu.asm index 274edae..07b87cc 100644 --- a/Menu/menu.asm +++ b/Menu/menu.asm @@ -42,7 +42,7 @@ Menu_Entry: { PHB : PHK : PLB LDA.w $0200 : ASL : TAX - + LDA.b #$10 : STA $BC JSR (.vectors,X) SEP #$20