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

This commit is contained in:
Slawter666
2018-11-12 14:14:50 +00:00
258 changed files with 80987 additions and 87448 deletions
+6 -6
View File
@@ -242,12 +242,12 @@ gSpecials:: @ 81DBA64
def_special FinishCyclingRoadChallenge
def_special UpdateCyclingRoadState
def_special GetLeadMonFriendshipScore
def_special sub_81A1780
def_special CallFrontierUtilFunc
def_special sub_8161F74
def_special CallBattleDomeFunction
def_special sub_8195960
def_special sub_8165360
def_special sub_8163AC4
def_special CopyEReaderTrainerGreeting
def_special DoSpecialTrainerBattle
def_special sub_81A5238
def_special sub_81A5E74
def_special sub_81A703C
@@ -332,7 +332,7 @@ gSpecials:: @ 81DBA64
def_special sp13F_fall_to_last_warp
def_special sub_80F8D28
def_special sub_80F8EB8
def_special sub_8162794
def_special SetEReaderTrainerGfxId
def_special BattleSetup_StartLatiBattle
def_special SetRoute119Weather
def_special SetRoute123Weather
@@ -448,8 +448,8 @@ gSpecials:: @ 81DBA64
def_special sub_80F90DC
def_special sub_80F910C
def_special sub_80F9160
def_special sub_81A4AA0
def_special sub_81A4AE8
def_special ShowRankingHallRecordsWindow
def_special ScrollRankingHallRecordsWindow
def_special sub_8139F20
def_special sub_80F9134
def_special sub_80F9154