diff options
| author | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
|---|---|---|
| committer | JimB16 <f1@jimb.de> | 2015-10-26 03:26:53 +0100 |
| commit | 9a9cb38e39c991e102a1c6da7e8e16b2a1c61e07 (patch) | |
| tree | 46c064628b3d8015da22d6396b3c711e80646745 /home/movement.asm | |
| parent | 3b9a3cc3bee8934e45f5e4d3fd9704b3fa619560 (diff) | |
| parent | 0d17d4a75866d053f5e0b48c66deb2508071d98b (diff) | |
merge with newest update
Diffstat (limited to 'home/movement.asm')
| -rw-r--r-- | home/movement.asm | 36 |
1 files changed, 3 insertions, 33 deletions
diff --git a/home/movement.asm b/home/movement.asm index 87f28f5ca..82486b5c1 100644 --- a/home/movement.asm +++ b/home/movement.asm @@ -159,11 +159,11 @@ Function1bd3:: ; 1bd3 Function1bdd:: ; 1bdd push bc push af - ld a, [$ffa9] - and $f0 + ld a, [hJoyLast] + and D_PAD ld b, a ld a, [hJoyPressed] - and $f + and BUTTONS or b ld b, a pop af @@ -190,33 +190,3 @@ Function1bf7:: ; 1bf7 ret ; 1c00 -Function1c00:: ; 1c00 - callab Function24374 - ret -; 1c07 - -ExitMenu:: ; 0x1c07 - push af - callab Function243e8 - pop af - ret - -Function1c10:: ; 0x1c10 - callab Function2446d - ret - -WriteBackup:: ; 0x1c17 - push af - call ExitMenu - call Function321c - call UpdateSprites - pop af - ret - -Function1c23:: ; 0x1c23 - call Function1cfd - call Function1c30 - call Function1d19 - call Function1c30 - ret -; 0x1c30 |