diff options
| author | Seth Barberee <seth.barberee@gmail.com> | 2021-12-20 17:31:22 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-20 17:31:22 -0600 |
| commit | 74b7676ae2d188bdc979e9b337534748c41a5d61 (patch) | |
| tree | 7838ca3c7546e7167e7a39478884598b448b3ccd /tools/dungeonjson/dungeonjson.cpp | |
| parent | 3e84c8e11ba8b2ec8b9006d3fa5e4f87c4fcc8ad (diff) | |
| parent | 010d641899be44eb7fc5f458d819c332e092d03f (diff) | |
Merge pull request #86 from mid-kid/master
More disassembly and dependency generation fixes...
Diffstat (limited to 'tools/dungeonjson/dungeonjson.cpp')
| -rw-r--r-- | tools/dungeonjson/dungeonjson.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tools/dungeonjson/dungeonjson.cpp b/tools/dungeonjson/dungeonjson.cpp index 48ef147..50ef81a 100644 --- a/tools/dungeonjson/dungeonjson.cpp +++ b/tools/dungeonjson/dungeonjson.cpp @@ -387,13 +387,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 +447,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 +476,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()) { |