From bb1bb8310d8fa7dab1052ffbed2abb3390faf402 Mon Sep 17 00:00:00 2001
From: entrpntr <entrpntr@gmail.com>
Date: Thu, 18 Jun 2020 17:11:43 -0400
Subject: Fix dex_species macro for rgbds v0.4.0.

---
 macros/pokedex.asm | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

(limited to 'macros')

diff --git a/macros/pokedex.asm b/macros/pokedex.asm
index 365a8ba..2542d64 100755
--- a/macros/pokedex.asm
+++ b/macros/pokedex.asm
@@ -69,16 +69,20 @@ x = \1 * 10
 	db $00, $FC
 	ENDM
 
+; \1 = species string
 dex_species: MACRO
-	REPT _NARG
-	dex_species_char \1
-	SHIFT
-	ENDR
-	REPT 11 - _NARG
-	dex_species_char " "
-	ENDR
-	db $00
-	ENDM
+; Add right padding to format to 11 characters, define 2 bytes
+; for each character (using dex_species_char below)
+I = 0
+    REPT STRLEN(\1)
+I = I + 1
+        dex_species_char STRSUB(\1\, I\, 1)
+    ENDR
+    REPT 11 - STRLEN(\1)
+        dex_species_char " "
+    ENDR
+    db "@"
+ENDM
 
 dex_species_char: MACRO
 	IF \1 == " "
-- 
cgit v1.2.3