From c875e355a0d4ff581625f462de00ac11a98f99cb Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Wed, 11 Jan 2023 20:46:56 -0600
Subject: [PATCH] Add Zarby feather code

---
 Items/jump_feather.asm | 888 +++--------------------------------------
 Oracle_main.asm        |   3 +
 2 files changed, 52 insertions(+), 839 deletions(-)

diff --git a/Items/jump_feather.asm b/Items/jump_feather.asm
index ad4a987..eb49bb8 100644
--- a/Items/jump_feather.asm
+++ b/Items/jump_feather.asm
@@ -1,839 +1,49 @@
-; =============================================================================
-; Disassembly of jumpv9.ips for Oracle of Secrets 
-;
-; cmp -l oos.sfc jump.sfc
-; gawk '{printf "%06X %02X\n", $1, strtonum(0$3)}' 
-
-
-org $012A70 ; 012A70 - 012A73
-  db $22, $D0, $FC, $8E
-
-org $02E23E ; 02E23E - 012E23F
-  db $22, $F0
-
-org $02E240 ; 02E240 - 02E241
-  db $FC, $8E
-
-org $030382 ; 030382 - 030386
-  db $22, $30, $FF, $8E, $EA
-
-org $03812D ; 03812D - 038130
-  db $5C, $A8, $FF, $8E
-
-03813D 20
-03813E C0
-03813F FD
-
-0387F7 20
-0387F8 C2
-0387F9 FE
-
-03880A 22
-03880B 20
-03880C FD
-03880D 87
-
-0388C9 22
-0388CA E3
-0388CB B7
-0388CC 9B
-0388DC 12
-
-038916 22
-038917 20
-038918 B5
-038919 9B
-
-039278 20
-039279 E2
-03927A FD
-
-039319 4C
-03931A E0
-03931B FF
-03931C EA
-
-0393B4 22
-0393B5 40
-0393B6 FC
-0393B7 87
-
-039510 22
-039511 26
-039512 FC
-039513 87
-
-039AF3 C0
-039AF4 FF
-
-03A15C 4C
-03A15D A0
-03A15E FF
-
-03B01F 22
-03B020 F0
-03B021 FE
-03B022 8E
-
-03B067 22
-03B068 F8
-03B069 FE
-03B06A 8E
-
-03B7C8 22
-03B7C9 60
-03B7CA B5
-03B7CB 9B
-
-03C2F9 22
-03C2FA E0
-03C2FB FC
-03C2FC 8E
-
-03DC6D 22
-03DC6E 50
-03DC6F B5
-
-03DC70 9B
-03DC71 EA
-
-03DC94 22
-03DC95 90
-03DC96 FD
-03DC97 87
-
-03FAF1 A5
-03FAF2 3C
-03FAF3 D0
-03FAF4 04
-03FAF5 24
-03FAF6 3A
-03FAF7 70
-03FAF8 03
-03FAF9 4C
-03FAFA C4
-03FAFC 4C
-03FAFD CB
-
-03FC27 8F
-03FC28 6D
-03FC29 F3
-03FC2A 7E
-03FC2B 9C
-03FC2C F8
-03FC2D 02
-03FC2E 6B
-
-03FC41 A9
-03FC42 02
-03FC43 85
-03FC44 5B
-03FC45 9C
-03FC46 F8
-03FC47 02
-03FC48 6B
-
-03FD21 64
-03FD22 2E
-03FD23 64
-03FD24 46
-03FD25 AD
-03FD26 01
-03FD27 03
-03FD28 C9
-03FD29 20
-03FD2A D0
-03FD2B 09
-03FD2C A9
-03FD2D 30
-03FD2E 85
-03FD2F 46
-
-03FD30 85
-03FD31 B6
-03FD32 9C
-03FD33 01
-03FD34 03
-03FD35 6B
-
-
-03FD91 AD
-03FD92 01
-03FD93 03
-03FD94 29
-03FD96 00
-03FD97 C9
-03FD98 20
-03FD99 00
-03FD9A F0
-03FD9B 05
-03FD9C A5
-03FD9D 0A
-03FD9E 04
-03FD9F 59
-
-
-03FDA0 6B
-03FDA1 64
-03FDA2 59
-03FDA3 6B
-
-
-03FDC1 9C
-03FDC2 0D
-03FDC3 03
-03FDC4 9C
-03FDC5 12
-03FDC6 01
-03FDC7 60
-
-
-03FDE3 8D
-03FDE4 F8
-03FDE5 02
-03FDE6 9C
-03FDE7 0F
-03FDE8 03
-03FDE9 22
-03FDEA D7
-03FDEC 8E
-03FDED 60
-
-
-03FEC3 AD
-03FEC4 01
-03FEC5 03
-03FEC6 C9
-03FEC7 20
-03FEC8 F0
-03FEC9 03
-03FECA 9C
-03FECB 03
-03FECC 01
-03FECD 60
-
-03FFA1 AD
-03FFA2 0D
-03FFA3 03
-03FFA4 D0
-03FFA5 18
-03FFA6 AD
-03FFA7 00
-03FFA8 03
-03FFA9 D0
-03FFAA 13
-03FFAB AF
-03FFAC 20
-03FFAD 50
-03FFAE 7F
-03FFAF AA
-
-
-03FFB0 BF
-03FFB1 5B
-03FFB2 F3
-03FFB3 7E
-03FFB4 C9
-03FFB5 02
-03FFB6 F0
-03FFB7 06
-03FFB8 20
-03FFB9 73
-03FFBA B0
-03FFBB 4C
-03FFBC 5E
-03FFBD A1
-03FFBE 4C
-03FFBF F8
-03FFC0 AF
-03FFC1 4C
-03FFC2 F0
-03FFC3 FA
-03FFC4 EA
-03FFC5 20
-03FFC6 73
-03FFC7 B0
-03FFC8 9C
-03FFC9 0F
-03FFCA 03
-03FFCB 60
-03FFCC 22
-03FFCD 50
-03FFCF 8E
-03FFD0 60
-
-03FFE1 29
-03FFE2 01
-03FFE3 D0
-03FFE4 03
-03FFE5 4C
-03FFE6 1C
-03FFE7 93
-03FFE8 AD
-03FFE9 01
-03FFEA 03
-03FFEB C9
-03FFEC 00
-03FFED D0
-03FFEE 03
-03FFEF 4C
-03FFF0 5B
-03FFF1 93
-03FFF2 4C
-03FFF3 1C
-03FFF4 93
-
-0419A5 22
-0419A6 DD
-0419A7 B2
-0419A8 9B
-0419A9 EA
-
-06A207 22
-06A208 30
-06A209 B5
-06A20A 9B
-06A3D1 5C
-06A3D2 C0
-06A3D3 FF
-06A3D4 8E
-06A3D5 EA
-
-077CD1 E2
-077CD2 30
-077CD3 AD
-077CD4 01
-077CD5 03
-077CD6 C9
-077CD7 20
-077CD8 D0
-077CD9 04
-077CDA 22
-077CDB 63
-077CDD 8E
-077CDE A5
-077CDF 8A
-
-077CE0 6B
-077CE1 85
-077CE2 46
-077CE3 AD
-077CE4 01
-077CE5 03
-077CE6 C9
-077CE7 20
-077CE8 D0
-077CE9 04
-077CEA 22
-077CEB 63
-077CED 8E
-077CEE A5
-077CEF 4D
-
-
-077CF0 6B
-077CF1 64
-077CF2 4D
-077CF3 64
-077CF4 46
-077CF5 AD
-077CF6 01
-077CF7 03
-077CF8 C9
-077CF9 20
-077CFA D0
-077CFB 04
-077CFC 22
-077CFD 63
-077CFF 8E
-
-
-077D00 6B
-
-077EF1 A9
-077EF2 01
-077EF3 04
-077EF4 50
-077EF5 8D
-077EF6 12
-077EF7 01
-077EF8 6B
-077EF9 9C
-077EFA 12
-077EFB 01
-077EFC A5
-077EFD 50
-077EFE 29
-077EFF FE
-
-077F00 6B
-
-077F31 64
-077F32 47
-077F33 AD
-077F34 01
-077F35 03
-077F36 C9
-077F37 20
-077F38 F0
-077F39 04
-077F3A 9C
-077F3B 79
-077F3C 03
-077F3D 6B
-077F3E 9C
-077F3F 51
-
-077F40 03
-077F41 A9
-077F42 01
-077F43 8D
-077F44 7B
-077F45 03
-077F46 9C
-077F47 73
-077F48 03
-077F49 64
-077F4A 48
-077F4B A9
-077F4C 40
-077F4D 85
-077F4E 3A
-077F4F 6B
-
-
-077F51 EA
-077F52 EA
-077F53 EA
-077F54 EA
-077F55 EA
-077F56 EA
-077F57 EA
-077F58 EA
-077F59 EA
-077F5A EA
-077F5B EA
-077F5C EA
-077F5D EA
-077F5E EA
-077F5F EA
-077F60 A5
-077F61 6C
-077F62 F0
-077F63 0B
-077F64 A9
-077F65 00
-077F66 8D
-077F67 01
-077F68 03
-077F69 85
-077F6A 3A
-077F6B 4C
-077F6C F4
-077F6E EA
-077F6F AD
-077F70 01
-077F71 03
-077F72 C9
-077F73 20
-077F74 D0
-077F75 01
-077F76 6B
-077F77 64
-077F78 27
-077F79 64
-077F7A 28
-077F7B A9
-077F7C 2C
-077F7D 85
-077F7E 46
-077F7F A9
-077F80 01
-077F81 85
-077F82 4D
-077F83 8D
-077F84 C5
-077F85 02
-077F86 A9
-077F87 16
-077F88 85
-077F89 29
-077F8A 8D
-077F8B C7
-077F8C 02
-077F8D A9
-077F8E 03
-077F8F 85
-077F90 3D
-077F91 9C
-077F92 00
-077F93 03
-077F94 AD
-077F95 01
-077F96 03
-077F97 29
-077F98 DF
-077F99 09
-077F9A 20
-077F9B 8D
-077F9C 01
-077F9D 03
-077F9E A9
-077F9F 05
-077FA0 85
-077FA1 5D
-077FA2 6B
-077FA3 A9
-077FA4 30
-077FA5 85
-077FA6 28
-077FA7 6B
-077FA9 A5
-077FAA 4D
-077FAB D0
-077FAC 04
-077FAD 5C
-077FAE A0
-077FAF 81
-077FB0 07
-077FB1 AD
-077FB2 01
-077FB3 03
-077FB4 C9
-077FB5 00
-077FB6 F0
-077FB7 04
-077FB8 5C
-077FB9 A0
-077FBA 81
-077FBB 07
-077FBC 5C
-077FBD 30
-077FBE 81
-077FBF 87
-077FC1 A5
-077FC2 5D
-077FC3 C9
-077FC4 05
-077FC5 D0
-077FC6 04
-077FC7 5C
-077FC8 DD
-077FC9 A3
-077FCA 8D
-077FCB AD
-077FCC 01
-077FCD 03
-077FCE F0
-077FCF 04
-077FD0 5C
-077FD1 D5
-077FD2 A3
-077FD3 8D
-077FD4 5C
-077FD5 DD
-077FD6 A3
-077FD7 8D
-077FD8 85
-077FD9 5D
-077FDA 8D
-077FDB 00
-077FDC 03
-077FDD 6B
-077FDE EA
-077FDF EA
-077FE0 EA
-077FE1 EA
-077FE2 EA
-077FE3 EA
-077FE4 EA
-077FE5 EA
-077FE6 EA
-077FE7 EA
-077FE8 EA
-077FE9 EA
-077FEA EA
-077FEB EA
-077FEC EA
-077FED EA
-077FEE EA
-077FEF EA
-077FF0 EA
-077FF1 EA
-077FF2 EA
-077FF3 EA
-077FF4 EA
-077FF5 A9
-077FF6 01
-077FF7 85
-077FF8 46
-077FF9 64
-077FFA 4D
-077FFB 9C
-077FFC 00
-077FFD 03
-077FFE 85
-077FFF 5D
-078000 6B
-
-
-0DB2C1 A5
-0DB2C2 4D
-0DB2C3 F0
-0DB2C4 02
-0DB2C5 64
-0DB2C6 B6
-0DB2C7 A5
-0DB2C8 46
-0DB2C9 D0
-0DB2CA 02
-0DB2CB 64
-0DB2CC B6
-0DB2CD A5
-0DB2CE B6
-0DB2CF F0
-0DB2D0 08
-0DB2D1 A5
-0DB2D2 5D
-0DB2D3 F0
-0DB2D4 04
-0DB2D5 64
-0DB2D6 B6
-0DB2D7 64
-0DB2D8 46
-0DB2D9 28
-0DB2DA B9
-0DB2DB 20
-0DB2DC A1
-0DB2DD 6B
-0DB2DE A9
-0DB2DF 01
-0DB2E0 9D
-0DB2E1 EA
-0DB2E2 03
-0DB2E3 A5
-0DB2E4 5D
-0DB2E5 C9
-0DB2E6 05
-0DB2E7 F0
-0DB2E8 01
-0DB2E9 6B
-0DB2EA BD
-0DB2EB 4A
-0DB2EC 0C
-0DB2ED C9
-0DB2EE 2C
-0DB2EF F0
-0DB2F0 01
-0DB2F1 6B
-0DB2F2 22
-0DB2F3 63
-0DB2F5 8E
-0DB2F6 6B
-
-
-0DB501 AD
-0DB502 02
-0DB503 02
-0DB504 C9
-0DB505 10
-0DB506 D0
-0DB507 11
-0DB508 AF
-0DB509 20
-0DB50A 50
-0DB50B 7F
-0DB50C 3A
-0DB50D 9B
-0DB50E AA
-0DB50F BF
-0DB510 5C
-0DB511 F3
-0DB512 7E
-0DB513 C9
-0DB514 02
-0DB515 D0
-0DB516 01
-0DB517 6B
-0DB518 BB
-0DB519 BF
-0DB51A 5C
-0DB51B F3
-0DB51C 7E
-0DB51D 6B
-0DB521 AD
-0DB522 01
-0DB523 03
-0DB524 C9
-0DB525 20
-0DB526 F0
-0DB527 05
-0DB528 A9
-0DB529 02
-0DB52A 85
-0DB52B EE
-0DB52C 6B
-0DB52D 64
-0DB52E EE
-0DB52F 6B
-0DB531 A8
-0DB532 AD
-0DB533 01
-0DB534 03
-0DB535 29
-0DB537 00
-0DB538 C9
-0DB539 20
-0DB53A 00
-0DB53B D0
-0DB53C 04
-0DB53D A9
-0DB53E 00
-0DB53F 00
-0DB540 6B
-0DB541 08
-0DB542 E2
-0DB543 20
-0DB544 4C
-0DB545 C0
-0DB546 B2
-0DB551 B9
-0DB552 55
-0DB553 DC
-0DB554 85
-0DB555 6E
-0DB556 E2
-0DB557 30
-0DB558 A9
-0DB559 01
-0DB55A 85
-0DB55B 8E
-0DB55C C2
-0DB55D 30
-0DB55E 6B
-0DB561 64
-0DB562 6E
-0DB563 64
-0DB564 38
-0DB565 64
-0DB566 8E
-0DB567 6B
-0DB568 64
-0DB569 28
-0DB56A 64
-0DB56B 3C
-0DB56C 64
-0DB56D 79
-0DB56E 64
-0DB56F 50
-0DB570 64
-0DB571 5E
-0DB572 6B
-0DB5E1 AD
-0DB5E2 F8
-0DB5E3 02
-0DB5E4 F0
-0DB5E5 0B
-0DB5E6 A5
-0DB5E7 01
-0DB5E8 29
-0DB5E9 40
-0DB5EA C9
-0DB5EB 40
-0DB5EC D0
-0DB5ED 02
-0DB5EE 85
-0DB5EF F0
-0DB5F0 6B
-0DB5F1 AD
-0DB5F2 01
-0DB5F3 03
-0DB5F4 4C
-0DB5F5 2A
-0DB5F6 B5
-
-
-
-0DB781 64
-0DB782 11
-0DB783 64
-0DB784 B0
-0DB785 A5
-0DB786 10
-0DB787 C9
-0DB788 0F
-0DB789 D0
-0DB78A 03
-0DB78B 9C
-0DB78C F8
-0DB78D 02
-0DB78E 6B
-0DB7CA 85
-0DB7CB 28
-0DB7CC BD
-0DB7CD 20
-0DB7CE 0E
-0DB7CF C9
-0DB7D0 93
-0DB7D1 D0
-0DB7D2 0A
-0DB7D3 A5
-0DB7D4 5D
-0DB7D5 C9
-0DB7D6 05
-0DB7D7 D0
-0DB7D8 04
-0DB7D9 22
-0DB7DA 63
-0DB7DC 8E
-0DB7DD A9
-0DB7DE 14
-0DB7DF 6B
-0DB7E0 EA
-0DB7E1 EA
-0DB7E2 EA
-0DB7E3 6B
-0DB7E4 A5
-0DB7E5 5D
-0DB7E6 C9
-0DB7E7 05
-0DB7E8 D0
-0DB7E9 10
-0DB7EA A5
-0DB7EB 27
-0DB7EC 29
-0DB7ED 08
-0DB7EE D0
-0DB7EF 06
-0DB7F0 A5
-0DB7F1 28
-0DB7F2 29
-0DB7F3 08
-0DB7F4 F0
-0DB7F5 04
-0DB7F6 64
-0DB7F7 27
-0DB7F8 64
-0DB7F9 28
-0DB7FA A2
-0DB7FB 18
-0DB7FC A5
-0DB7FD 67
-0DB7FE 6B
-
-
-0DBD74 22
-0DBD75 80
-0DBD76 B7
-0DBD77 9B
-
-0F29BF 22
-
-0F29C0 C9
-0F29C1 B7
-0F29C2 9B
-
-0F5E32 22
-0F5E33 00
-0F5E34 B5
-0F5E35 9B
\ No newline at end of file
+; Zarby Feather 
+
+org $07AFF8
+BIT $3A : BVS .return ;if Y or B are already pressed
+
+LDA $6C : BNE .return ; if we are standing in a dooray or not
+
+JSR $B073 : BCC .return; Check if we just pressed Y Button  ; Link_CheckNewY_ButtonPress
+    JSL NewBookCode
+
+.return
+RTS
+
+org $348000
+NewBookCode:
+JSL $07983A ; Reset swim state
+LDA $46 : BNE .cantuseit
+LDA #$02 : STA $5D ; state recoil
+LDA #$01 : STA $4D ; state recoil 2
+
+LDA #$20 ; Change this to change the length of the jump
+
+STA $46 
+
+LDA #$24 ; Change this to change the height of the jump
+
+STA $29 : STA $02C7
+LDA #$08 : STA $0340 : STA $67
+STZ $31
+STZ $30
+
+LDA $F4 : AND #$08 : BEQ .noUp
+    LDA #-8 ; Change that -8 if you want higher speed moving up
+    STA $27
+.noUp
+LDA $F4 : AND #$04 : BEQ .noDown
+    LDA #8  ; Change that -8 if you want higher speed moving down
+    STA $27
+.noDown
+LDA $F4 : AND #$02 : BEQ .noLeft
+    LDA #-8 ; Change that -8 if you want higher speed moving left
+    STA $28
+.noLeft
+LDA $F4 : AND #$01 : BEQ .noRight
+    LDA #8  ; Change that 8 if you want higher speed moving right
+    STA $28
+.noRight
+.cantuseit
+RTL
\ No newline at end of file
diff --git a/Oracle_main.asm b/Oracle_main.asm
index 6333083..702a949 100644
--- a/Oracle_main.asm
+++ b/Oracle_main.asm
@@ -22,6 +22,9 @@ namespace Oracle
   incsrc "Util/ram.asm"
   incsrc "Util/functions.asm"
 
+  incsrc "Items/jump_feather.asm"
+  print  "End of Items/jump_feather.asm     ", pc
+
   incsrc "Graphics/boat_gfx.asm"
   print  "End of Graphics/boat_gfx.asm      ", pc