holding back on casts

This commit is contained in:
PokeCodec 2020-07-27 12:47:08 -04:00
parent c5aa91741b
commit ddd012f3ed
3 changed files with 4 additions and 4 deletions

View File

@ -242,7 +242,7 @@ u32 VerifyFlashSectorNBytes(u16 sectorNum, u8 *src, u32 n)
funcSrc = (u16 *)((uintptr_t)funcSrc ^ 1); funcSrc = (u16 *)((uintptr_t)funcSrc ^ 1);
funcDest = verifyFlashSector_Core_Buffer; funcDest = verifyFlashSector_Core_Buffer;
i = (u16)(((uintptr_t)VerifyFlashSector - (uintptr_t)VerifyFlashSector_Core) >> 1); i = ((uintptr_t)VerifyFlashSector - (uintptr_t)VerifyFlashSector_Core) >> 1;
while (i != 0) while (i != 0)
{ {

View File

@ -4445,7 +4445,7 @@ static void AnimBowMon_Step1_Callback(struct Sprite* sprite)
{ {
sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker];
PrepareBattlerSpriteForRotScale(sprite->data[3], ST_OAM_OBJ_NORMAL); PrepareBattlerSpriteForRotScale(sprite->data[3], ST_OAM_OBJ_NORMAL);
sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker)) ? 0x300 : (s16)0xFFFFFD00; sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker)) ? 0x300 : 0xFFFFFD00;
sprite->data[5] = 0; sprite->data[5] = 0;
} }

View File

@ -612,7 +612,7 @@ static void Task_Hof_PrintMonInfoAfterAnimating(u8 taskId)
static void Task_Hof_TryDisplayAnotherMon(u8 taskId) static void Task_Hof_TryDisplayAnotherMon(u8 taskId)
{ {
u16 currPokeID = (u16)gTasks[taskId].tDisplayedMonId; u16 currPokeID = gTasks[taskId].tDisplayedMonId;
struct HallofFameMon* currMon = &sHofMonPtr->mon[currPokeID]; struct HallofFameMon* currMon = &sHofMonPtr->mon[currPokeID];
if (gTasks[taskId].tFrameCount != 0) if (gTasks[taskId].tFrameCount != 0)
@ -1483,7 +1483,7 @@ static void UpdateDomeConfetti(struct ConfettiUtil *util)
static void Task_DoDomeConfetti(u8 taskId) static void Task_DoDomeConfetti(u8 taskId)
{ {
u32 id = 0; u32 id = 0;
u16 *data = (u16 *)gTasks[taskId].data; u16 *data = gTasks[taskId].data;
switch (tState) switch (tState)
{ {