diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /home/movement.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'home/movement.asm')
| -rw-r--r-- | home/movement.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/home/movement.asm b/home/movement.asm index 781a368a9..0a2623a09 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -1,5 +1,5 @@ InitMovementBuffer:: ; 1b1e - ld [wMovementBufferPerson], a + ld [wMovementBufferObject], a xor a ld [wMovementBufferCount], a ld a, $0 ; useless @@ -159,13 +159,13 @@ SetMenuAttributes:: ; 1bb1 ; 1bc9 StaticMenuJoypad:: ; 1bc9 - callab _StaticMenuJoypad + callfar _StaticMenuJoypad call GetMenuJoypad ret ; 1bd3 ScrollingMenuJoypad:: ; 1bd3 - callab _ScrollingMenuJoypad + callfar _ScrollingMenuJoypad call GetMenuJoypad ret ; 1bdd |