summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2021-12-21 14:47:46 -0600
committerGitHub <noreply@github.com>2021-12-21 14:47:46 -0600
commit4fd4208364fcaf71ef0ff35d0c49ce3d9149e98b (patch)
treeced08a09affdcaf78bf5d449e1cb1c4bd93fc4c9
parent74b7676ae2d188bdc979e9b337534748c41a5d61 (diff)
Delete build artifacts on clean target (#89)
* delete build artifacts on clean target * clean out the graphics files too * fix up auto-gen message on pokemon_found and move END_OF_TABLE to actual end of table
-rwxr-xr-xMakefile6
-rw-r--r--tools/dungeonjson/dungeonjson.cpp5
2 files changed, 9 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5ea70d1..a155373 100755
--- a/Makefile
+++ b/Makefile
@@ -173,6 +173,12 @@ clean-tools:
tidy:
$(RM) -f $(ROM) $(ELF) $(MAP)
$(RM) -r $(BUILD_DIR)
+ $(RM) -f $(ITEM_DATA)
+ $(RM) -f $(MOVE_DATA)
+ $(RM) -f $(POKEMON_SPECIES)
+ $(RM) -f $(DUNGEON_FLOOR)
+ $(RM) -f $(DUNGEON_POKEMON)
+ find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
@$(MAKE) clean -C libagbsyscall
define scaninc
diff --git a/tools/dungeonjson/dungeonjson.cpp b/tools/dungeonjson/dungeonjson.cpp
index 50ef81a..9d2b69d 100644
--- a/tools/dungeonjson/dungeonjson.cpp
+++ b/tools/dungeonjson/dungeonjson.cpp
@@ -260,7 +260,8 @@ string generate_pokemon_table_text(Json map_data) {
int pokemon_mask;
int probability_total;
- text << "@ This is auto-generated by " << map_data["name"].string_value() << ".json" << "\n";
+ text << "@ This is auto-generated by pokemon_found.json.\n";
+
for (auto &table: map_data["tables"].array_items()) {
probability_total = 0;
@@ -284,8 +285,8 @@ string generate_pokemon_table_text(Json map_data) {
}
// Append null entry to end
- text << TABLE_END;
text << ".2byte " << "0x00, 0x00, 0x00, 0x00" << "\n";
+ text << TABLE_END;
}
return text.str();