Merge branch 'master' into final_battle_files_touches

This commit is contained in:
DizzyEggg
2018-07-07 14:11:04 +02:00
34 changed files with 786 additions and 1634 deletions
+1 -1
View File
@@ -873,7 +873,7 @@ struct MapPosition
{
s16 x;
s16 y;
u8 height;
s8 height;
};
struct UnkStruct_8054FF8