about summary refs log tree commit diff stats
path: root/gba/source/main.c
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2017-09-23 10:21:57 -0400
committerKelly Rauchenberger <fefferburbia@gmail.com>2017-09-23 10:21:57 -0400
commit6437a6cd49404b5e2e83bf940d8ac2284eb1e6bf (patch)
tree99bc9420d2817f78e3ca7f91db12ab085d5b051c /gba/source/main.c
parenteeaa6c5fd4957b6719fcb9f76cef5f9931237891 (diff)
downloadgen3uploader-6437a6cd49404b5e2e83bf940d8ac2284eb1e6bf.tar.gz
gen3uploader-6437a6cd49404b5e2e83bf940d8ac2284eb1e6bf.tar.bz2
gen3uploader-6437a6cd49404b5e2e83bf940d8ac2284eb1e6bf.zip
Fixed shininess determination
Shininess is determined with the ID of the OT, not the game the Pokémon
is currently in.
Diffstat (limited to 'gba/source/main.c')
-rw-r--r--gba/source/main.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/gba/source/main.c b/gba/source/main.c index 0934e91..e5521b2 100644 --- a/gba/source/main.c +++ b/gba/source/main.c
@@ -106,10 +106,6 @@ int main(void)
106 (trainerId[1] << 8) 106 (trainerId[1] << 8)
107 | (trainerId[0]); 107 | (trainerId[0]);
108 108
109 u16 secretIdNum =
110 (trainerId[3] << 8)
111 | (trainerId[2]);
112
113 sendU32(trainerIdNum); 109 sendU32(trainerIdNum);
114 waitForAck(); 110 waitForAck();
115 111
@@ -208,7 +204,7 @@ int main(void)
208 204
209 struct PokemonIntermediate pki; 205 struct PokemonIntermediate pki;
210 206
211 PokemonIntermediateInit(&pki, bpkm, trainerIdNum, secretIdNum); 207 PokemonIntermediateInit(&pki, bpkm);
212 PokemonIntermediateStream(&pki); 208 PokemonIntermediateStream(&pki);
213 } 209 }
214} 210}