diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/map.asm | 9 | ||||
| -rw-r--r-- | home/menu.asm | 10 | ||||
| -rw-r--r-- | home/movement.asm | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/home/map.asm b/home/map.asm index c51f9c48a..276ccdb73 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1593,7 +1593,14 @@ GetMovementPermissions:: ; 2914 ; 2945 .MovementPermissionsData ; 2945 - db 1, 2, 4, 8, 9, 10, 5, 6 + db 1 << DOWN + db 1 << UP + db 1 << LEFT + db 1 << RIGHT + db (1 << DOWN) | (1 << RIGHT) + db (1 << UP) | (1 << RIGHT) + db (1 << DOWN) | (1 << LEFT) + db (1 << UP) | (1 << LEFT) ; 294d .UpDown diff --git a/home/menu.asm b/home/menu.asm index 3e04af8cf..a8c2bb0b7 100644 --- a/home/menu.asm +++ b/home/menu.asm @@ -232,7 +232,7 @@ DoNthMenu:: ; 1e5d call MenuFunc_1e7f call MenuWriteText call Function1eff - call Function1f23 + call GetStaticMenuJoypad call GetMenuJoypad call MenuClickSound ret @@ -360,20 +360,20 @@ Function1eff:: ; 1eff ; 1f1a -Function1f1a:: ; 1f1a +GetScrollingMenuJoypad:: ; 1f1a call ScrollingMenuJoypad ld hl, wMenuJoypadFilter and [hl] - jr Function1f2a + jr ContinueGettingMenuJoypad ; 1f23 -Function1f23:: ; 1f23 +GetStaticMenuJoypad:: ; 1f23 xor a ld [wMenuJoypad], a call StaticMenuJoypad ; 1f2a -Function1f2a:: ; 1f2a +ContinueGettingMenuJoypad: bit A_BUTTON_F, a jr nz, .a_button bit B_BUTTON_F, a diff --git a/home/movement.asm b/home/movement.asm index f962c8316..5353bbe4a 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -4,9 +4,9 @@ InitMovementBuffer:: ; 1b1e ld [wMovementBufferCount], a ld a, $0 ; useless ld [wd004], a - ld a, $7 + ld a, MovementBuffer % $100 ld [wd005], a - ld a, $d0 + ld a, MovementBuffer / $100 ld [wd006], a ret ; 1b35 |