diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /data/predef_pointers.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'data/predef_pointers.asm')
| -rw-r--r-- | data/predef_pointers.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm index 87906597a..1693f22aa 100644 --- a/data/predef_pointers.asm +++ b/data/predef_pointers.asm @@ -6,7 +6,7 @@ add_predef: MACRO dab \1 ENDM -PredefPointers:: ; 856b +PredefPointers:: add_predef LearnMove ; $0 add_predef DummyPredef1 add_predef HealParty ; this is both a special and a predef @@ -82,4 +82,3 @@ PredefPointers:: ; 856b add_predef Unused_HOF_AnimateAlignedFrontpic ; $48 add_predef HOF_AnimateFrontpic dbw -1, InexplicablyEmptyFunction ; ??? -; 864c |