From 46b24e6d9823c2bc294c0522c4d19b3254d66af0 Mon Sep 17 00:00:00 2001
From: LeonarthCG <angel.cantos.giron@gmail.com>
Date: Tue, 20 Apr 2021 13:19:03 +0200
Subject: [PATCH] fix print error graphical issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

the pokédex was loading the names for the list when they list wasn't even being displayed, that should now be fixed
---
 .gitignore       |  10 ++++++++++
 asm/pokedex1.bin | Bin 83 -> 91 bytes
 asm/pokedex1.s   |   6 ++++++
 asm/pokedex2.bin | Bin 556 -> 564 bytes
 asm/pokedex2.s   |   8 ++++++++
 5 files changed, 24 insertions(+)

diff --git a/.gitignore b/.gitignore
index 665dae7..1459104 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,16 @@ $RECYCLE.BIN/
 Event Assembler
 ups
 
+#files you are expected to build
+graphics/*.bin
+compressed/*.bin
+compressed/*.bin.dmp
+dialogue.event
+fontGraphics.event
+fontWidth.event
+names.event
+system.event
+
 # =========================
 # Operating System Files
 # =========================
diff --git a/asm/pokedex1.bin b/asm/pokedex1.bin
index f81518ed4f5a154f9c6bfd5ddb87656cb7c1a2f6..d70039fc94603400ae92de206b0f55be6d12340e 100644
GIT binary patch
delta 63
zcmWHJwv-gSdhP4ct51KOx&4pfR9Nk=C%2!mD>6&~a#U*t0~jQ24=L1!!~%sC85n?q
RR<(=)44k%yOeY#D0RR)<9KZko

delta 55
zcmazJHk1^+dhP4ct51JDx&4e?kzv9=hEuY&f&mPYwudBYLt=r#iVO@uL8Ds600vIm
JL%I_!l>pra7i0hc

diff --git a/asm/pokedex1.s b/asm/pokedex1.s
index 1a53665..3bd231b 100644
--- a/asm/pokedex1.s
+++ b/asm/pokedex1.s
@@ -10,6 +10,11 @@ push hl
 
 ;our new code
 
+;check if we are not in the list
+ld a, [$DBCC]
+cp a, 0
+jp z, end
+
 ;get destination
 ld a, [$DBE4]
 and a, 7
@@ -53,6 +58,7 @@ ld hl, $A000
 call $0FBD
 
 ;restore registers and return
+end:
 pop	hl
 pop	de
 pop	bc
diff --git a/asm/pokedex2.bin b/asm/pokedex2.bin
index bc4c434c611010d8f26d903c486fc33c775c9d84..e8b18786ec355883e3ee85134c47ed6711cd0680 100644
GIT binary patch
literal 564
zcmaEL=Jwa4SD*embNe5|DgFFk$3V11uI;NQw|_mk{fu3aVFFOVAXhMeLDKe+c5X;4
zP*{<H0VwF2%NW4GX?w^amyyAN^QxT=kSoZr;A|%UMLPx{TM@|K%MVm;gKAhU)UXO<
z!zMuu>m|{!Q&7W>A{%xeYS=9j4HM6UcvC13$(uTP5O1pIk><@5sA2KQhE+lhD<RRa
njZnkZARBfJYS=*%4f_W*>?g8e!ub$y^5x_6=EI8zKb`~tNvZ0<

literal 556
zcmaEL=Jwa4SD*emcKaX0DS=$uS5I#LdUE?2yCTB`pnyiMU;u-p?IGpdkXWFwA_D_Z
z&^DJbfPvHYkVP&dg9GPPI~^cbkYT~uO#X{@3_!LbkiC~5sN4qCuu`aD1;~bVK@Dpq
z(Xc~M!}cN@b{%TiB@zwe&x3fAD-X$=DtQoZ%IA^h%^0X*;mC#+LJi9y(Xf?J!<HZ$
hwhwC9P7)3K1~u#>vSHl$5O1>O<MZajiw8fR1OP9y<k0{C

diff --git a/asm/pokedex2.s b/asm/pokedex2.s
index f09016b..bbd05cc 100644
--- a/asm/pokedex2.s
+++ b/asm/pokedex2.s
@@ -8,6 +8,13 @@ push de
 push hl
 
 ;our new code
+
+;check if we are not in the list
+ld a, [$DBCC]
+cp a, 0
+jp z, end
+
+;
 ld a, [$DBC6]
 cp a, 0
 jp z, is0
@@ -346,6 +353,7 @@ ld hl, $A000
 call $0FBD
 
 ;restore registers and return
+end:
 pop	hl
 pop	de
 pop	bc