diff options
| author | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-09-24 00:52:57 -0400 |
|---|---|---|
| committer | Kelly Rauchenberger <fefferburbia@gmail.com> | 2017-09-24 00:52:57 -0400 |
| commit | ff8f173b8b6f97443edc4ac4437236378c2589a8 (patch) | |
| tree | 9ed1c09cdf5dcf24ed1e3e168398c1a9982c7256 /gba/source/main.c | |
| parent | 81b6679d3d2886f5608a09315fdc3b9d4f19f1fc (diff) | |
| download | gen3uploader-ff8f173b8b6f97443edc4ac4437236378c2589a8.tar.gz gen3uploader-ff8f173b8b6f97443edc4ac4437236378c2589a8.tar.bz2 gen3uploader-ff8f173b8b6f97443edc4ac4437236378c2589a8.zip | |
GBA now sends over entire party instead of just first Pokémon
Diffstat (limited to 'gba/source/main.c')
| -rw-r--r-- | gba/source/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
| diff --git a/gba/source/main.c b/gba/source/main.c index e5521b2..4bb120f 100644 --- a/gba/source/main.c +++ b/gba/source/main.c | |||
| @@ -179,21 +179,23 @@ int main(void) | |||
| 179 | 179 | ||
| 180 | // Start sending over party pokémon. | 180 | // Start sending over party pokémon. |
| 181 | struct Pokemon* playerParty = 0; | 181 | struct Pokemon* playerParty = 0; |
| 182 | u32 partyCount = 1; | ||
| 182 | if (GAME_RS) | 183 | if (GAME_RS) |
| 183 | { | 184 | { |
| 184 | playerParty = gameData.SaveBlock1->rs.playerParty; | 185 | playerParty = gameData.SaveBlock1->rs.playerParty; |
| 186 | partyCount = gameData.SaveBlock1->rs.playerPartyCount; | ||
| 185 | } else if (GAME_FRLG) | 187 | } else if (GAME_FRLG) |
| 186 | { | 188 | { |
| 187 | playerParty = gameData.SaveBlock1->frlg.playerParty; | 189 | playerParty = gameData.SaveBlock1->frlg.playerParty; |
| 190 | partyCount = gameData.SaveBlock1->frlg.playerPartyCount; | ||
| 188 | } else if (GAME_EM) | 191 | } else if (GAME_EM) |
| 189 | { | 192 | { |
| 190 | playerParty = gameData.SaveBlock1->e.playerParty; | 193 | playerParty = gameData.SaveBlock1->e.playerParty; |
| 194 | partyCount = gameData.SaveBlock1->e.playerPartyCount; | ||
| 191 | } | 195 | } |
| 192 | 196 | ||
| 193 | waitForResponse(); | 197 | waitForResponse(); |
| 194 | 198 | ||
| 195 | u32 partyCount = 1; | ||
| 196 | |||
| 197 | sendU32(partyCount); | 199 | sendU32(partyCount); |
| 198 | waitForAck(); | 200 | waitForAck(); |
| 199 | 201 | ||
