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

Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030

Browse Source 
# Conflicts:
#	src/data/bard_music/moves.h
#	src/data/bard_music/pokemon.h
This commit is contained in:
Eduardo Quezada
2022-10-30 12:30:38 -03:00
parent 93dd8786ee c76beed989
commit e4a439aa46
578 changed files with 31629 additions and 25655 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/mapjson/mapjson.cpp
View File

@@ -191,7 +191,7 @@ string generate_map_events_text(Json map_data) {
<< warp_event["x"].int_value() << ", "
<< warp_event["y"].int_value() << ", "
<< warp_event["elevation"].int_value() << ", "
<< warp_event["dest_warp_id"].int_value() << ", "
<< warp_event["dest_warp_id"].string_value() << ", "
<< warp_event["dest_map"].string_value() << "\n";
}
text << "\n";