diff options
| author | obskyr <powpowd@gmail.com> | 2018-07-03 04:50:33 +0200 |
|---|---|---|
| committer | obskyr <powpowd@gmail.com> | 2018-07-03 04:50:33 +0200 |
| commit | 382fd4b50e27cea7e0f97839363235ea2eac14fa (patch) | |
| tree | d9836c547ac68f14a4b1766453334812380d050b /home/copy2.asm | |
| parent | d26c5f6937518f891d7cb699e237e172588f4a26 (diff) | |
| parent | 2dfc7fc635b13291588ba8aae65fd0ece7211799 (diff) | |
Merge branch 'collisions-movements' of https://github.com/Pokeglitch/pokegold-spaceworld into master
And that's the last of the manual merges for now! Hooray!
Diffstat (limited to 'home/copy2.asm')
| -rw-r--r-- | home/copy2.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/home/copy2.asm b/home/copy2.asm index 9baad62..e74ef8b 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -2,8 +2,8 @@ INCLUDE "constants.asm" SECTION "Video Copy functions", ROM0[$0D02] -Function0d02:: - jpab Function14000 +RedrawPlayerSprite:: + jpab _RedrawPlayerSprite LoadFont:: ; 00:0d0a jpab LoadFontGraphics |