Merge branch 'master' into contest

2018-05-11 09:25:26 -04:00
parent c15b50ac68 3e93615e38
commit 4488bbe9e6
51 changed files with 4132 additions and 9099 deletions
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -1810,7 +1810,7 @@ void sub_81C174C(u8 taskId)
                }
                else
                {
-                    PlaySE(0x20);
+                    PlaySE(SE_HAZURE);
                    sub_81C18F4(taskId);
                }
            }