ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

spd to speed

Browse Source
This commit is contained in:
DizzyEggg 2017-10-24 15:35:36 +02:00
parent 0659b19e99
commit 94b3a8dd69
8 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/pokemon.h
View File

@ -30,7 +30,7 @@
#define MON_DATA_HP_EV 26 #define MON_DATA_HP_EV 26
#define MON_DATA_ATK_EV 27 #define MON_DATA_ATK_EV 27
#define MON_DATA_DEF_EV 28 #define MON_DATA_DEF_EV 28
#define MON_DATA_SPD_EV 29 #define MON_DATA_SPEED_EV 29
#define MON_DATA_SPATK_EV 30 #define MON_DATA_SPATK_EV 30
#define MON_DATA_SPDEF_EV 31 #define MON_DATA_SPDEF_EV 31
#define MON_DATA_FRIENDSHIP 32 #define MON_DATA_FRIENDSHIP 32
@ -43,7 +43,7 @@
#define MON_DATA_HP_IV 39 #define MON_DATA_HP_IV 39
#define MON_DATA_ATK_IV 40 #define MON_DATA_ATK_IV 40
#define MON_DATA_DEF_IV 41 #define MON_DATA_DEF_IV 41
#define MON_DATA_SPEED_IV 42 #define MON_DATA_SPEED_IV 42
#define MON_DATA_SPATK_IV 43 #define MON_DATA_SPATK_IV 43
#define MON_DATA_SPDEF_IV 44 #define MON_DATA_SPDEF_IV 44
#define MON_DATA_IS_EGG 45 #define MON_DATA_IS_EGG 45
@ -62,7 +62,7 @@
#define MON_DATA_MAX_HP 58 #define MON_DATA_MAX_HP 58
#define MON_DATA_ATK 59 #define MON_DATA_ATK 59
#define MON_DATA_DEF 60 #define MON_DATA_DEF 60
#define MON_DATA_SPEED 61 #define MON_DATA_SPEED 61
#define MON_DATA_SPATK 62 #define MON_DATA_SPATK 62
#define MON_DATA_SPDEF 63 #define MON_DATA_SPDEF 63
#define MON_DATA_MAIL 64 #define MON_DATA_MAIL 64

24
src/battle_controller_link_opponent.c
View File

@ -621,7 +621,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
battleMon.hpIV = GetMonData(&gEnemyParty[monId], MON_DATA_HP_IV); battleMon.hpIV = GetMonData(&gEnemyParty[monId], MON_DATA_HP_IV);
battleMon.attackIV = GetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV); battleMon.attackIV = GetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV);
battleMon.defenseIV = GetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV); battleMon.defenseIV = GetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV);
battleMon.speedIV = GetMonData(&gEnemyParty[monId], MON_DATA_SPD_IV); battleMon.speedIV = GetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV);
battleMon.spAttackIV = GetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV); battleMon.spAttackIV = GetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV);
battleMon.spDefenseIV = GetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV); battleMon.spDefenseIV = GetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV);
battleMon.personality = GetMonData(&gEnemyParty[monId], MON_DATA_PERSONALITY); battleMon.personality = GetMonData(&gEnemyParty[monId], MON_DATA_PERSONALITY);
@ -631,7 +631,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
battleMon.maxHP = GetMonData(&gEnemyParty[monId], MON_DATA_MAX_HP); battleMon.maxHP = GetMonData(&gEnemyParty[monId], MON_DATA_MAX_HP);
battleMon.attack = GetMonData(&gEnemyParty[monId], MON_DATA_ATK); battleMon.attack = GetMonData(&gEnemyParty[monId], MON_DATA_ATK);
battleMon.defense = GetMonData(&gEnemyParty[monId], MON_DATA_DEF); battleMon.defense = GetMonData(&gEnemyParty[monId], MON_DATA_DEF);
battleMon.speed = GetMonData(&gEnemyParty[monId], MON_DATA_SPD); battleMon.speed = GetMonData(&gEnemyParty[monId], MON_DATA_SPEED);
battleMon.spAttack = GetMonData(&gEnemyParty[monId], MON_DATA_SPATK); battleMon.spAttack = GetMonData(&gEnemyParty[monId], MON_DATA_SPATK);
battleMon.spDefense = GetMonData(&gEnemyParty[monId], MON_DATA_SPDEF); battleMon.spDefense = GetMonData(&gEnemyParty[monId], MON_DATA_SPDEF);
battleMon.isEgg = GetMonData(&gEnemyParty[monId], MON_DATA_IS_EGG); battleMon.isEgg = GetMonData(&gEnemyParty[monId], MON_DATA_IS_EGG);
@ -716,7 +716,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
size = 1; size = 1;
break; break;
case REQUEST_SPEED_EV_BATTLE: case REQUEST_SPEED_EV_BATTLE:
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_SPD_EV); dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_SPEED_EV);
size = 1; size = 1;
break; break;
case REQUEST_SPATK_EV_BATTLE: case REQUEST_SPATK_EV_BATTLE:
@ -755,7 +755,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_HP_IV); dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_HP_IV);
dst[1] = GetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV); dst[1] = GetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV);
dst[2] = GetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV); dst[2] = GetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV);
dst[3] = GetMonData(&gEnemyParty[monId], MON_DATA_SPD_IV); dst[3] = GetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV);
dst[4] = GetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV); dst[4] = GetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV);
dst[5] = GetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV); dst[5] = GetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV);
size = 6; size = 6;
@ -773,7 +773,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
size = 1; size = 1;
break; break;
case REQUEST_SPEED_IV_BATTLE: case REQUEST_SPEED_IV_BATTLE:
dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_SPD_IV); dst[0] = GetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV);
size = 1; size = 1;
break; break;
case REQUEST_SPATK_IV_BATTLE: case REQUEST_SPATK_IV_BATTLE:
@ -835,7 +835,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
size = 2; size = 2;
break; break;
case REQUEST_SPEED_BATTLE: case REQUEST_SPEED_BATTLE:
data16 = GetMonData(&gEnemyParty[monId], MON_DATA_SPD); data16 = GetMonData(&gEnemyParty[monId], MON_DATA_SPEED);
dst[0] = data16; dst[0] = data16;
dst[1] = data16 >> 8; dst[1] = data16 >> 8;
size = 2; size = 2;
@ -957,7 +957,7 @@ static void SetLinkOpponentMonData(u8 monId)
iv = battlePokemon->defenseIV; iv = battlePokemon->defenseIV;
SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &iv); SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &iv);
iv = battlePokemon->speedIV; iv = battlePokemon->speedIV;
SetMonData(&gEnemyParty[monId], MON_DATA_SPD_IV, &iv); SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &iv);
iv = battlePokemon->spAttackIV; iv = battlePokemon->spAttackIV;
SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &iv); SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &iv);
iv = battlePokemon->spDefenseIV; iv = battlePokemon->spDefenseIV;
@ -969,7 +969,7 @@ static void SetLinkOpponentMonData(u8 monId)
SetMonData(&gEnemyParty[monId], MON_DATA_MAX_HP, &battlePokemon->maxHP); SetMonData(&gEnemyParty[monId], MON_DATA_MAX_HP, &battlePokemon->maxHP);
SetMonData(&gEnemyParty[monId], MON_DATA_ATK, &battlePokemon->attack); SetMonData(&gEnemyParty[monId], MON_DATA_ATK, &battlePokemon->attack);
SetMonData(&gEnemyParty[monId], MON_DATA_DEF, &battlePokemon->defense); SetMonData(&gEnemyParty[monId], MON_DATA_DEF, &battlePokemon->defense);
SetMonData(&gEnemyParty[monId], MON_DATA_SPD, &battlePokemon->speed); SetMonData(&gEnemyParty[monId], MON_DATA_SPEED, &battlePokemon->speed);
SetMonData(&gEnemyParty[monId], MON_DATA_SPATK, &battlePokemon->spAttack); SetMonData(&gEnemyParty[monId], MON_DATA_SPATK, &battlePokemon->spAttack);
SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF, &battlePokemon->spDefense); SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF, &battlePokemon->spDefense);
} }
@ -1023,7 +1023,7 @@ static void SetLinkOpponentMonData(u8 monId)
SetMonData(&gEnemyParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gEnemyParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_EV_BATTLE: case REQUEST_SPEED_EV_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_EV_BATTLE: case REQUEST_SPATK_EV_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
@ -1053,7 +1053,7 @@ static void SetLinkOpponentMonData(u8 monId)
SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gEnemyParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]); SetMonData(&gEnemyParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]); SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
SetMonData(&gEnemyParty[monId], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][6]); SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]); SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]); SetMonData(&gEnemyParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
break; break;
@ -1067,7 +1067,7 @@ static void SetLinkOpponentMonData(u8 monId)
SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gEnemyParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_IV_BATTLE: case REQUEST_SPEED_IV_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gEnemyParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_IV_BATTLE: case REQUEST_SPATK_IV_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gEnemyParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
@ -1100,7 +1100,7 @@ static void SetLinkOpponentMonData(u8 monId)
SetMonData(&gEnemyParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]); SetMonData(&gEnemyParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_BATTLE: case REQUEST_SPEED_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_SPD, &gBattleBufferA[gActiveBank][3]); SetMonData(&gEnemyParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_BATTLE: case REQUEST_SPATK_BATTLE:
SetMonData(&gEnemyParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]); SetMonData(&gEnemyParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);

24
src/battle_controller_link_partner.c
View File

@ -503,7 +503,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
battleMon.hpIV = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV); battleMon.hpIV = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV);
battleMon.attackIV = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV); battleMon.attackIV = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV);
battleMon.defenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV); battleMon.defenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV);
battleMon.speedIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); battleMon.speedIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
battleMon.spAttackIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV); battleMon.spAttackIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV);
battleMon.spDefenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV); battleMon.spDefenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV);
battleMon.personality = GetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY); battleMon.personality = GetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY);
@ -513,7 +513,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
battleMon.maxHP = GetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP); battleMon.maxHP = GetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP);
battleMon.attack = GetMonData(&gPlayerParty[monId], MON_DATA_ATK); battleMon.attack = GetMonData(&gPlayerParty[monId], MON_DATA_ATK);
battleMon.defense = GetMonData(&gPlayerParty[monId], MON_DATA_DEF); battleMon.defense = GetMonData(&gPlayerParty[monId], MON_DATA_DEF);
battleMon.speed = GetMonData(&gPlayerParty[monId], MON_DATA_SPD); battleMon.speed = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED);
battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK); battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK);
battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF); battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF);
battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG); battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG);
@ -598,7 +598,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
size = 1; size = 1;
break; break;
case REQUEST_SPEED_EV_BATTLE: case REQUEST_SPEED_EV_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_EV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV);
size = 1; size = 1;
break; break;
case REQUEST_SPATK_EV_BATTLE: case REQUEST_SPATK_EV_BATTLE:
@ -637,7 +637,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV);
dst[1] = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV); dst[1] = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV);
dst[2] = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV); dst[2] = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV);
dst[3] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); dst[3] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
dst[4] = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV); dst[4] = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV);
dst[5] = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV); dst[5] = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV);
size = 6; size = 6;
@ -655,7 +655,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
size = 1; size = 1;
break; break;
case REQUEST_SPEED_IV_BATTLE: case REQUEST_SPEED_IV_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
size = 1; size = 1;
break; break;
case REQUEST_SPATK_IV_BATTLE: case REQUEST_SPATK_IV_BATTLE:
@ -717,7 +717,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
size = 2; size = 2;
break; break;
case REQUEST_SPEED_BATTLE: case REQUEST_SPEED_BATTLE:
data16 = GetMonData(&gPlayerParty[monId], MON_DATA_SPD); data16 = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED);
dst[0] = data16; dst[0] = data16;
dst[1] = data16 >> 8; dst[1] = data16 >> 8;
size = 2; size = 2;
@ -839,7 +839,7 @@ static void SetLinkPartnerMonData(u8 monId)
iv = battlePokemon->defenseIV; iv = battlePokemon->defenseIV;
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &iv);
iv = battlePokemon->speedIV; iv = battlePokemon->speedIV;
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &iv);
iv = battlePokemon->spAttackIV; iv = battlePokemon->spAttackIV;
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &iv);
iv = battlePokemon->spDefenseIV; iv = battlePokemon->spDefenseIV;
@ -851,7 +851,7 @@ static void SetLinkPartnerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &battlePokemon->maxHP); SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &battlePokemon->maxHP);
SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &battlePokemon->attack); SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &battlePokemon->attack);
SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &battlePokemon->defense); SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &battlePokemon->defense);
SetMonData(&gPlayerParty[monId], MON_DATA_SPD, &battlePokemon->speed); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &battlePokemon->speed);
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &battlePokemon->spAttack); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &battlePokemon->spAttack);
SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &battlePokemon->spDefense); SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &battlePokemon->spDefense);
} }
@ -905,7 +905,7 @@ static void SetLinkPartnerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_EV_BATTLE: case REQUEST_SPEED_EV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_EV_BATTLE: case REQUEST_SPATK_EV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
@ -935,7 +935,7 @@ static void SetLinkPartnerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]); SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][6]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]); SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
break; break;
@ -949,7 +949,7 @@ static void SetLinkPartnerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_IV_BATTLE: case REQUEST_SPEED_IV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_IV_BATTLE: case REQUEST_SPATK_IV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
@ -982,7 +982,7 @@ static void SetLinkPartnerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_BATTLE: case REQUEST_SPEED_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_BATTLE: case REQUEST_SPATK_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);

24
src/battle_controller_player.c
View File

@ -1661,7 +1661,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
battleMon.hpIV = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV); battleMon.hpIV = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV);
battleMon.attackIV = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV); battleMon.attackIV = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV);
battleMon.defenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV); battleMon.defenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV);
battleMon.speedIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); battleMon.speedIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
battleMon.spAttackIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV); battleMon.spAttackIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV);
battleMon.spDefenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV); battleMon.spDefenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV);
battleMon.personality = GetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY); battleMon.personality = GetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY);
@ -1671,7 +1671,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
battleMon.maxHP = GetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP); battleMon.maxHP = GetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP);
battleMon.attack = GetMonData(&gPlayerParty[monId], MON_DATA_ATK); battleMon.attack = GetMonData(&gPlayerParty[monId], MON_DATA_ATK);
battleMon.defense = GetMonData(&gPlayerParty[monId], MON_DATA_DEF); battleMon.defense = GetMonData(&gPlayerParty[monId], MON_DATA_DEF);
battleMon.speed = GetMonData(&gPlayerParty[monId], MON_DATA_SPD); battleMon.speed = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED);
battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK); battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK);
battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF); battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF);
battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG); battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG);
@ -1756,7 +1756,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
size = 1; size = 1;
break; break;
case REQUEST_SPEED_EV_BATTLE: case REQUEST_SPEED_EV_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_EV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV);
size = 1; size = 1;
break; break;
case REQUEST_SPATK_EV_BATTLE: case REQUEST_SPATK_EV_BATTLE:
@ -1795,7 +1795,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV);
dst[1] = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV); dst[1] = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV);
dst[2] = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV); dst[2] = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV);
dst[3] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); dst[3] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
dst[4] = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV); dst[4] = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV);
dst[5] = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV); dst[5] = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV);
size = 6; size = 6;
@ -1813,7 +1813,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
size = 1; size = 1;
break; break;
case REQUEST_SPEED_IV_BATTLE: case REQUEST_SPEED_IV_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
size = 1; size = 1;
break; break;
case REQUEST_SPATK_IV_BATTLE: case REQUEST_SPATK_IV_BATTLE:
@ -1875,7 +1875,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
size = 2; size = 2;
break; break;
case REQUEST_SPEED_BATTLE: case REQUEST_SPEED_BATTLE:
data16 = GetMonData(&gPlayerParty[monId], MON_DATA_SPD); data16 = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED);
dst[0] = data16; dst[0] = data16;
dst[1] = data16 >> 8; dst[1] = data16 >> 8;
size = 2; size = 2;
@ -2006,7 +2006,7 @@ static void SetPlayerMonData(u8 monId)
iv = battlePokemon->defenseIV; iv = battlePokemon->defenseIV;
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &iv);
iv = battlePokemon->speedIV; iv = battlePokemon->speedIV;
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &iv);
iv = battlePokemon->spAttackIV; iv = battlePokemon->spAttackIV;
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &iv);
iv = battlePokemon->spDefenseIV; iv = battlePokemon->spDefenseIV;
@ -2018,7 +2018,7 @@ static void SetPlayerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &battlePokemon->maxHP); SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &battlePokemon->maxHP);
SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &battlePokemon->attack); SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &battlePokemon->attack);
SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &battlePokemon->defense); SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &battlePokemon->defense);
SetMonData(&gPlayerParty[monId], MON_DATA_SPD, &battlePokemon->speed); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &battlePokemon->speed);
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &battlePokemon->spAttack); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &battlePokemon->spAttack);
SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &battlePokemon->spDefense); SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &battlePokemon->spDefense);
} }
@ -2072,7 +2072,7 @@ static void SetPlayerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_EV_BATTLE: case REQUEST_SPEED_EV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_EV_BATTLE: case REQUEST_SPATK_EV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
@ -2102,7 +2102,7 @@ static void SetPlayerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]); SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][6]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]); SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
break; break;
@ -2116,7 +2116,7 @@ static void SetPlayerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_IV_BATTLE: case REQUEST_SPEED_IV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_IV_BATTLE: case REQUEST_SPATK_IV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
@ -2149,7 +2149,7 @@ static void SetPlayerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_BATTLE: case REQUEST_SPEED_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_BATTLE: case REQUEST_SPATK_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);

24
src/battle_controller_player_partner.c
View File

@ -690,7 +690,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
battleMon.hpIV = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV); battleMon.hpIV = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV);
battleMon.attackIV = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV); battleMon.attackIV = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV);
battleMon.defenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV); battleMon.defenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV);
battleMon.speedIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); battleMon.speedIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
battleMon.spAttackIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV); battleMon.spAttackIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV);
battleMon.spDefenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV); battleMon.spDefenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV);
battleMon.personality = GetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY); battleMon.personality = GetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY);
@ -700,7 +700,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
battleMon.maxHP = GetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP); battleMon.maxHP = GetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP);
battleMon.attack = GetMonData(&gPlayerParty[monId], MON_DATA_ATK); battleMon.attack = GetMonData(&gPlayerParty[monId], MON_DATA_ATK);
battleMon.defense = GetMonData(&gPlayerParty[monId], MON_DATA_DEF); battleMon.defense = GetMonData(&gPlayerParty[monId], MON_DATA_DEF);
battleMon.speed = GetMonData(&gPlayerParty[monId], MON_DATA_SPD); battleMon.speed = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED);
battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK); battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK);
battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF); battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF);
battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG); battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG);
@ -785,7 +785,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
size = 1; size = 1;
break; break;
case REQUEST_SPEED_EV_BATTLE: case REQUEST_SPEED_EV_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_EV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV);
size = 1; size = 1;
break; break;
case REQUEST_SPATK_EV_BATTLE: case REQUEST_SPATK_EV_BATTLE:
@ -824,7 +824,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV);
dst[1] = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV); dst[1] = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV);
dst[2] = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV); dst[2] = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV);
dst[3] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); dst[3] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
dst[4] = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV); dst[4] = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV);
dst[5] = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV); dst[5] = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV);
size = 6; size = 6;
@ -842,7 +842,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
size = 1; size = 1;
break; break;
case REQUEST_SPEED_IV_BATTLE: case REQUEST_SPEED_IV_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
size = 1; size = 1;
break; break;
case REQUEST_SPATK_IV_BATTLE: case REQUEST_SPATK_IV_BATTLE:
@ -904,7 +904,7 @@ static u32 CopyPlayerPartnerMonData(u8 monId, u8 *dst)
size = 2; size = 2;
break; break;
case REQUEST_SPEED_BATTLE: case REQUEST_SPEED_BATTLE:
data16 = GetMonData(&gPlayerParty[monId], MON_DATA_SPD); data16 = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED);
dst[0] = data16; dst[0] = data16;
dst[1] = data16 >> 8; dst[1] = data16 >> 8;
size = 2; size = 2;
@ -1026,7 +1026,7 @@ static void SetPlayerPartnerMonData(u8 monId)
iv = battlePokemon->defenseIV; iv = battlePokemon->defenseIV;
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &iv);
iv = battlePokemon->speedIV; iv = battlePokemon->speedIV;
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &iv);
iv = battlePokemon->spAttackIV; iv = battlePokemon->spAttackIV;
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &iv);
iv = battlePokemon->spDefenseIV; iv = battlePokemon->spDefenseIV;
@ -1038,7 +1038,7 @@ static void SetPlayerPartnerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &battlePokemon->maxHP); SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &battlePokemon->maxHP);
SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &battlePokemon->attack); SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &battlePokemon->attack);
SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &battlePokemon->defense); SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &battlePokemon->defense);
SetMonData(&gPlayerParty[monId], MON_DATA_SPD, &battlePokemon->speed); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &battlePokemon->speed);
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &battlePokemon->spAttack); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &battlePokemon->spAttack);
SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &battlePokemon->spDefense); SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &battlePokemon->spDefense);
} }
@ -1092,7 +1092,7 @@ static void SetPlayerPartnerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_EV_BATTLE: case REQUEST_SPEED_EV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_EV_BATTLE: case REQUEST_SPATK_EV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
@ -1122,7 +1122,7 @@ static void SetPlayerPartnerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]); SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][6]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]); SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
break; break;
@ -1136,7 +1136,7 @@ static void SetPlayerPartnerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_IV_BATTLE: case REQUEST_SPEED_IV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_IV_BATTLE: case REQUEST_SPATK_IV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
@ -1169,7 +1169,7 @@ static void SetPlayerPartnerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_BATTLE: case REQUEST_SPEED_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_BATTLE: case REQUEST_SPATK_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);

24
src/battle_controller_recorded_player.c
View File

@ -588,7 +588,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
battleMon.hpIV = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV); battleMon.hpIV = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV);
battleMon.attackIV = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV); battleMon.attackIV = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV);
battleMon.defenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV); battleMon.defenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV);
battleMon.speedIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); battleMon.speedIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
battleMon.spAttackIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV); battleMon.spAttackIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV);
battleMon.spDefenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV); battleMon.spDefenseIV = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV);
battleMon.personality = GetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY); battleMon.personality = GetMonData(&gPlayerParty[monId], MON_DATA_PERSONALITY);
@ -598,7 +598,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
battleMon.maxHP = GetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP); battleMon.maxHP = GetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP);
battleMon.attack = GetMonData(&gPlayerParty[monId], MON_DATA_ATK); battleMon.attack = GetMonData(&gPlayerParty[monId], MON_DATA_ATK);
battleMon.defense = GetMonData(&gPlayerParty[monId], MON_DATA_DEF); battleMon.defense = GetMonData(&gPlayerParty[monId], MON_DATA_DEF);
battleMon.speed = GetMonData(&gPlayerParty[monId], MON_DATA_SPD); battleMon.speed = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED);
battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK); battleMon.spAttack = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK);
battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF); battleMon.spDefense = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF);
battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG); battleMon.isEgg = GetMonData(&gPlayerParty[monId], MON_DATA_IS_EGG);
@ -683,7 +683,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
size = 1; size = 1;
break; break;
case REQUEST_SPEED_EV_BATTLE: case REQUEST_SPEED_EV_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_EV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV);
size = 1; size = 1;
break; break;
case REQUEST_SPATK_EV_BATTLE: case REQUEST_SPATK_EV_BATTLE:
@ -722,7 +722,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_HP_IV);
dst[1] = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV); dst[1] = GetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV);
dst[2] = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV); dst[2] = GetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV);
dst[3] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); dst[3] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
dst[4] = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV); dst[4] = GetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV);
dst[5] = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV); dst[5] = GetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV);
size = 6; size = 6;
@ -740,7 +740,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
size = 1; size = 1;
break; break;
case REQUEST_SPEED_IV_BATTLE: case REQUEST_SPEED_IV_BATTLE:
dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV); dst[0] = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV);
size = 1; size = 1;
break; break;
case REQUEST_SPATK_IV_BATTLE: case REQUEST_SPATK_IV_BATTLE:
@ -802,7 +802,7 @@ static u32 CopyRecordedPlayerMonData(u8 monId, u8 *dst)
size = 2; size = 2;
break; break;
case REQUEST_SPEED_BATTLE: case REQUEST_SPEED_BATTLE:
data16 = GetMonData(&gPlayerParty[monId], MON_DATA_SPD); data16 = GetMonData(&gPlayerParty[monId], MON_DATA_SPEED);
dst[0] = data16; dst[0] = data16;
dst[1] = data16 >> 8; dst[1] = data16 >> 8;
size = 2; size = 2;
@ -924,7 +924,7 @@ static void SetRecordedPlayerMonData(u8 monId)
iv = battlePokemon->defenseIV; iv = battlePokemon->defenseIV;
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &iv);
iv = battlePokemon->speedIV; iv = battlePokemon->speedIV;
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &iv);
iv = battlePokemon->spAttackIV; iv = battlePokemon->spAttackIV;
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &iv); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &iv);
iv = battlePokemon->spDefenseIV; iv = battlePokemon->spDefenseIV;
@ -936,7 +936,7 @@ static void SetRecordedPlayerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &battlePokemon->maxHP); SetMonData(&gPlayerParty[monId], MON_DATA_MAX_HP, &battlePokemon->maxHP);
SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &battlePokemon->attack); SetMonData(&gPlayerParty[monId], MON_DATA_ATK, &battlePokemon->attack);
SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &battlePokemon->defense); SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &battlePokemon->defense);
SetMonData(&gPlayerParty[monId], MON_DATA_SPD, &battlePokemon->speed); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &battlePokemon->speed);
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &battlePokemon->spAttack); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &battlePokemon->spAttack);
SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &battlePokemon->spDefense); SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF, &battlePokemon->spDefense);
} }
@ -990,7 +990,7 @@ static void SetRecordedPlayerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_EV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_EV_BATTLE: case REQUEST_SPEED_EV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_EV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_EV_BATTLE: case REQUEST_SPATK_EV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_EV, &gBattleBufferA[gActiveBank][3]);
@ -1020,7 +1020,7 @@ static void SetRecordedPlayerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_HP_IV, &gBattleBufferA[gActiveBank][3]);
SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]); SetMonData(&gPlayerParty[monId], MON_DATA_ATK_IV, &gBattleBufferA[gActiveBank][4]);
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][5]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][6]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][6]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][7]);
SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]); SetMonData(&gPlayerParty[monId], MON_DATA_SPDEF_IV, &gBattleBufferA[gActiveBank][8]);
break; break;
@ -1034,7 +1034,7 @@ static void SetRecordedPlayerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF_IV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_IV_BATTLE: case REQUEST_SPEED_IV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED_IV, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_IV_BATTLE: case REQUEST_SPATK_IV_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK_IV, &gBattleBufferA[gActiveBank][3]);
@ -1067,7 +1067,7 @@ static void SetRecordedPlayerMonData(u8 monId)
SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_DEF, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPEED_BATTLE: case REQUEST_SPEED_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPD, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPEED, &gBattleBufferA[gActiveBank][3]);
break; break;
case REQUEST_SPATK_BATTLE: case REQUEST_SPATK_BATTLE:
SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]); SetMonData(&gPlayerParty[monId], MON_DATA_SPATK, &gBattleBufferA[gActiveBank][3]);

4
src/pokemon_1.c
View File

@ -305,7 +305,7 @@ void sub_806819C(struct Pokemon *mon, struct UnknownPokemonStruct *src)
SetMonData(mon, MON_DATA_HP_EV, &src->hpEV); SetMonData(mon, MON_DATA_HP_EV, &src->hpEV);
SetMonData(mon, MON_DATA_ATK_EV, &src->attackEV); SetMonData(mon, MON_DATA_ATK_EV, &src->attackEV);
SetMonData(mon, MON_DATA_DEF_EV, &src->defenseEV); SetMonData(mon, MON_DATA_DEF_EV, &src->defenseEV);
SetMonData(mon, MON_DATA_SPD_EV, &src->speedEV); SetMonData(mon, MON_DATA_SPEED_EV, &src->speedEV);
SetMonData(mon, MON_DATA_SPATK_EV, &src->spAttackEV); SetMonData(mon, MON_DATA_SPATK_EV, &src->spAttackEV);
SetMonData(mon, MON_DATA_SPDEF_EV, &src->spDefenseEV); SetMonData(mon, MON_DATA_SPDEF_EV, &src->spDefenseEV);
value = src->altAbility; value = src->altAbility;
@ -369,7 +369,7 @@ void sub_8068338(struct Pokemon *mon, struct UnknownPokemonStruct *src, bool8 lv
SetMonData(mon, MON_DATA_HP_EV, &src->hpEV); SetMonData(mon, MON_DATA_HP_EV, &src->hpEV);
SetMonData(mon, MON_DATA_ATK_EV, &src->attackEV); SetMonData(mon, MON_DATA_ATK_EV, &src->attackEV);
SetMonData(mon, MON_DATA_DEF_EV, &src->defenseEV); SetMonData(mon, MON_DATA_DEF_EV, &src->defenseEV);
SetMonData(mon, MON_DATA_SPD_EV, &src->speedEV); SetMonData(mon, MON_DATA_SPEED_EV, &src->speedEV);
SetMonData(mon, MON_DATA_SPATK_EV, &src->spAttackEV); SetMonData(mon, MON_DATA_SPATK_EV, &src->spAttackEV);
SetMonData(mon, MON_DATA_SPDEF_EV, &src->spDefenseEV); SetMonData(mon, MON_DATA_SPDEF_EV, &src->spDefenseEV);
value = src->altAbility; value = src->altAbility;

4
src/pokemon_2.c
View File

@ -513,7 +513,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
case MON_DATA_DEF_EV: case MON_DATA_DEF_EV:
retVal = substruct2->defenseEV; retVal = substruct2->defenseEV;
break; break;
case MON_DATA_SPD_EV: case MON_DATA_SPEED_EV:
retVal = substruct2->speedEV; retVal = substruct2->speedEV;
break; break;
case MON_DATA_SPATK_EV: case MON_DATA_SPATK_EV:
@ -881,7 +881,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
case MON_DATA_DEF_EV: case MON_DATA_DEF_EV:
SET8(substruct2->defenseEV); SET8(substruct2->defenseEV);
break; break;
case MON_DATA_SPD_EV: case MON_DATA_SPEED_EV:
SET8(substruct2->speedEV); SET8(substruct2->speedEV);
break; break;
case MON_DATA_SPATK_EV: case MON_DATA_SPATK_EV: