diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-09-24 10:17:34 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-24 10:17:34 -0400 |
commit | 42d2fefe0218f529f9c22f3b6b4230ca91a00de5 (patch) | |
tree | db4ae87659baced2022e440109306266c1c80e3b /src/contest_util.c | |
parent | f8f7617946e150514313267ba52a35ebd9052936 (diff) | |
parent | 09fd4fc4c57796036905cdc5caaa53fb96c436f8 (diff) |
Merge branch 'master' into tag-none
Diffstat (limited to 'src/contest_util.c')
-rw-r--r-- | src/contest_util.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/contest_util.c b/src/contest_util.c index aae05d531..66a666264 100644 --- a/src/contest_util.c +++ b/src/contest_util.c @@ -1194,16 +1194,16 @@ static s32 DrawResultsTextWindow(const u8 *text, u8 spriteId) for (i = 1; i < (int)ARRAY_COUNT(spriteTilePtrs); i++) spriteTilePtrs[i] = (void*)(gSprites[sprite->data[i - 1]].oam.tileNum * 32 + OBJ_VRAM0); - + for (i = 0; i < (int)ARRAY_COUNT(spriteTilePtrs); i++) CpuFill32(0, spriteTilePtrs[i], 0x400); - + dst = spriteTilePtrs[0]; CpuCopy32(src, dst, 0x20); CpuCopy32(src + 128, dst + 0x100, 0x20); CpuCopy32(src + 128, dst + 0x200, 0x20); CpuCopy32(src + 64, dst + 0x300, 0x20); - + for (i = 0; i < strWidth; i++) { dst = &spriteTilePtrs[(i + 1) / 8][((i + 1) % 8) * 32]; @@ -1236,7 +1236,7 @@ static void CreateResultsTextWindowSprites(void) LoadSpriteSheet(&sSpriteSheets_ResultsTextWindow[i]); LoadSpritePalette(&sSpritePalette_ResultsTextWindow); - + // Create sprites for the two window types, each made up of 4 sprites for (i = 0; i < (int)ARRAY_COUNT(sSpriteSheets_ResultsTextWindow); i++) { |