mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-27 13:53:52 +01:00
holding back on casts
This commit is contained in:
parent
ebcb982e16
commit
c722b77558
@ -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)
|
||||||
{
|
{
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user