Merge branch 'master' of https://github.com/pret/pokeemerald into ui-standardize

2023-01-18 11:07:12 -05:00
parent f4a2040843 4a9c4951ab
commit 0cc10a1ada
1149 changed files with 44393 additions and 46317 deletions
@@ -571,7 +571,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] =
        .paletteNum = 5,
        .baseBlock = 0x013c,
    },
-    [ARENA_WIN_JUDGEMENT_TITLE] = {
+    [ARENA_WIN_JUDGMENT_TITLE] = {
        .bg = 0,
        .tilemapLeft = 8,
        .tilemapTop = 11,
@@ -580,7 +580,7 @@ static const struct WindowTemplate sBattleArenaWindowTemplates[] =
        .paletteNum = 5,
        .baseBlock = 0x0148,
    },
-    [ARENA_WIN_JUDGEMENT_TEXT] = {
+    [ARENA_WIN_JUDGMENT_TEXT] = {
        .bg = 0,
        .tilemapLeft = 2,
        .tilemapTop = 15,