diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-02-01 10:04:42 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-01 10:04:42 -0600 |
| commit | b26c24ffeecdc82da84cb6fb2bdea37cd9de9df9 (patch) | |
| tree | af7d4ab5c4a49b3eefbabfcf331eb8c6e1d35cea /src/mauville_old_man.c | |
| parent | b4f83b4f0fcce8c06a6a5a5fd541fb76b1fe9f4c (diff) | |
| parent | c0db31163732e976ebe64d0d65da309847986367 (diff) | |
Merge pull request #532 from DizzyEggg/bored
Fix some fakematches
Diffstat (limited to 'src/mauville_old_man.c')
| -rw-r--r-- | src/mauville_old_man.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c index 930f1f35b..1b4a25217 100644 --- a/src/mauville_old_man.c +++ b/src/mauville_old_man.c @@ -572,9 +572,6 @@ static void Task_BardSong(u8 taskId) struct MauvilleManBard *bard = &gSaveBlock1Ptr->oldMan.bard; u8 *str = gStringVar4 + task->tCharIndex; u16 wordLen = 0; - // Can't get it to match without hacking - u32 temp; - register s16 zero asm("r1"); while (*str != CHAR_SPACE && *str != CHAR_NEWLINE @@ -588,17 +585,22 @@ static void Task_BardSong(u8 taskId) sUnknownBardRelated = MACRO2(bard->songLyrics[task->tCurrWord]); else sUnknownBardRelated = MACRO2(bard->temporaryLyrics[task->tCurrWord]); - temp = gBardSong.length / wordLen; - zero = 0; - gBardSong.length = temp; + + gBardSong.length /= wordLen; if (gBardSong.length <= 0) gBardSong.length = 1; task->tCurrWord++; + if (task->data[2] == 0) + { task->tState = 3; + task->data[1] = 0; + } else + { task->tState = 5; - task->data[1] = zero; + task->data[1] = 0; + } } break; case 5: |