dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-10-16 02:18:41 +08:00
parent 407fc23f3f
commit 9243e792f3
4 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_transition.c
+1 -1
View File
@@ -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;
src/ground.c
-1
View File
@@ -416,7 +416,6 @@ 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;
src/pokemon.c
+1 -2
View File
@@ -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)