Merge branch 'master' into fix-eventobj

2020-01-12 22:42:43 -05:00
parent 635267ce32 fa5816915d
commit 655910a16f
127 changed files with 15606 additions and 21934 deletions
--- a/src/contest.c
+++ b/src/contest.c
@@ -5093,7 +5093,7 @@ static void sub_80DE864(u8 a)
        gContestResources->field_18->unk4_0 = 1;
        break;
    case MOVE_RETURN:
-        gAnimFriendship = 0xFF;
+        gAnimFriendship = MAX_FRIENDSHIP;
        break;
    case MOVE_FRUSTRATION:
        gAnimFriendship = 0;