diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-10-27 19:55:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-27 19:55:44 -0500 |
| commit | b1b97c1da9f8190ef3d145acf30eb1708f50e3f3 (patch) | |
| tree | 447dc029875826625c2c565798785065e88bf848 /src/battle_factory.c | |
| parent | 2778e9ad3dc249eb4cce84be3ac1dfcc7ab850d5 (diff) | |
| parent | b252bd029279b6f28518c59df1ba03caf44d756f (diff) | |
Merge pull request #374 from DizzyEggg/win_name
Rename struct Window' priority field to bg
Diffstat (limited to 'src/battle_factory.c')
| -rw-r--r-- | src/battle_factory.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/battle_factory.c b/src/battle_factory.c index 7ebcfe8b3..c2a3207a6 100644 --- a/src/battle_factory.c +++ b/src/battle_factory.c @@ -323,7 +323,7 @@ static const struct BgTemplate sSelect_BgTemplates[] = static const struct WindowTemplate sSelect_WindowTemplates[] = { { - .priority = 0, + .bg = 0, .tilemapLeft = 0, .tilemapTop = 2, .width = 12, @@ -332,7 +332,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .baseBlock = 0x0001, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 19, .tilemapTop = 2, .width = 11, @@ -341,7 +341,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .baseBlock = 0x0019, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 0, .tilemapTop = 15, .width = 20, @@ -350,7 +350,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .baseBlock = 0x002f, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 22, .tilemapTop = 14, .width = 8, @@ -359,7 +359,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .baseBlock = 0x006b, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 22, .tilemapTop = 14, .width = 8, @@ -368,7 +368,7 @@ static const struct WindowTemplate sSelect_WindowTemplates[] = .baseBlock = 0x009b, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 15, .tilemapTop = 0, .width = 15, @@ -907,7 +907,7 @@ static const struct BgTemplate sSwap_BgTemplates[4] = static const struct WindowTemplate sSwap_WindowTemplates[] = { { - .priority = 0, + .bg = 0, .tilemapLeft = 0, .tilemapTop = 2, .width = 12, @@ -916,7 +916,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .baseBlock = 0x0001, }, { - .priority = 2, + .bg = 2, .tilemapLeft = 19, .tilemapTop = 2, .width = 11, @@ -925,7 +925,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .baseBlock = 0x0019, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 0, .tilemapTop = 15, .width = 20, @@ -934,7 +934,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .baseBlock = 0x002f, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 21, .tilemapTop = 14, .width = 9, @@ -943,7 +943,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .baseBlock = 0x006b, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 22, .tilemapTop = 14, .width = 8, @@ -952,7 +952,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .baseBlock = 0x00a1, }, { - .priority = 2, + .bg = 2, .tilemapLeft = 21, .tilemapTop = 15, .width = 9, @@ -961,7 +961,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .baseBlock = 0x006b, }, { - .priority = 2, + .bg = 2, .tilemapLeft = 10, .tilemapTop = 2, .width = 4, @@ -970,7 +970,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .baseBlock = 0x00c1, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 19, .tilemapTop = 2, .width = 11, @@ -979,7 +979,7 @@ static const struct WindowTemplate sSwap_WindowTemplates[] = .baseBlock = 0x00c9, }, { - .priority = 0, + .bg = 0, .tilemapLeft = 15, .tilemapTop = 0, .width = 15, |