bow stuff
This commit is contained in:
Kat
40
newitems.asm
40
newitems.asm
@@ -28,6 +28,7 @@
|
||||
; #$62 - RNG Pool Item (Single)
|
||||
; #$63 - RNG Pool Item (Multi)
|
||||
; #$64 - Progressive Bow
|
||||
; #$65 - Progressive Bow
|
||||
; #$6A - Goal Item (Single/Triforce)
|
||||
; #$6B - Goal Item (Multi/Power Star)
|
||||
; #$6D- Server Request
|
||||
@@ -297,6 +298,8 @@ AddReceivedItemExpandedGetItem:
|
||||
BRL .done
|
||||
+ CMP.b #$64 : BNE + ; Progressive Bow
|
||||
BRL .done
|
||||
+ CMP.b #$65 : BNE + ; Progressive Bow
|
||||
BRL .done
|
||||
+ CMP.b #$6A : BNE + ; Goal Collectable (Single/Triforce)
|
||||
JSL.l ActivateGoal
|
||||
BRL .done
|
||||
@@ -469,11 +472,14 @@ AddReceivedItemExpanded:
|
||||
LDA.b #$1B : STA $02D8 : BRA .done
|
||||
+ ; Everything Else
|
||||
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.b #$3A : STA $02D8 : BRA .done
|
||||
+ ; Any Bow
|
||||
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)
|
||||
JSL.l GetRNGItemSingle : STA $02D8
|
||||
XBA : JSR.w MarkRNGItemSingle
|
||||
@@ -520,8 +526,8 @@ AddReceivedItemExpanded:
|
||||
db -4, -4, -4 ; Red, Blue & Green Clocks
|
||||
db -4, -4, -4, -4 ; Progressive Sword, Shield, Armor & Gloves
|
||||
db -4, -4 ; RNG Single & Multi
|
||||
db -4 ; Progressive Bow
|
||||
db -4, -4, -4, -4, -4 ; Unused
|
||||
db -4, -4 ; Progressive Bow x2
|
||||
db -4, -4, -4, -4 ; Unused
|
||||
db -4, -4, -4 ; Goal Item Single, Multi & Alt Multi
|
||||
db -4, -4, -4 ; Unused
|
||||
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, 0 ; Progressive Sword, Shield, Armor & Gloves
|
||||
db 0, 0 ; RNG Single & Multi
|
||||
db 0 ; Progressive Bow
|
||||
db 0, 0, 0, 0, 0 ; Unused
|
||||
db 0, 0 ; Progressive Bow x2
|
||||
db 0, 0, 0, 0 ; Unused
|
||||
db 0, 0, 0 ; Goal Item Single, Multi & Alt Multi
|
||||
db 0, 0, 0 ; Unused
|
||||
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 $FF, $FF, $04, $0D ; Progressive Sword, Shield, Armor & Gloves
|
||||
db $FF, $FF ; RNG Single & Multi
|
||||
db $FF ; Progressive Bow
|
||||
db $FF, $FF, $FF, $FF, $FF ; Unused
|
||||
db $FF, $FF ; Progressive Bow x2
|
||||
db $FF, $FF, $FF, $FF ; Unused
|
||||
db $49, $4A, $49 ; Goal Item Single, Multi & Alt Multi
|
||||
db $FF, $FF, $FF ; Unused
|
||||
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, $02 ; Progressive Sword, Shield, Armor & Gloves
|
||||
db $02, $02 ; RNG Single & Multi
|
||||
db $02 ; Progressive Bow
|
||||
db $02, $02, $02, $02, $02 ; Unused
|
||||
db $02, $02 ; Progressive Bow x2
|
||||
db $02, $02, $02, $02 ; Unused
|
||||
db $02, $02, $02 ; Goal Item Single, Multi & Alt Multi
|
||||
db $02, $02, $02 ; Unused
|
||||
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 $FF, $FF, $FF, $FF ; Progressive Sword, Shield, Armor & Gloves
|
||||
db $FF, $FF ; RNG Single & Multi
|
||||
db 0 ; Progressive Bow
|
||||
db 0, 0, 0, 0, 0 ; Unused
|
||||
db 0, 0 ; Progressive Bow
|
||||
db 0, 0, 0, 0 ; Unused
|
||||
db 4, 4, 4 ; Goal Item Single, Multi & Alt Multi
|
||||
db 0, 0, 0 ; Unused
|
||||
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 $F359, $F35A, $F35B, $F354 ; Progressive Sword, Shield, Armor & Gloves
|
||||
dw $F36A, $F36A ; RNG Single & Multi
|
||||
dw $F340 ; Progressive Bow
|
||||
dw $F36A, $F36A, $F36A, $F36A, $F36A ; Unused
|
||||
dw $F340, $F340 ; Progressive Bow x2
|
||||
dw $F36A, $F36A, $F36A, $F36A ; Unused
|
||||
dw $F36A, $F36A, $F36A ; Goal Item Single, Multi & Alt Multi
|
||||
dw $F36A, $F36A, $F36A ; Unused
|
||||
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, $FF ; Progressive Sword, Shield, Armor & Gloves
|
||||
db $FF, $FF ; RNG Single & Multi
|
||||
db $FF ; Progressive Bow
|
||||
db $FF, $FF, $FF, $FF, $FF ; Unused
|
||||
db $FF, $FF ; Progressive Bow
|
||||
db $FF, $FF, $FF, $FF ; Unused
|
||||
db $FF, $FF, $FF ; Goal Item Single, Multi & Alt Multi
|
||||
db $FF, $FF, $FF ; Unused
|
||||
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, -1 ; Progressive Sword, Shield, Armor & Gloves
|
||||
db -1, -1 ; RNG Single & Multi
|
||||
db -1 ; Progressive Bow
|
||||
db -1, -1, -1, -1, -1 ; Unused
|
||||
db -1, -1 ; Progressive Bow
|
||||
db -1, -1, -1, -1 ; Unused
|
||||
db -1, -1 ; Goal Item Single, Multi & Alt Multi
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user