Merge branch 'master' of https://github.com/pret/pokeemerald into doc-windows

2023-01-07 13:30:11 -05:00
parent e989879f71 6d6a876dbd
commit c91b13a12b
705 changed files with 36500 additions and 32348 deletions
@@ -206,7 +206,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = {
        .bg = 0,
        .tilemapLeft = 0,
        .tilemapTop = 0,
-        .width = 30,
+        .width = DISPLAY_TILE_WIDTH,
        .height = 5,
        .paletteNum = 15,
        .baseBlock = 0x002
@@ -215,7 +215,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = {
        .bg = 0,
        .tilemapLeft = 0,
        .tilemapTop = 6,
-        .width = 30,
+        .width = DISPLAY_TILE_WIDTH,
        .height = 7,
        .paletteNum = 15,
        .baseBlock = 0x098
@@ -224,7 +224,7 @@ static const struct WindowTemplate sLinkErrorWindowTemplates[] = {
        .bg = 0,
        .tilemapLeft = 0,
        .tilemapTop = 13,
-        .width = 30,
+        .width = DISPLAY_TILE_WIDTH,
        .height = 7,
        .paletteNum = 15,
        .baseBlock = 0x16A