summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
Diffstat (limited to 'utils')
-rw-r--r--utils/dump_text.py2
-rw-r--r--utils/gfx.py2
-rw-r--r--utils/tests/charmap.asm7
3 files changed, 7 insertions, 4 deletions
diff --git a/utils/dump_text.py b/utils/dump_text.py
index c36298e..75a3672 100644
--- a/utils/dump_text.py
+++ b/utils/dump_text.py
@@ -179,7 +179,7 @@ if __name__ == '__main__':
help='dump text codes (line breaks, prompt etc) as macros instead of inline text'
)
ap.add_argument('-o', dest='outfile', default=sys.stdout, help='output file name')
- ap.add_argument('-m', dest='charmap', default='../charmap.asm', help='charmap file name')
+ ap.add_argument('-m', dest='charmap', default='../constants/charmap.asm', help='charmap file name')
ap.add_argument('rom', help='path to ROM')
ap.add_argument('start', help='start offset', type=conv_address)
ap.add_argument('end', help='end offset', type=conv_address, nargs='?')
diff --git a/utils/gfx.py b/utils/gfx.py
index a9e56d4..f25b90f 100644
--- a/utils/gfx.py
+++ b/utils/gfx.py
@@ -30,7 +30,7 @@ base_stats = None
def get_base_stats():
global base_stats
if not base_stats:
- base_stats = recursive_read('data/base_stats.asm')
+ base_stats = recursive_read('data/pokemon/base_stats.asm')
return base_stats
def get_pokemon_dimensions(name):
diff --git a/utils/tests/charmap.asm b/utils/tests/charmap.asm
index 70e228c..1c01298 100644
--- a/utils/tests/charmap.asm
+++ b/utils/tests/charmap.asm
@@ -116,6 +116,9 @@
charmap "▲", $61
charmap "☎", $62
+ charmap "A", $60
+ charmap "B", $61
+ charmap "C", $62
charmap "D", $63
charmap "E", $64
charmap "F", $65
@@ -275,8 +278,8 @@
charmap "♂", $ef
charmap "円", $f0
charmap "×", $f1
- charmap ".", $f2
- charmap "/", $f3
+ charmap ".", $f2
+ charmap "/", $f3
charmap "ォ", $f4