diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-06-30 12:47:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-30 12:47:22 -0400 |
| commit | 56c405de09ce267c4cfbc68a15c37b2ff51c635a (patch) | |
| tree | 47d25c237e9af824f7a57295a2d2e298b194a8e6 /engine/overworld/auto_movement.asm | |
| parent | Distinguish single trainer pics section from Pokemon pics (diff) | |
| download | pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.gz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.tar.xz pokeyellow-56c405de09ce267c4cfbc68a15c37b2ff51c635a.zip | |
Replace hardware_constants.asm with hardware.inc (#511)
Diffstat (limited to 'engine/overworld/auto_movement.asm')
| -rw-r--r-- | engine/overworld/auto_movement.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engine/overworld/auto_movement.asm b/engine/overworld/auto_movement.asm index 0452176e..880f14a4 100644 --- a/engine/overworld/auto_movement.asm +++ b/engine/overworld/auto_movement.asm @@ -3,13 +3,13 @@ PlayerStepOutFromDoor:: res BIT_EXITING_DOOR, [hl] call IsPlayerStandingOnDoorTile jr nc, .notStandingOnDoor - ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ld hl, wMovementFlags set BIT_EXITING_DOOR, [hl] ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN + ld a, PAD_DOWN ld [wSimulatedJoypadStatesEnd], a xor a ld [wSpritePlayerStateData1ImageIndex], a @@ -81,7 +81,7 @@ PalletMovementScript_OakMoveLeft: .done ld hl, wStatusFlags7 set BIT_NO_MAP_MUSIC, [hl] - ld a, SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN ld [wJoyIgnore], a ret @@ -137,11 +137,11 @@ RLEList_ProfOakWalkToLab: db -1 ; end RLEList_PlayerWalkToLab: - db D_UP, 2 - db D_RIGHT, 3 - db D_DOWN, 5 - db D_LEFT, 1 - db D_DOWN, 6 + db PAD_UP, 2 + db PAD_RIGHT, 3 + db PAD_DOWN, 5 + db PAD_LEFT, 1 + db PAD_DOWN, 6 db -1 ; end PalletMovementScript_Done: @@ -191,9 +191,9 @@ PewterMovementScript_WalkToMuseum: RLEList_PewterMuseumPlayer: db NO_INPUT, 1 - db D_UP, 3 - db D_LEFT, 13 - db D_UP, 6 + db PAD_UP, 3 + db PAD_LEFT, 13 + db PAD_UP, 6 db -1 ; end RLEList_PewterMuseumGuy: @@ -250,11 +250,11 @@ PewterMovementScript_WalkToGym: RLEList_PewterGymPlayer: db NO_INPUT, 1 - db D_RIGHT, 2 - db D_DOWN, 5 - db D_LEFT, 11 - db D_UP, 5 - db D_LEFT, 15 + db PAD_RIGHT, 2 + db PAD_DOWN, 5 + db PAD_LEFT, 11 + db PAD_UP, 5 + db PAD_LEFT, 15 db -1 ; end RLEList_PewterGymGuy: |