Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-08-12 12:19:56 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015

Browse Source
This commit is contained in:
Eduardo Quezada
2024-10-15 20:56:56 -03:00
parent 0f8b2a1ba8 a55c75d350
commit 80447bee8e
140 changed files with 928 additions and 1969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/mapjson/mapjson.cpp
View File

@@ -197,7 +197,7 @@ string generate_map_events_text(Json map_data) {
string mapName = json_to_string(map_data, "name");
text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n";
text << "@\n@ DO NOT MODIFY THIS FILE! It is auto-generated from data/maps/" << mapName << "/map.json\n@\n\n\t.align 2\n\n";
string objects_label, warps_label, coords_label, bgs_label;