diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2016-09-10 11:00:02 -0700 |
| commit | 3cb79cf078e82206796e1b834393ab771593de72 (patch) | |
| tree | 3e27550ab45ce782db8f2e182819015ba3aef733 /data/level_up_learnset_pointers.s | |
| parent | f5d9daeca38728f67db92a175c37e5a3bc18cee3 (diff) | |
| parent | 19bffecc4deb401aa51add3b95163b72686f40ee (diff) | |
Merge 'master' with 'origin/master'
Diffstat (limited to 'data/level_up_learnset_pointers.s')
| -rw-r--r-- | data/level_up_learnset_pointers.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/level_up_learnset_pointers.s b/data/level_up_learnset_pointers.s index da38da9f2..31055be5c 100644 --- a/data/level_up_learnset_pointers.s +++ b/data/level_up_learnset_pointers.s @@ -1,5 +1,5 @@ .align 2 -gLevelUpLearnsetPointers:: @ 8207BC8 +gLevelUpLearnsets:: @ 8207BC8 .4byte gBulbasaurLevelUpLearnset .4byte gBulbasaurLevelUpLearnset .4byte gIvysaurLevelUpLearnset |