diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-24 23:19:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 23:19:48 -0400 |
| commit | 35b68c68ee565b9b232252e4f37ea082e9310560 (patch) | |
| tree | aeacb544f27db8f63b17b7e808b28f4a1e12acde /src/battle_transition.c | |
| parent | d8b76e6fb545efd69bfb18322a67243520e4d11d (diff) | |
| parent | 7f70b570dd2e18a34a2c0ee558f404c15c77371c (diff) | |
Merge pull request #404 from PikalaxALT/misc_doc
[PARTIALLY LEAK INFORMED] Miscellaneous cleanup and documentation
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 7d117f50f..e07bcd582 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1033,7 +1033,7 @@ static bool8 BT_Phase2SlidingPokeballs_LoadBgGfx(struct Task *task) u16 *tilemapAddr, *tilesetAddr; BT_GetBg0TilemapAndTilesetBase(&tilemapAddr, &tilesetAddr); - CpuSet(sSlidingPokeballTilemap, tilesetAddr, 0x20); + CpuCopy16(sSlidingPokeballTilemap, tilesetAddr, 0x40); CpuFill32(0, tilemapAddr, 0x800); LoadPalette(sSlidingPokeballBigPokeballPalette, 0xF0, 0x20); ++task->tState; @@ -1827,7 +1827,7 @@ static bool8 BT_Phase2Mugshot_LoadGfx(struct Task *task) const u16 *mugshotsMap = sVsBarTilemap; BT_GetBg0TilemapAndTilesetBase(&tilemapAddr, &tilesetAddr); - CpuSet(sVsBarTileset, tilesetAddr, 0xF0); + CpuCopy16(sVsBarTileset, tilesetAddr, 0x1E0); LoadPalette(sVsBarOpponentPalettes[task->tWhichMugshot], 0xF0, 0x20); LoadPalette(sVsBarPlayerPalettes[gSaveBlock2Ptr->playerGender], 0xFA, 0xC); for (i = 0; i < 20; ++i) @@ -2438,7 +2438,7 @@ static bool8 BT_Phase2GridSquares_LoadGfx(struct Task *task) u16 *tilemapAddr, *tilesetAddr; BT_GetBg0TilemapAndTilesetBase(&tilemapAddr, &tilesetAddr); - CpuSet(sGridSquareTileset, tilesetAddr, 0x10); + CpuCopy16(sGridSquareTileset, tilesetAddr, 0x20); CpuFill16(0xF000, tilemapAddr, 0x800); LoadPalette(sSlidingPokeballBigPokeballPalette, 0xF0, 0x20); ++task->tState; @@ -2454,7 +2454,7 @@ static bool8 BT_Phase2GridSquares_UpdateTileset(struct Task *task) BT_GetBg0TilesetBase(&tilesetAddr); task->tDelay = 3; ++task->tWhichGrid; - CpuSet(sGridSquareTileset + (task->tWhichGrid * 8), tilesetAddr, 0x10); + CpuCopy16(sGridSquareTileset + (task->tWhichGrid * 8), tilesetAddr, 0x20); if (task->tWhichGrid > 0xD) { ++task->tState; @@ -2501,7 +2501,7 @@ static bool8 BT_Phase2BlackDoodles_Init(struct Task *task) sTransitionStructPtr->win0V = WIN_RANGE(0, 0xA0); for (i = 0; i < 160; ++i) gScanlineEffectRegBuffers[0][i] = WIN_RANGE(0, 0xF0); - CpuSet(gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 160); + CpuCopy16(gScanlineEffectRegBuffers[0], gScanlineEffectRegBuffers[1], 0x140); SetVBlankCallback(VBCB_BT_Phase2BlackDoodles); ++task->tState; return TRUE; |