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 550fcb8..3f22da2 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 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