diff options
| author | Rangi42 <sylvie.oukaour+rangi42@gmail.com> | 2025-06-30 13:30:57 -0400 |
|---|---|---|
| committer | Rangi <35663410+Rangi42@users.noreply.github.com> | 2025-06-30 13:45:24 -0400 |
| commit | 78e44a8fb10307c55d53a69179b9ff7cd6f49fc0 (patch) | |
| tree | ccc6113a679d842077d67e5453709438c418114f /scripts/CeruleanCity.asm | |
| parent | Replace hardware_constants.asm with hardware.inc (#511) (diff) | |
| download | pokeyellow-78e44a8fb10307c55d53a69179b9ff7cd6f49fc0.tar.gz pokeyellow-78e44a8fb10307c55d53a69179b9ff7cd6f49fc0.tar.xz pokeyellow-78e44a8fb10307c55d53a69179b9ff7cd6f49fc0.zip | |
Use combined hardware constants
Diffstat (limited to 'scripts/CeruleanCity.asm')
| -rw-r--r-- | scripts/CeruleanCity.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm index c08d0280..4412b49c 100644 --- a/scripts/CeruleanCity.asm +++ b/scripts/CeruleanCity.asm @@ -24,7 +24,7 @@ CeruleanCityRocketDefeatedScript: ld a, [wIsInBattle] cp $ff jp z, CeruleanCityClearScripts - ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN + ld a, PAD_CTRL_PAD ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_ROCKET_THIEF ld a, TEXT_CERULEANCITY_ROCKET @@ -78,7 +78,7 @@ ENDC call PlayMusic xor a ldh [hJoyHeld], a - ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN + ld a, PAD_CTRL_PAD ld [wJoyIgnore], a ld a, [wXCoord] cp 20 ; is the player standing on the right side of the bridge? @@ -170,7 +170,7 @@ CeruleanCityRivalDefeatedScript: cp $ff jp z, CeruleanCityClearScripts call CeruleanCityFaceRivalScript - ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN + ld a, PAD_CTRL_PAD ld [wJoyIgnore], a SetEvent EVENT_BEAT_CERULEAN_RIVAL ld a, TEXT_CERULEANCITY_RIVAL |