Merge branch 'master' into rme-update

This commit is contained in:
GriffinR
2022-06-22 10:02:17 -04:00
committed by GitHub
297 changed files with 5617 additions and 5839 deletions
+1 -1
View File
@@ -146,7 +146,7 @@ static const struct WindowTemplate sMapSecInfoWindowTemplate =
#include "data/region_map/city_map_entries.h"
const struct OamData sCityZoomTextSprite_OamData =
static const struct OamData sCityZoomTextSprite_OamData =
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,