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 /engine/predef.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'engine/predef.asm')
| -rw-r--r-- | engine/predef.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engine/predef.asm b/engine/predef.asm index 13c593c90..e18765b0a 100644 --- a/engine/predef.asm +++ b/engine/predef.asm @@ -1,4 +1,4 @@ -GetPredefPointer:: ; 854b +GetPredefPointer:: ; Return the bank and address of wPredefID in a and wPredefAddress. ; Save hl for later (back in Predef) @@ -24,6 +24,5 @@ GetPredefPointer:: ; 854b ld a, [hl] ret -; 856b INCLUDE "data/predef_pointers.asm" |