Skip to content

Commit 35bb557

Browse files
committed
Merge branch 'master' into Crash-Detection
2 parents 1aad0ee + ca61f05 commit 35bb557

File tree

6 files changed

+68
-32777
lines changed

6 files changed

+68
-32777
lines changed

src/modes/tspins.asm

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ renderTSpin:
9797
jsr clearPlayfield
9898

9999
lda tspinY
100-
adc #1
100+
clc
101+
adc #2
101102
jsr drawFloor
102103

103104
; get tspin offset

tests/src/main.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ mod rng;
1313
mod score;
1414
mod sps;
1515
mod toprow;
16+
mod tspins;
1617

1718
use gumdrop::Options;
1819

@@ -45,6 +46,8 @@ fn main() {
4546
if options.test {
4647
floor::test();
4748
println!(">> floor ✅");
49+
tspins::test();
50+
println!(">> tspins ✅");
4851
toprow::test();
4952
println!(">> top row bug ✅");
5053
score::test();
@@ -125,8 +128,7 @@ fn main() {
125128
emu.run_until_vblank();
126129
}
127130

128-
emu.ppu.render_ntsc(video::WIDTH);
129-
view.update(&emu.ppu.filtered_screen);
131+
view.render(&mut emu);
130132
});
131133
loop {}
132134
}

tests/src/rng.rs

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,29 @@ use std::collections::HashSet;
44
pub fn test() {
55
assert_eq!(
66
seeds(),
7-
include_str!("./rng_seeds.txt")
8-
.trim()
9-
.split('\n')
10-
.map(|s| s.trim().parse::<u16>().expect(s))
11-
.collect::<HashSet<_>>()
7+
seeds_impl(),
128
);
139
}
1410

11+
pub fn seeds_impl() -> HashSet<u16> {
12+
let mut seeds: HashSet<u16> = HashSet::new();
13+
14+
let mut seed = 0x8988;
15+
16+
loop {
17+
seeds.insert(seed);
18+
19+
let new_bit = ((seed >> 9) ^ (seed >> 1)) & 1;
20+
seed = (new_bit << 15) | (seed >> 1);
21+
22+
if seed == 0x8988 {
23+
break;
24+
}
25+
}
26+
27+
seeds
28+
}
29+
1530
pub fn seeds() -> HashSet<u16> {
1631
let mut emu = util::emulator(None);
1732
let rng_seed = labels::get("rng_seed");

0 commit comments

Comments
 (0)