diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-27 09:48:16 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-27 09:48:16 -0400 |
| commit | 08c23fb1c483ffcf7c17b8ac061ad4ff77318625 (patch) | |
| tree | 65bfdd399541ebd4f558614fd566aa92cfb94422 /src/script_pokemon_util_80C4BF0.c | |
| parent | 41cc0382a43161c0c66ddaf73742ecec8dcbdcc6 (diff) | |
| parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
Merge branch 'master' into field_tasks
Diffstat (limited to 'src/script_pokemon_util_80C4BF0.c')
| -rw-r--r-- | src/script_pokemon_util_80C4BF0.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/script_pokemon_util_80C4BF0.c b/src/script_pokemon_util_80C4BF0.c index ecfd8111b..cbca07011 100644 --- a/src/script_pokemon_util_80C4BF0.c +++ b/src/script_pokemon_util_80C4BF0.c @@ -31,7 +31,7 @@ extern struct SpriteTemplate gUnknown_02024E8C; extern u8 gContestPlayerMonIndex; extern u8 gIsLinkContest; extern u8 gPlayerPartyCount; -extern u8 gBufferedMoves[]; +extern u8 gSelectedOrderFromParty[]; extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; @@ -653,7 +653,7 @@ void sub_80C5568(void) void sub_80C5580(void) { - u8 var = gBufferedMoves[0]; + u8 var = gSelectedOrderFromParty[0]; switch(var) { @@ -676,7 +676,7 @@ void ChooseBattleTowerPlayerParty(void) void SetBattleTowerPlayerParty(void) { - u8 var = gBufferedMoves[0]; + u8 var = gSelectedOrderFromParty[0]; switch(var) { @@ -702,8 +702,8 @@ void ReducePlayerPartyToThree(void) // copy the selected pokemon according to the order. for(i = 0; i < 3; i++) - if(gBufferedMoves[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop - party[i] = gPlayerParty[gBufferedMoves[i] - 1]; // index is 0 based, not literal + if(gSelectedOrderFromParty[i]) // as long as the order keeps going (did the player select 1 mon? 2? 3?), do not stop + party[i] = gPlayerParty[gSelectedOrderFromParty[i] - 1]; // index is 0 based, not literal // delete the last 3 pokemon CpuFill32(0, gPlayerParty, sizeof gPlayerParty); |