From eb63517a490f0f615f13c4af9b64a135c60344ea Mon Sep 17 00:00:00 2001 From: Daniel Borges Date: Sat, 29 Dec 2018 20:41:49 +0100 Subject: [PATCH] automata bugfix --- Code/main.asm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Code/main.asm b/Code/main.asm index 5fddc13..4c82196 100644 --- a/Code/main.asm +++ b/Code/main.asm @@ -533,8 +533,10 @@ Conway: jr z, .dead .alive ; check if there is two or three neighbors - bit 1, a - ret z + cp a, 2 + ret c + cp a, 4 + ret nc .writealive ; add mask to result @@ -752,9 +754,9 @@ BitsSet: SECTION "Default Map", ROM0 DefaultMap: ; 20x18 map with a glider on the top left corner + db 1, 2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 + db 9,12, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - db 0, 3, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 - db 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 db 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0