diff options
| -rw-r--r-- | src/battle_transition.c | 10 | ||||
| -rw-r--r-- | src/ghost.c | 2 | ||||
| -rw-r--r-- | src/quest_log.c | 2 | ||||
| -rw-r--r-- | src/trainer_card.c | 2 |
4 files changed, 8 insertions, 8 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; diff --git a/src/ghost.c b/src/ghost.c index 0efcc28d4..c8ddf3c12 100644 --- a/src/ghost.c +++ b/src/ghost.c @@ -643,7 +643,7 @@ static void sub_80B5AD4(u8 taskId) break; case 1: task->data[14] = (task->data[14] + 16) * 16; - CpuSet(&gPlttBufferUnfaded[task->data[4]], &gPlttBufferFaded[task->data[14]], 0x4000008); + CpuCopy32(&gPlttBufferUnfaded[task->data[4]], &gPlttBufferFaded[task->data[14]], 0x20); BlendPalette(task->data[4], 16, 10, RGB(13, 0, 15)); ++task->data[15]; break; diff --git a/src/quest_log.c b/src/quest_log.c index 3616f19fe..a9686ab6f 100644 --- a/src/quest_log.c +++ b/src/quest_log.c @@ -1074,7 +1074,7 @@ void QuestLog_InitPalettesBackup(void) void QuestLog_BackUpPalette(u16 offset, u16 size) { - CpuSet(gPlttBufferUnfaded + offset, sPalettesBackup + offset, size); + CpuCopy16(gPlttBufferUnfaded + offset, sPalettesBackup + offset, size * 2); } static bool8 FieldCB2_FinalScene(void) diff --git a/src/trainer_card.c b/src/trainer_card.c index f1af00254..d3578dfb7 100644 --- a/src/trainer_card.c +++ b/src/trainer_card.c @@ -1412,7 +1412,7 @@ static void LoadMonIconGfx(void) { u8 i; - CpuSet(gMonIconPalettes, sTrainerCardDataPtr->monIconPals, NELEMS(sTrainerCardDataPtr->monIconPals)); + CpuCopy16(gMonIconPalettes, sTrainerCardDataPtr->monIconPals, 2 * NELEMS(sTrainerCardDataPtr->monIconPals)); switch (sTrainerCardDataPtr->trainerCard.monIconTint) { case MON_ICON_TINT_NORMAL: |