diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-09-30 03:04:15 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 03:04:15 -0500 |
| commit | 2a8ea4981ec66a4c98f9ac73847a7e7711102097 (patch) | |
| tree | 16a94fb0819997d21f5aef3dc6e04ec559855cb6 /src | |
| parent | f30b9eed2c4e4aca77353c51dcf2af7e41ad4277 (diff) | |
| parent | 5d56361973de99d20e099e787da6d587ffb8d35f (diff) | |
Merge pull request #54 from DizzyEggg/finish_pokemon2
finish pokemon 2 file
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokemon_2.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/pokemon_2.c b/src/pokemon_2.c index b6359f76a..c5c36c793 100644 --- a/src/pokemon_2.c +++ b/src/pokemon_2.c @@ -1308,10 +1308,9 @@ void sub_805EF84(u8 bank, bool8); extern struct BattlePokemon gBattleMons[4]; -/* - void CopyPlayerPartyMonToBattleData(u8 bank, u8 partyIndex) { + u16* hpSwitchout; s32 i; u8 nickname[POKEMON_NAME_LENGTH * 2]; @@ -1352,15 +1351,9 @@ void CopyPlayerPartyMonToBattleData(u8 bank, u8 partyIndex) GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, nickname); StringCopy10(gBattleMons[bank].nickname, nickname); GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_NAME, gBattleMons[bank].otName); - // ewram memes from Ruby return - #ifdef NONMATCHING - gBattleStruct->hpOnSwitchout[GetBankSide(bank)] = gBattleMons[bank].hp; - #else - { - u32 side = GetBankSide(bank); - *(u16*)((void*)(gBattleStruct) + side) = gBattleMons[bank].hp; - } - #endif // NONMATCHING + + hpSwitchout = &gBattleStruct->hpOnSwitchout[GetBankSide(bank)]; + *hpSwitchout = gBattleMons[bank].hp; for (i = 0; i < 8; i++) gBattleMons[bank].statStages[i] = 6; @@ -1369,4 +1362,3 @@ void CopyPlayerPartyMonToBattleData(u8 bank, u8 partyIndex) sub_803FA70(bank); sub_805EF84(bank, FALSE); } -*/ |