Merge branch 'master' into link

This commit is contained in:
PikalaxALT
2017-11-27 20:05:51 -05:00
106 changed files with 13373 additions and 14129 deletions
+3 -3
View File
@@ -170,8 +170,8 @@ gSpecials:: @ 81DBA64
def_special sub_80B086C
def_special ChangePokemonNickname
def_special sub_81B94B0
def_special sub_8136EF4
def_special sub_807FA80
def_special GetFirstFreePokeblockSlot
def_special DoBerryBlending
def_special sub_8142BC8
def_special sub_813BD60
def_special sub_813BCA8
@@ -181,7 +181,7 @@ gSpecials:: @ 81DBA64
def_special sub_813BF60
def_special sub_813BA60
def_special sub_813BF7C
def_special rock_smash_wild_pokemon_encounter
def_special RockSmashWildEncounter
def_special GabbyAndTyGetBattleNum
def_special GabbyAndTyAfterInterview
def_special GabbyAndTyBeforeInterview