Merge branch 'master' of github.com:pret/pokeemerald into trade

This commit is contained in:
Diegoisawesome
2018-12-31 02:30:30 -06:00
779 changed files with 5227 additions and 8501 deletions
+9 -9
View File
@@ -328,8 +328,8 @@ gSpecials:: @ 81DBA64
def_special DoSealedChamberShakingEffect2
def_special FoundBlackGlasses
def_special sub_80AC81C
def_special sp13E_warp_to_last_warp
def_special sp13F_fall_to_last_warp
def_special DoDiveWarp
def_special DoFallWarp
def_special ShowContestEntryMonPic
def_special sub_80F8EB8
def_special SetEReaderTrainerGfxId
@@ -419,9 +419,9 @@ gSpecials:: @ 81DBA64
def_special ShouldTryGetTrainerScript
def_special ShowMapNamePopup
def_special ShowMapNamePopup
def_special sub_81BE994
def_special sub_81BE79C
def_special sub_81BE7F4
def_special DoMirageTowerCeilingCrumble
def_special SetMirageTowerVisibility
def_special StartPlayerDescendMirageTower
def_special sub_81398C0
def_special IsWirelessAdapterConnected
def_special BerryBlenderLinkBecomeLeader
@@ -488,12 +488,12 @@ gSpecials:: @ 81DBA64
def_special sub_81B892C
def_special sub_813AEB4
def_special sub_813AF48
def_special sub_813AFC8
def_special DoDeoxysRockInteraction
def_special sub_813B1D0
def_special CreateObedientEnemyMon
def_special sub_81BEB54
def_special sub_81BEB68
def_special sub_81BEB7C
def_special StartMirageTowerDisintegration
def_special StartMirageTowerShake
def_special StartMirageTowerFossilFallAndSink
def_special ChangeBoxPokemonNickname
def_special get_unknown_box_id
def_special sub_813B21C