Merge branch 'master' into doc-partymenu

This commit is contained in:
GriffinR
2019-10-31 14:22:51 -04:00
committed by GitHub
219 changed files with 7959 additions and 7663 deletions

View File

@@ -156,12 +156,12 @@ gSpecials:: @ 81DBA64
def_special DrawWholeMapView
def_special StorePlayerCoordsInVars
def_special MauvilleGymDeactivatePuzzle
def_special PetalburgGymSpecial1
def_special PetalburgGymSpecial2
def_special PetalburgGymSlideOpenRoomDoors
def_special PetalburgGymUnlockRoomDoors
def_special GetPlayerTrainerIdOnesDigit
def_special GetPlayerBigGuyGirlString
def_special GetRivalSonDaughterString
def_special SetFlagInVar
def_special SetHiddenItemFlag
def_special CableCarWarp
def_special CableCar
def_special Overworld_PlaySpecialMapMusic
@@ -352,14 +352,14 @@ gSpecials:: @ 81DBA64
def_special DoesPartyHaveEnigmaBerry
def_special ScriptRandom
def_special sub_81AFDD0
def_special sub_80EDCE8
def_special TryPutTreasureInvestigatorsOnAir
def_special sub_80EE2CC
def_special sub_80EE72C
def_special sub_80EE7C0
def_special ShowGlassWorkshopMenu
def_special PutFanClubSpecialOnTheAir
def_special sub_80EED10
def_special sub_80EED34
def_special IncrementDailyPlantedBerries
def_special IncrementDailyPickedBerries
def_special InitSecretBaseVars
def_special SetSecretBaseSecretsTvFlags_SandOrnament
def_special sub_80EB300