battle labels merge with master

2018-02-09 00:43:07 +01:00
parent 9df5e16343 387dbf48d0
commit bce01bc518
137 changed files with 40431 additions and 35066 deletions
@@ -780,7 +780,7 @@ void ItemUseOutOfBattle_RareCandy(u8 taskId)

 void ItemUseOutOfBattle_TMHM(u8 taskId)
 {
-    if (gSpecialVar_ItemId >= ITEM_HM01)
+    if (gSpecialVar_ItemId >= ITEM_HM01_CUT)
        DisplayItemMessage(taskId, 1, gText_BootedUpHM, sub_80FDF90); // HM
    else
        DisplayItemMessage(taskId, 1, gText_BootedUpTM, sub_80FDF90); // TM