minor fixes
This commit is contained in:
@@ -27,7 +27,7 @@ struct TransitionData
|
|||||||
u16 winOut;
|
u16 winOut;
|
||||||
u16 win0H;
|
u16 win0H;
|
||||||
u16 win0V;
|
u16 win0V;
|
||||||
u16 unused_A;
|
u16 win1H; // not used
|
||||||
u16 win1V;
|
u16 win1V;
|
||||||
u16 bldCnt;
|
u16 bldCnt;
|
||||||
u16 bldAlpha;
|
u16 bldAlpha;
|
||||||
|
|||||||
+1
-1
@@ -613,7 +613,7 @@ static void sub_80B82C0(u8 taskId)
|
|||||||
{
|
{
|
||||||
case 0:
|
case 0:
|
||||||
task->data[5] += 8;
|
task->data[5] += 8;
|
||||||
if (task->data[5] >= task->data[7])
|
if (task->data[5] >= task->data[7])
|
||||||
task->data[5] = task->data[7];
|
task->data[5] = task->data[7];
|
||||||
sub_80B843C(task);
|
sub_80B843C(task);
|
||||||
if (task->data[5] == task->data[7])
|
if (task->data[5] == task->data[7])
|
||||||
|
|||||||
+1
-2
@@ -416,8 +416,7 @@ static void sub_80B91B0(u8 taskId)
|
|||||||
task->data[12] = gBattle_BG1_X;
|
task->data[12] = gBattle_BG1_X;
|
||||||
else
|
else
|
||||||
task->data[12] = gBattle_BG2_X;
|
task->data[12] = gBattle_BG2_X;
|
||||||
|
var0 = GetBattlerYCoordWithElevation(gBattleAnimAttacker);
|
||||||
var0 = GetBattlerYCoordWithElevation(gBattleAnimAttacker);
|
|
||||||
task->data[14] = var0 - 32;
|
task->data[14] = var0 - 32;
|
||||||
task->data[15] = var0 + 32;
|
task->data[15] = var0 + 32;
|
||||||
++task->data[0];
|
++task->data[0];
|
||||||
|
|||||||
+1
-2
@@ -4652,8 +4652,7 @@ bool8 PokemonUseItemEffects2(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mo
|
|||||||
sp18 = itemEffect[r10];
|
sp18 = itemEffect[r10];
|
||||||
r10++;
|
r10++;
|
||||||
break;
|
break;
|
||||||
case 7:\
|
case 7:
|
||||||
|
|
||||||
if (GetMonData(mon, MON_DATA_FRIENDSHIP, NULL) >= 200
|
if (GetMonData(mon, MON_DATA_FRIENDSHIP, NULL) >= 200
|
||||||
&& retVal == FALSE
|
&& retVal == FALSE
|
||||||
&& sp18 == 0)
|
&& sp18 == 0)
|
||||||
|
|||||||
Reference in New Issue
Block a user