Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge conflicts resolved

Browse Source
This commit is contained in:
JimB16
2015-10-19 16:25:15 +02:00
parent 3ef626d378 f399315a48
commit 3b9a3cc3be
49 changed files with 3435 additions and 3173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
engine/predef.asm
View File

@@ -36,7 +36,7 @@ PredefPointers:: ; 856b
add_predef FlagPredef
add_predef Functionc699
add_predef FillPP
add_predef AddPkmnToParty
add_predef TryAddMonToParty
add_predef Functionda96
add_predef SentGetPkmnIntoFromBox
add_predef SentPkmnIntoBox