diff options
| author | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
| commit | ca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch) | |
| tree | 209a500e3bda6c2109e5acec60448e9e52f8c2af /scripts/ViridianCity.asm | |
| parent | Use more ldpikacry (diff) | |
| parent | Require RGBDS 0.9.3 for its DMG palette specs (#513) (diff) | |
| download | pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/ViridianCity.asm')
| -rw-r--r-- | scripts/ViridianCity.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/ViridianCity.asm b/scripts/ViridianCity.asm index 9ffe0950..07646f1a 100644 --- a/scripts/ViridianCity.asm +++ b/scripts/ViridianCity.asm @@ -51,7 +51,7 @@ ViridianCityCheckGymOpenScript: call StartSimulatingJoypadStates ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN + ld a, PAD_DOWN ld [wSimulatedJoypadStatesEnd], a xor a ld [wSpritePlayerStateData1FacingDirection], a @@ -158,7 +158,7 @@ ViridianCityMovePlayerDownScript: call StartSimulatingJoypadStates ld a, $1 ld [wSimulatedJoypadStatesIndex], a - ld a, D_DOWN + ld a, PAD_DOWN ld [wSimulatedJoypadStatesEnd], a xor a ld [wSpritePlayerStateData1FacingDirection], a @@ -184,7 +184,7 @@ ViridianCityCheckWaitingOldMan: ld a, TEXT_VIRIDIANCITY_OLD_MAN2 ldh [hTextID], a call DisplayTextID - ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT + ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a ret @@ -192,7 +192,7 @@ ViridianCityOldManInitialCatchTrainingScript: call ViridianCityOldManStartCatchTrainingScript.SetupSprite call ViridianCityOldManStartCatchTrainingScript.SetupBattle SetEvent EVENT_INITIAL_CATCH_TRAINING - ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT + ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a ld a, SCRIPT_VIRIDIANCITY_OLD_MAN_END_INITIAL_CATCH_TRAINING ld [wViridianCityCurScript], a @@ -203,7 +203,7 @@ ViridianCityOldManEndInitialCatchTrainingScript: call UpdateSprites call Delay3 SetEvent EVENT_COMPLETED_CATCH_TRAINING - ld a, D_UP | D_DOWN | D_LEFT | D_RIGHT | START | SELECT + ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a ld a, TEXT_VIRIDIANCITY_OLD_MAN2 ldh [hTextID], a |