Merge branch 'master' into multiplayer-stuff

This commit is contained in:
Phlosioneer
2019-02-21 21:21:10 -05:00
48 changed files with 5297 additions and 8331 deletions

View File

@@ -291,7 +291,7 @@ gSpecials:: @ 81DBA64
def_special GetPokeblockNameByMonNature
def_special GetSecretBaseNearbyMapName
def_special CheckRelicanthWailord
def_special ShouldDoBrailleStrengthEffectOld
def_special ShouldDoBrailleRegirockEffectOld
def_special sub_80B0534
def_special sub_80B058C
def_special WaitWeather