summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--INSTALL.md2
-rw-r--r--Makefile4
-rw-r--r--README.md2
-rw-r--r--asm/initializeLink.s (renamed from asm/InitializeLink.s)0
-rw-r--r--asmdiff.sh2
-rw-r--r--calcrom.pl2
-rw-r--r--tmc.sha1 (renamed from zeldatmc.sha1)0
-rw-r--r--tools/preproc/charmap.cpp1
8 files changed, 7 insertions, 6 deletions
diff --git a/INSTALL.md b/INSTALL.md
index 24ef81e0..50691c11 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -38,7 +38,7 @@ To set up the repository:
cd ../tmc
-To build **zeldatmc.gba**:
+To build **tmc.gba**:
make -j$(nproc)
diff --git a/Makefile b/Makefile
index f821d586..b0036c95 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ MAKER_CODE := 01
SHELL := /bin/bash -o pipefail
-BUILD_NAME := zeldatmc
+BUILD_NAME := tmc
ROM := $(BUILD_NAME).gba
OBJ_DIR := build/$(BUILD_NAME)
@@ -115,7 +115,7 @@ all: tools rom
rom: $(ROM)
ifeq ($(COMPARE),1)
- @$(SHA1) zeldatmc.sha1
+ @$(SHA1) tmc.sha1
endif
tools: $(TOOLDIRS)
diff --git a/README.md b/README.md
index 62d4eb16..944abeb6 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,6 @@ This is a disassembly of The Legend of Zelda: The Minish Cap (USA).
It builds the following ROM:
-* [**zeldatmc.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1841) `sha1: b4bd50e4131b027c334547b4524e2dbbd4227130`
+* [**tmc.gba**](https://datomatic.no-intro.org/index.php?page=show_record&s=23&n=1841) `sha1: b4bd50e4131b027c334547b4524e2dbbd4227130`
To set up the repository, see [INSTALL.md](INSTALL.md).
diff --git a/asm/InitializeLink.s b/asm/initializeLink.s
index 3d339ef7..3d339ef7 100644
--- a/asm/InitializeLink.s
+++ b/asm/initializeLink.s
diff --git a/asmdiff.sh b/asmdiff.sh
index 713878d7..bf6a907a 100644
--- a/asmdiff.sh
+++ b/asmdiff.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-buildname=zeldatmc
+buildname=tmc
baserom=baserom
OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb"
diff --git a/calcrom.pl b/calcrom.pl
index 83051c67..7472ab23 100644
--- a/calcrom.pl
+++ b/calcrom.pl
@@ -75,7 +75,7 @@ my @sorted = sort { $a->[1] <=> $b->[1] } @pairs;
#
# You'd expect this to take a while, because of uniq. It runs in under a second,
# though. Uniq is pretty fast!
-my $base_cmd = "nm zeldatmc.elf | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
+my $base_cmd = "nm tmc.elf | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
# This looks for Unknown_, Unknown_, or sub_, followed by just numbers. Note that
# it matches even if stuff precedes the unknown, like sUnknown/gUnknown.
diff --git a/zeldatmc.sha1 b/tmc.sha1
index c965d243..c965d243 100644
--- a/zeldatmc.sha1
+++ b/tmc.sha1
diff --git a/tools/preproc/charmap.cpp b/tools/preproc/charmap.cpp
index 5625a852..45a6b50a 100644
--- a/tools/preproc/charmap.cpp
+++ b/tools/preproc/charmap.cpp
@@ -69,6 +69,7 @@ CharmapReader::CharmapReader(std::string filename) : m_filename(filename)
{
if (filename == "")
{
+ m_pos = 0;
m_size = 0;
m_buffer = new char[1] {};
return;