From 998363c01f0bdd89c31cfcf43886d9358cbea087 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Wed, 17 Feb 2021 13:31:48 +0100
Subject: [PATCH] Spiffy up console detection

---
 .gitignore            |  5 +++++
 .tags                 |  7 -------
 source/home/start.asm | 21 ++++++++-------------
 3 files changed, 13 insertions(+), 20 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 .tags

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e3cedb4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+/*.gb
+/*.map
+/*.sym
+/build
+/.tags
diff --git a/.tags b/.tags
deleted file mode 100644
index 562754a..0000000
--- a/.tags
+++ /dev/null
@@ -1,7 +0,0 @@
-!_TAG_FILE_FORMAT	2	/extended format; --format=1 will not append ;" to lines/
-!_TAG_FILE_SORTED	1	/0=unsorted, 1=sorted, 2=foldcase/
-!_TAG_OUTPUT_MODE	u-ctags	/u-ctags or e-ctags/
-!_TAG_PROGRAM_AUTHOR	Universal Ctags Team	//
-!_TAG_PROGRAM_NAME	Universal Ctags	/Derived from Exuberant Ctags/
-!_TAG_PROGRAM_URL	https://ctags.io/	/official site/
-!_TAG_PROGRAM_VERSION	0.0.0	//
diff --git a/source/home/start.asm b/source/home/start.asm
index afefa11..13f5cbb 100644
--- a/source/home/start.asm
+++ b/source/home/start.asm
@@ -24,28 +24,23 @@ _start:
     di
 
     ; Attempt to detect console model
-    cp $ff
-    jr z, .console_mgb
+    ld c, console_agb
     cp $11
     jr z, .console_cgb
-
-    ld a, console_dmg
-    jr .console_end
-
-.console_mgb
-    ld a, console_mgb
+    dec c
+    dec c  ; console_mgb
+    cp $ff
+    jr z, .console_end
+    dec c  ; console_dmg
     jr .console_end
 
 .console_cgb
     dec b
     jr z, .console_agb
-    ld a, console_cgb
-    jr .console_end
-
-.console_agb
-    ld a, console_agb
+    dec c  ; console_cgb
 
 .console_end
+    ld a, c
     ldh [h_console], a
 
     xor a