Merge branch 'master' into doc-scriptclean

2019-11-13 19:25:41 -05:00
parent 7455bd9b9a ef8370566f
commit ff7e11c0b0
113 changed files with 3816 additions and 3895 deletions
@@ -2357,7 +2357,7 @@ void sub_80EE44C(u8 nMonsCaught, u8 nPkblkUsed)
    }
 }

-void sub_80EE4DC(struct Pokemon *pokemon, u8 ribbonMonDataIdx)
+void TryPutSpotTheCutiesOnAir(struct Pokemon *pokemon, u8 ribbonMonDataIdx)
 {
    TVShow *show;