diff options
| author | melthelesbian <44884535+melthelesbian@users.noreply.github.com> | 2018-12-25 12:50:15 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-12-25 11:50:15 -0600 |
| commit | 2dd706ca5410d98ad214ceff7026d6db276f4d5a (patch) | |
| tree | 20d184fb4f7e48d965c6c88b39dfd7fc11d3dd86 /src/contest.c | |
| parent | dcbc8db6a32e70651163a132950d486d93a58254 (diff) | |
use max mon moves constant where able (#480)
* use max mon moves constant where able
* fix errors in script commands file
* fix more errors
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/contest.c b/src/contest.c index 34662b490..c3ce9c9aa 100644 --- a/src/contest.c +++ b/src/contest.c @@ -271,7 +271,7 @@ void LoadContestBgAfterMoveAnim(void) CopyBgTilemapBufferToVram(3); LoadCompressedPalette(gUnknown_08C16E90, 0, 0x200); sub_80D782C(); - for (i = 0; i < 4; i++) + for (i = 0; i < MAX_MON_MOVES; i++) { u32 var = 5 + i; @@ -747,7 +747,7 @@ void sub_80D8490(u8 taskId) gBattle_BG0_Y = 0xA0; gBattle_BG2_Y = 0xA0; - for (i = 0; i < 4; i++) + for (i = 0; i < MAX_MON_MOVES; i++) { u16 move = gContestMons[gContestPlayerMonIndex].moves[i]; u8 *r5 = sp8; @@ -782,7 +782,7 @@ void sub_80D8610(u8 taskId) u8 numMoves = 0; s32 i; - for (i = 0; i < 4; i++) + for (i = 0; i < MAX_MON_MOVES; i++) { if (gContestMons[gContestPlayerMonIndex].moves[i] != MOVE_NONE) numMoves++; |