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

Merge remote-tracking branch 'upstream/master' into misc_docs

Browse Source 
# Conflicts:
#	src/field_weather_effect.c
This commit is contained in:
Marcus Huderle committed 2019-04-02 18:29:51 -05:00
2 parents 1241700b20 d8c9f1b30f
commit 181baf9fe5
110 files changed
+9476 -10106
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

data/specials.inc
+1 -1
View File
@@ -434,7 +434,7 @@ gSpecials:: @ 81DBA64
def_special sub_81B8958
def_special sub_8018090
def_special sub_813990C
def_special sub_801B27C
def_special ValidateReceivedWonderCard
def_special HasAtLeastOneBerry
def_special sub_802C920
def_special sub_802E3C4