Merge branch 'develop' of https://github.com/pkali/scorch_src into develop

This commit is contained in:
Pecusx
2022-08-15 14:34:18 +02:00
+10 -10
View File
@@ -269,8 +269,6 @@ AfterManualPurchase
;-------------------------------------------------- ;--------------------------------------------------
.proc Purchase ; .proc Purchase ;
;-------------------------------------------------- ;--------------------------------------------------
; TODO: when round ends with a weapon depleted the pointer points to an empty line
; In tanknr there is a number of the tank (player) ; In tanknr there is a number of the tank (player)
; that is buying weapons now (from 0). ; that is buying weapons now (from 0).
; Rest of the data is taken from appropriate tables ; Rest of the data is taken from appropriate tables
@@ -679,17 +677,19 @@ ChoosingItemForPurchase
PurchaseKeyUp PurchaseKeyUp
lda WhichList lda WhichList
beq GoUp1 beq GoUpOffensive
dec PositionOnTheList dec PositionOnTheList
bpl EndUpX bpl EndUpX
lda #$00 ldy #0 ;HowManyOnTheListDef
sta PositionOnTheList ;dey
sty PositionOnTheList
jmp ChoosingItemForPurchase jmp ChoosingItemForPurchase
GoUp1 GoUpOffensive
dec PositionOnTheList dec PositionOnTheList
bpl MakeOffsetUp bpl MakeOffsetUp
lda #$00 ldy #0 ;HowManyOnTheListOff
sta PositionOnTheList ;dey
sty PositionOnTheList
MakeOffsetUp MakeOffsetUp
; If offset is larger than pointer position, ; If offset is larger than pointer position,
@@ -702,7 +702,7 @@ EndUpX
jmp ChoosingItemForPurchase jmp ChoosingItemForPurchase
PurchaseKeyDown PurchaseKeyDown
lda WhichList lda WhichList
beq GoDown1 beq GoDownOffensive
inc:lda PositionOnTheList inc:lda PositionOnTheList
cmp HowManyOnTheListDef cmp HowManyOnTheListDef
bne EndGoDownX bne EndGoDownX
@@ -710,7 +710,7 @@ PurchaseKeyDown
dey dey
sty PositionOnTheList sty PositionOnTheList
jmp ChoosingItemForPurchase jmp ChoosingItemForPurchase
GoDown1 GoDownOffensive
inc:lda PositionOnTheList inc:lda PositionOnTheList
cmp HowManyOnTheListOff cmp HowManyOnTheListOff
bne MakeOffsetDown bne MakeOffsetDown