diff options
| author | Ethan Roseman <ethteck@gmail.com> | 2020-06-06 19:56:04 -0400 |
|---|---|---|
| committer | Ethan Roseman <ethteck@gmail.com> | 2020-06-06 19:56:04 -0400 |
| commit | 3f369541daa76feeab36768387ddaa804863439b (patch) | |
| tree | ab3fa2a22a821aecc25cc8d3e9472d0a5ba1f983 | |
| parent | 5b2d51a39182d9933cf996fdf83affe645201731 (diff) | |
Usability fixes
| -rw-r--r-- | INSTALL.md | 2 | ||||
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | asm/initializeLink.s (renamed from asm/InitializeLink.s) | 0 | ||||
| -rw-r--r-- | asmdiff.sh | 2 | ||||
| -rw-r--r-- | calcrom.pl | 2 | ||||
| -rw-r--r-- | tmc.sha1 (renamed from zeldatmc.sha1) | 0 | ||||
| -rw-r--r-- | tools/preproc/charmap.cpp | 1 |
8 files changed, 7 insertions, 6 deletions
@@ -38,7 +38,7 @@ To set up the repository: cd ../tmc -To build **zeldatmc.gba**: +To build **tmc.gba**: make -j$(nproc) @@ -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) @@ -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 @@ -1,6 +1,6 @@ #!/bin/bash -buildname=zeldatmc +buildname=tmc baserom=baserom OBJDUMP="$DEVKITARM/bin/arm-none-eabi-objdump -D -bbinary -marmv4t -Mforce-thumb" @@ -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; |
