Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6

2025-05-14 11:50:11 -04:00
parent 07c897ad48 0aae36984f
commit 929bc8b990
276 changed files with 11759 additions and 11089 deletions
--- a/tools/mapjson/json11.cpp
+++ b/tools/mapjson/json11.cpp
@@ -23,6 +23,7 @@
 #include <cstdlib>
 #include <cstdio>
 #include <limits>
+#include <cstdint>

 namespace json11 {