dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Clarify window ID usage in contest_util

Browse Source
This commit is contained in:
GriffinR
2022-09-29 15:10:32 -04:00
parent 6bc1955c99
commit 5af7355fbd
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/contest_util.c
+7 -6
View File
@@ -319,9 +319,10 @@ static const struct BgTemplate sBgTemplates[] =
} }
}; };
static const struct WindowTemplate sWindowTemplates[] = // Window IDs are implicitly shared with contestant IDs in LoadContestMonName
static const struct WindowTemplate sWindowTemplates[CONTESTANT_COUNT + 1] =
{ {
{ { // Contestant 1
.bg = 1, .bg = 1,
.tilemapLeft = 7, .tilemapLeft = 7,
.tilemapTop = 4, .tilemapTop = 4,
@@ -330,7 +331,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 770 .baseBlock = 770
}, },
{ { // Contestant 2
.bg = 1, .bg = 1,
.tilemapLeft = 7, .tilemapLeft = 7,
.tilemapTop = 7, .tilemapTop = 7,
@@ -339,7 +340,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 794 .baseBlock = 794
}, },
{ { // Contestant 3
.bg = 1, .bg = 1,
.tilemapLeft = 7, .tilemapLeft = 7,
.tilemapTop = 10, .tilemapTop = 10,
@@ -348,7 +349,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 818 .baseBlock = 818
}, },
{ { // Contestant 4
.bg = 1, .bg = 1,
.tilemapLeft = 7, .tilemapLeft = 7,
.tilemapTop = 13, .tilemapTop = 13,
@@ -357,7 +358,7 @@ static const struct WindowTemplate sWindowTemplates[] =
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 842 .baseBlock = 842
}, },
DUMMY_WIN_TEMPLATE, DUMMY_WIN_TEMPLATE
}; };
static const struct OamData sOamData_WirelessIndicatorWindow = static const struct OamData sOamData_WirelessIndicatorWindow =