Arrays end with -1, not $ff
This commit is contained in:
@@ -1,11 +1,13 @@
|
||||
SLOTS_NOBIAS EQU -1
|
||||
SLOTS_NOMATCH EQU -1
|
||||
SLOTS_SEVEN EQU $00
|
||||
SLOTS_NO_BIAS EQU -1
|
||||
SLOTS_NO_MATCH EQU -1
|
||||
|
||||
SLOTS_SEVEN EQU $00
|
||||
SLOTS_POKEBALL EQU $04
|
||||
SLOTS_CHERRY EQU $08
|
||||
SLOTS_PIKACHU EQU $0c
|
||||
SLOTS_CHERRY EQU $08
|
||||
SLOTS_PIKACHU EQU $0c
|
||||
SLOTS_SQUIRTLE EQU $10
|
||||
SLOTS_STARYU EQU $14
|
||||
SLOTS_STARYU EQU $14
|
||||
|
||||
REEL_SIZE EQU 15
|
||||
|
||||
; Constants for slot_reel offsets (see macros/wram.asm)
|
||||
@@ -148,7 +150,7 @@ _SlotMachine:
|
||||
ld [hl], $40
|
||||
xor a ; SLOTS_INIT
|
||||
ld [wJumptableIndex], a
|
||||
ld a, SLOTS_NOBIAS
|
||||
ld a, SLOTS_NO_BIAS
|
||||
ld [wSlotBias], a
|
||||
ld de, MUSIC_GAME_CORNER
|
||||
call PlayMusic
|
||||
@@ -309,7 +311,7 @@ SlotsAction_Init: ; 9287e (24:687e)
|
||||
xor a
|
||||
ld [wFirstTwoReelsMatching], a
|
||||
ld [wFirstTwoReelsMatchingSevens], a
|
||||
ld a, SLOTS_NOMATCH
|
||||
ld a, SLOTS_NO_MATCH
|
||||
ld [wSlotMatched], a
|
||||
ret
|
||||
|
||||
@@ -417,7 +419,7 @@ SlotsAction_WaitStopReel3: ; 9293a (24:693a)
|
||||
|
||||
SlotsAction_FlashIfWin: ; 92955 (24:6955)
|
||||
ld a, [wSlotMatched]
|
||||
cp SLOTS_NOMATCH
|
||||
cp SLOTS_NO_MATCH
|
||||
jr nz, .GotIt
|
||||
call SlotsAction_Next
|
||||
call SlotsAction_Next
|
||||
@@ -587,7 +589,7 @@ Slots_StopReel2: ; 92a2e (24:6a2e)
|
||||
ld a, [wSlotBias]
|
||||
and a
|
||||
jr z, .skip
|
||||
cp SLOTS_NOBIAS
|
||||
cp SLOTS_NO_BIAS
|
||||
jr nz, .dont_jump
|
||||
.skip
|
||||
call .CheckReel1ForASeven
|
||||
@@ -997,7 +999,7 @@ ReelAction_StopReel1: ; 92c5e
|
||||
; even if the current bet won't allow lining it up.
|
||||
|
||||
ld a, [wSlotBias]
|
||||
cp SLOTS_NOBIAS
|
||||
cp SLOTS_NO_BIAS
|
||||
jr z, .NoBias
|
||||
ld hl, REEL_MANIP_COUNTER
|
||||
add hl, bc
|
||||
@@ -1043,7 +1045,7 @@ ReelAction_StopReel2: ; 92c86
|
||||
jr z, .NoBias
|
||||
.nope
|
||||
ld a, [wSlotBias]
|
||||
cp SLOTS_NOBIAS
|
||||
cp SLOTS_NO_BIAS
|
||||
jr z, .NoBias
|
||||
ld hl, REEL_MANIP_COUNTER
|
||||
add hl, bc
|
||||
@@ -1079,7 +1081,7 @@ ReelAction_StopReel3: ; 92ca9
|
||||
|
||||
.NoMatch:
|
||||
ld a, [wSlotBias]
|
||||
cp SLOTS_NOBIAS
|
||||
cp SLOTS_NO_BIAS
|
||||
jr z, .NoBias
|
||||
ld hl, REEL_MANIP_COUNTER
|
||||
add hl, bc
|
||||
@@ -1532,7 +1534,7 @@ Slots_CheckMatchedFirstTwoReels: ; 92e94
|
||||
; 92f1d
|
||||
|
||||
Slots_CheckMatchedAllThreeReels: ; 92f1d
|
||||
ld a, SLOTS_NOMATCH
|
||||
ld a, SLOTS_NO_MATCH
|
||||
ld [wSlotMatched], a
|
||||
call Slots_GetCurrentReelState
|
||||
call Slots_CopyReelState
|
||||
@@ -1552,7 +1554,7 @@ Slots_CheckMatchedAllThreeReels: ; 92f1d
|
||||
|
||||
.return
|
||||
ld a, [wSlotMatched]
|
||||
cp SLOTS_NOMATCH
|
||||
cp SLOTS_NO_MATCH
|
||||
jr nz, .matched_nontrivial
|
||||
and a
|
||||
ret
|
||||
@@ -1753,7 +1755,7 @@ Slots_InitBias: ; 93002 (24:7002)
|
||||
db $14, SLOTS_SQUIRTLE ; 5/128
|
||||
db $28, SLOTS_PIKACHU ; 5/64
|
||||
db $30, SLOTS_CHERRY ; 1/32
|
||||
db $ff, SLOTS_NOBIAS ; everything else
|
||||
db $ff, SLOTS_NO_BIAS ; everything else
|
||||
; 93031
|
||||
|
||||
.Lucky: ; 93031
|
||||
@@ -1763,7 +1765,7 @@ Slots_InitBias: ; 93002 (24:7002)
|
||||
db $10, SLOTS_SQUIRTLE ; 1/32
|
||||
db $1e, SLOTS_PIKACHU ; 7/128
|
||||
db $50, SLOTS_CHERRY ; 25/128
|
||||
db $ff, SLOTS_NOBIAS ; everything else
|
||||
db $ff, SLOTS_NO_BIAS ; everything else
|
||||
; 9303f
|
||||
|
||||
Slots_IlluminateBetLights: ; 9303f (24:703f)
|
||||
@@ -1924,7 +1926,7 @@ Slots_AskPlayAgain: ; 930e9 (24:70e9)
|
||||
|
||||
Slots_GetPayout: ; 93124 (24:7124)
|
||||
ld a, [wSlotMatched]
|
||||
cp SLOTS_NOMATCH
|
||||
cp SLOTS_NO_MATCH
|
||||
jr z, .no_win
|
||||
srl a
|
||||
ld e, a
|
||||
@@ -1957,7 +1959,7 @@ Slots_GetPayout: ; 93124 (24:7124)
|
||||
|
||||
Slots_PayoutText: ; 93158 (24:7158)
|
||||
ld a, [wSlotMatched]
|
||||
cp SLOTS_NOMATCH
|
||||
cp SLOTS_NO_MATCH
|
||||
jr nz, .MatchedSomething
|
||||
ld hl, .Text_Darn
|
||||
call PrintText
|
||||
@@ -2047,7 +2049,7 @@ endr
|
||||
call Random
|
||||
and %0010100
|
||||
ret z ; 25% chance to stick with seven symbol bias
|
||||
ld a, SLOTS_NOBIAS
|
||||
ld a, SLOTS_NO_BIAS
|
||||
ld [wSlotBias], a
|
||||
ret
|
||||
|
||||
@@ -2055,7 +2057,7 @@ endr
|
||||
call Random
|
||||
and %0011100
|
||||
ret z ; 12.5% chance to stick with seven symbol bias
|
||||
ld a, SLOTS_NOBIAS
|
||||
ld a, SLOTS_NO_BIAS
|
||||
ld [wSlotBias], a
|
||||
ret
|
||||
|
||||
|
Reference in New Issue
Block a user