Skip to content

Commit 9fa9aba

Browse files
committed
Fix merge conflict
2 parents 51c36fb + abcc147 commit 9fa9aba

6 files changed

Lines changed: 497 additions & 235 deletions

File tree

README.md

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ GameByte is a research emulator that is not intended to be fully accurate or usa
3636

3737
## Compatibility List (tested games only)
3838

39-
| **Game Title** | **Publisher** | **Year** | **State** |
40-
|--------------------------------|---------------|----------|-----------|
41-
| Tetris | Nintendo | 1989 | Playable |
42-
| Dr. Mario | Nintendo | 1990 | Menus |
43-
| Space Invaders (Japan) | Taito | 1990 | Playable |
44-
| (Pretty much) Every other game | Anyone | Any time | Nothing |
39+
| **Game Title** | **Publisher** | **Year** | **State** |
40+
|--------------------------------|---------------|----------|--------------------------|
41+
| Tetris | Nintendo | 1989 | Playable |
42+
| Dr. Mario | Nintendo | 1990 | Playable |
43+
| Space Invaders (Japan) | Taito | 1990 | Playable |
44+
| Asteroids | Accolade | 1992 | Playable |
45+
| Minesweeper: Soukaitei (Japan) | Pack-in-Video | 1991 | Playable |
46+
| (Pretty much) Every other game | Anyone | Any time | Nothing/possibly menus |

0 commit comments

Comments
 (0)