alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bow stuff

Browse Source
This commit is contained in:
Kat
2019-08-21 14:26:55 -04:00
parent b576ba4b7d
commit 7e45c3265e
4 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
inventory.asm
View File

@@ -15,10 +15,10 @@
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
!INVENTORY_SWAP_2 = "$7EF38E" !INVENTORY_SWAP_2 = "$7EF38E"
; Item Tracking Slot #2 ; Item Tracking Slot #2
; bs------ ; bsp-----
; b = bow ; b = bow
; s = silver arrow bow ; s = silver arrow bow
; - ; p = 2nd progressive bow
; - ; -
; - ; -
; - ; -
@@ -531,6 +531,10 @@ AddInventory:
+ CPY.b #$61 : BNE + ; Progressive Lifting Glove + CPY.b #$61 : BNE + ; Progressive Lifting Glove
JSR .incrementA JSR .incrementA
BRL .done BRL .done
+ CPY.b #$64 : !BLT + ; Items $64 & $65 - Progressive Bow
CPY.b #$66 : !BGE +
JSR .incrementBow
BRL .done
+ CPY.b #$70 : !BLT + ; Items $70 - $7F - Free Maps + CPY.b #$70 : !BLT + ; Items $70 - $7F - Free Maps
CPY.b #$80 : !BGE + CPY.b #$80 : !BGE +
JSR .incrementMap JSR .incrementMap

40
newitems.asm
View File

@@ -28,6 +28,7 @@
; #$62 - RNG Pool Item (Single) ; #$62 - RNG Pool Item (Single)
; #$63 - RNG Pool Item (Multi) ; #$63 - RNG Pool Item (Multi)
; #$64 - Progressive Bow ; #$64 - Progressive Bow
; #$65 - Progressive Bow
; #$6A - Goal Item (Single/Triforce) ; #$6A - Goal Item (Single/Triforce)
; #$6B - Goal Item (Multi/Power Star) ; #$6B - Goal Item (Multi/Power Star)
; #$6D- Server Request ; #$6D- Server Request
@@ -297,6 +298,8 @@ AddReceivedItemExpandedGetItem:
BRL .done BRL .done
+ CMP.b #$64 : BNE + ; Progressive Bow + CMP.b #$64 : BNE + ; Progressive Bow
BRL .done BRL .done
+ CMP.b #$65 : BNE + ; Progressive Bow
BRL .done
+ CMP.b #$6A : BNE + ; Goal Collectable (Single/Triforce) + CMP.b #$6A : BNE + ; Goal Collectable (Single/Triforce)
JSL.l ActivateGoal JSL.l ActivateGoal
BRL .done BRL .done
@@ -469,11 +472,14 @@ AddReceivedItemExpanded:
LDA.b #$1B : STA $02D8 : BRA .done LDA.b #$1B : STA $02D8 : BRA .done
+ ; Everything Else + ; Everything Else
LDA.b #$1C : STA $02D8 : BRA .done LDA.b #$1C : STA $02D8 : BRA .done
++ : CMP.b #$64 : BNE ++ ; Progressive Bow ++ : CMP.b #$64 : BNE ++ : -- ; Progressive Bow
LDA $7EF340 : BNE + ; No Bow LDA $7EF340 : BNE + ; No Bow
LDA.b #$3A : STA $02D8 : BRA .done LDA.b #$3A : STA $02D8 : BRA .done
+ ; Any Bow + ; Any Bow
LDA.b #$3B : STA $02D8 : BRA .done LDA.b #$3B : STA $02D8 : BRA .done
++ : CMP.b #$65 : BNE ++ ; Progressive Bow 2
LDA #$20 : TSB !INVENTORY_SWAP_2
BRA --
++ : CMP.b #$62 : BNE ++ ; RNG Item (Single) ++ : CMP.b #$62 : BNE ++ ; RNG Item (Single)
JSL.l GetRNGItemSingle : STA $02D8 JSL.l GetRNGItemSingle : STA $02D8
XBA : JSR.w MarkRNGItemSingle XBA : JSR.w MarkRNGItemSingle
@@ -520,8 +526,8 @@ AddReceivedItemExpanded:
db -4, -4, -4 ; Red, Blue & Green Clocks db -4, -4, -4 ; Red, Blue & Green Clocks
db -4, -4, -4, -4 ; Progressive Sword, Shield, Armor & Gloves db -4, -4, -4, -4 ; Progressive Sword, Shield, Armor & Gloves
db -4, -4 ; RNG Single & Multi db -4, -4 ; RNG Single & Multi
db -4 ; Progressive Bow db -4, -4 ; Progressive Bow x2
db -4, -4, -4, -4, -4 ; Unused db -4, -4, -4, -4 ; Unused
db -4, -4, -4 ; Goal Item Single, Multi & Alt Multi db -4, -4, -4 ; Goal Item Single, Multi & Alt Multi
db -4, -4, -4 ; Unused db -4, -4, -4 ; Unused
db -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4 ; Free Map db -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4, -4 ; Free Map
@@ -559,8 +565,8 @@ AddReceivedItemExpanded:
db 0, 0, 0 ; Red, Blue & Green Clocks db 0, 0, 0 ; Red, Blue & Green Clocks
db 0, 0, 0, 0 ; Progressive Sword, Shield, Armor & Gloves db 0, 0, 0, 0 ; Progressive Sword, Shield, Armor & Gloves
db 0, 0 ; RNG Single & Multi db 0, 0 ; RNG Single & Multi
db 0 ; Progressive Bow db 0, 0 ; Progressive Bow x2
db 0, 0, 0, 0, 0 ; Unused db 0, 0, 0, 0 ; Unused
db 0, 0, 0 ; Goal Item Single, Multi & Alt Multi db 0, 0, 0 ; Goal Item Single, Multi & Alt Multi
db 0, 0, 0 ; Unused db 0, 0, 0 ; Unused
db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Free Map db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Free Map
@@ -600,8 +606,8 @@ AddReceivedItemExpanded:
db $48, $48, $48 ; Red, Blue & Green Clocks db $48, $48, $48 ; Red, Blue & Green Clocks
db $FF, $FF, $04, $0D ; Progressive Sword, Shield, Armor & Gloves db $FF, $FF, $04, $0D ; Progressive Sword, Shield, Armor & Gloves
db $FF, $FF ; RNG Single & Multi db $FF, $FF ; RNG Single & Multi
db $FF ; Progressive Bow db $FF, $FF ; Progressive Bow x2
db $FF, $FF, $FF, $FF, $FF ; Unused db $FF, $FF, $FF, $FF ; Unused
db $49, $4A, $49 ; Goal Item Single, Multi & Alt Multi db $49, $4A, $49 ; Goal Item Single, Multi & Alt Multi
db $FF, $FF, $FF ; Unused db $FF, $FF, $FF ; Unused
db $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21 ; Free Map db $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21 ; Free Map
@@ -644,8 +650,8 @@ AddReceivedItemExpanded:
db $02, $02, $02 ; Red, Blue & Green Clocks db $02, $02, $02 ; Red, Blue & Green Clocks
db $02, $02, $02, $02 ; Progressive Sword, Shield, Armor & Gloves db $02, $02, $02, $02 ; Progressive Sword, Shield, Armor & Gloves
db $02, $02 ; RNG Single & Multi db $02, $02 ; RNG Single & Multi
db $02 ; Progressive Bow db $02, $02 ; Progressive Bow x2
db $02, $02, $02, $02, $02 ; Unused db $02, $02, $02, $02 ; Unused
db $02, $02, $02 ; Goal Item Single, Multi & Alt Multi db $02, $02, $02 ; Goal Item Single, Multi & Alt Multi
db $02, $02, $02 ; Unused db $02, $02, $02 ; Unused
db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Free Map db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Free Map
@@ -685,8 +691,8 @@ AddReceivedItemExpanded:
db 1, 2, 4 ; Red, Blue & Green Clocks db 1, 2, 4 ; Red, Blue & Green Clocks
db $FF, $FF, $FF, $FF ; Progressive Sword, Shield, Armor & Gloves db $FF, $FF, $FF, $FF ; Progressive Sword, Shield, Armor & Gloves
db $FF, $FF ; RNG Single & Multi db $FF, $FF ; RNG Single & Multi
db 0 ; Progressive Bow db 0, 0 ; Progressive Bow
db 0, 0, 0, 0, 0 ; Unused db 0, 0, 0, 0 ; Unused
db 4, 4, 4 ; Goal Item Single, Multi & Alt Multi db 4, 4, 4 ; Goal Item Single, Multi & Alt Multi
db 0, 0, 0 ; Unused db 0, 0, 0 ; Unused
db 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Free Map db 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Free Map
@@ -726,8 +732,8 @@ AddReceivedItemExpanded:
dw $F454, $F454, $F454 ; Red, Blue & Green Clocks dw $F454, $F454, $F454 ; Red, Blue & Green Clocks
dw $F359, $F35A, $F35B, $F354 ; Progressive Sword, Shield, Armor & Gloves dw $F359, $F35A, $F35B, $F354 ; Progressive Sword, Shield, Armor & Gloves
dw $F36A, $F36A ; RNG Single & Multi dw $F36A, $F36A ; RNG Single & Multi
dw $F340 ; Progressive Bow dw $F340, $F340 ; Progressive Bow x2
dw $F36A, $F36A, $F36A, $F36A, $F36A ; Unused dw $F36A, $F36A, $F36A, $F36A ; Unused
dw $F36A, $F36A, $F36A ; Goal Item Single, Multi & Alt Multi dw $F36A, $F36A, $F36A ; Goal Item Single, Multi & Alt Multi
dw $F36A, $F36A, $F36A ; Unused dw $F36A, $F36A, $F36A ; Unused
dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Free Map dw $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A, $F36A ; Free Map
@@ -769,8 +775,8 @@ AddReceivedItemExpanded:
db $FF, $FF, $FF ; Red, Blue & Green Clocks db $FF, $FF, $FF ; Red, Blue & Green Clocks
db $FF, $FF, $FF, $FF ; Progressive Sword, Shield, Armor & Gloves db $FF, $FF, $FF, $FF ; Progressive Sword, Shield, Armor & Gloves
db $FF, $FF ; RNG Single & Multi db $FF, $FF ; RNG Single & Multi
db $FF ; Progressive Bow db $FF, $FF ; Progressive Bow
db $FF, $FF, $FF, $FF, $FF ; Unused db $FF, $FF, $FF, $FF ; Unused
db $FF, $FF, $FF ; Goal Item Single, Multi & Alt Multi db $FF, $FF, $FF ; Goal Item Single, Multi & Alt Multi
db $FF, $FF, $FF ; Unused db $FF, $FF, $FF ; Unused
db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF ; Free Map db $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF, $FF ; Free Map
@@ -854,8 +860,8 @@ Link_ReceiveItemAlternatesExpanded:
db -1, -1, -1 ; Red, Blue & Green Clocks db -1, -1, -1 ; Red, Blue & Green Clocks
db -1, -1, -1, -1 ; Progressive Sword, Shield, Armor & Gloves db -1, -1, -1, -1 ; Progressive Sword, Shield, Armor & Gloves
db -1, -1 ; RNG Single & Multi db -1, -1 ; RNG Single & Multi
db -1 ; Progressive Bow db -1, -1 ; Progressive Bow
db -1, -1, -1, -1, -1 ; Unused db -1, -1, -1, -1 ; Unused
db -1, -1 ; Goal Item Single, Multi & Alt Multi db -1, -1 ; Goal Item Single, Multi & Alt Multi
db -1, -1, -1, -1 ; Unused db -1, -1, -1, -1 ; Unused
db -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ; Free Map db -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 ; Free Map

1
tables.asm
View File

@@ -1257,6 +1257,7 @@ db $04
;63:RNG Pool Item (Multi) ;63:RNG Pool Item (Multi)
;64:Progressive Bow ;64:Progressive Bow
;65:Progressive Bow
;6A:Goal Item (Single/Triforce) ;6A:Goal Item (Single/Triforce)
;6B:Goal Item (Multi/Power Star) ;6B:Goal Item (Multi/Power Star)

8
utilities.asm
View File

@@ -116,8 +116,8 @@ RTL
;6x ;6x
db $FD, $0D ; Progressive Armor & Gloves db $FD, $0D ; Progressive Armor & Gloves
db $FA, $FB ; RNG Single & Multi db $FA, $FB ; RNG Single & Multi
db $F8 ; Progressive Bow db $F8, $F8 ; Progressive Bow x2
db $FF, $FF, $FF, $FF, $FF ; Unused db $FF, $FF, $FF, $FF ; Unused
db $49, $4A, $49 ; Goal Item Single, Multi & Alt Multi db $49, $4A, $49 ; Goal Item Single, Multi & Alt Multi
db $FF, $FF, $FF ; Unused db $FF, $FF, $FF ; Unused
@@ -251,8 +251,8 @@ RTL
db $02, $04, $08 ; Red, Blue & Green Clocks db $02, $04, $08 ; Red, Blue & Green Clocks
db $FD, $FE, $FF, $FC ; Progressive Sword, Shield, Armor & Gloves db $FD, $FE, $FF, $FC ; Progressive Sword, Shield, Armor & Gloves
db $FA, $FB ; RNG Single & Multi db $FA, $FB ; RNG Single & Multi
db $F8 ; Progressive Bow db $F8, $F8 ; Progressive Bow
db $00, $00, $00, $00, $00 ; Unused db $00, $00, $00, $00 ; Unused
db $08, $08, $08 ; Goal Item Single, Multi & Alt Multi db $08, $08, $08 ; Goal Item Single, Multi & Alt Multi
db $00, $00, $00 ; Unused db $00, $00, $00 ; Unused
db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Free Map db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Free Map