summaryrefslogtreecommitdiff
path: root/tools/dungeonjson/dungeonjson.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tools/dungeonjson/dungeonjson.cpp')
-rw-r--r--tools/dungeonjson/dungeonjson.cpp25
1 files changed, 13 insertions, 12 deletions
diff --git a/tools/dungeonjson/dungeonjson.cpp b/tools/dungeonjson/dungeonjson.cpp
index 48ef147..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();
@@ -387,13 +388,13 @@ string generate_species_data_text(Json data) {
ostringstream text;
text << "@ This is auto-generated by species_data.json.\n";
- text << ".include \"include/constants/ability.h\"\n";
- text << ".include \"include/constants/evolve_type.h\"\n";
- text << ".include \"include/constants/friend_area.h\"\n";
- text << ".include \"include/constants/item.h\"\n";
- text << ".include \"include/constants/species.h\"\n";
- text << ".include \"include/constants/type.h\"\n";
- text << ".include \"include/constants/walkable_tile.h\"\n";
+ text << "#include \"constants/ability.h\"\n";
+ text << "#include \"constants/evolve_type.h\"\n";
+ text << "#include \"constants/friend_area.h\"\n";
+ text << "#include \"constants/item.h\"\n";
+ text << "#include \"constants/species.h\"\n";
+ text << "#include \"constants/type.h\"\n";
+ text << "#include \"constants/walkable_tile.h\"\n";
text << ".global gSpeciesData\n";
text << "gSpeciesData:";
for (Json data_entry : data.array_items()) {
@@ -447,8 +448,8 @@ string generate_item_data_text(Json data) {
ostringstream text;
text << "@ This is auto-generated by item_data.json.\n";
- text << ".include \"include/constants/item.h\"\n";
- text << ".include \"include/constants/move_id.h\"\n";
+ text << "#include \"constants/item.h\"\n";
+ text << "#include \"constants/move_id.h\"\n";
text << ".global gItemData\n";
text << "gItemData:";
for (Json data_entry : data.array_items()) {
@@ -476,7 +477,7 @@ string generate_move_data_text(Json data) {
ostringstream text;
text << "@ This is auto-generated by move_data.json.\n";
- text << ".include \"include/constants/type.h\"\n";
+ text << "#include \"constants/type.h\"\n";
text << ".global gMoveData\n";
text << "gMoveData:";
for (Json data_entry : data.array_items()) {