dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve Littleroot merge conflict

Browse Source
This commit is contained in:
GriffinR
2019-11-08 03:07:19 -05:00
parent bef24a45f0
commit e19b9c9d46
7 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/specials.inc
+2 -2
View File
@@ -180,7 +180,7 @@ gSpecials:: @ 81DBA64
def_special sub_813BA30
def_special UpdateMovedLilycoveFanClubMembers
def_special sub_813BF60
def_special sub_813BA60
def_special UpdateTrainerFanClubGameClear
def_special sub_813BF7C
def_special RockSmashWildEncounter
def_special GabbyAndTyGetBattleNum
@@ -351,7 +351,7 @@ gSpecials:: @ 81DBA64
def_special sub_81653CC
def_special DoesPartyHaveEnigmaBerry
def_special ScriptRandom
def_special sub_81AFDD0
def_special SetChampionSaveWarp
def_special TryPutTreasureInvestigatorsOnAir
def_special TryPutLotteryWinnerReportOnAir
def_special sub_80EE72C