diff options
| -rwxr-xr-x | Makefile | 6 | ||||
| -rw-r--r-- | tools/dungeonjson/dungeonjson.cpp | 5 |
2 files changed, 9 insertions, 2 deletions
@@ -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(); |