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/PalletTown.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/PalletTown.asm')
| -rw-r--r-- | scripts/PalletTown.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/PalletTown.asm b/scripts/PalletTown.asm index 5bdd774b..42e3ea3e 100644 --- a/scripts/PalletTown.asm +++ b/scripts/PalletTown.asm @@ -35,7 +35,7 @@ PalletTownDefaultScript: .asm_18e40 xor a ldh [hJoyHeld], a - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a @@ -52,14 +52,14 @@ PalletTownDefaultScript: ret PalletTownOakHeyWaitScript: - ld a, ~(A_BUTTON | B_BUTTON) + ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a xor a ld [wOakWalkedToPlayer], a ld a, TEXT_PALLETTOWN_OAK ldh [hTextID], a call DisplayTextID - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a ld hl, wSprite01StateData2MapY ld a, 8 @@ -106,7 +106,7 @@ PalletTownOakGreetsPlayerScript: ld a, [wStatusFlags5] bit BIT_SCRIPTED_NPC_MOVEMENT, a ret nz - ld a, ~(A_BUTTON | B_BUTTON) + ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a ld a, 1 ld [wOakWalkedToPlayer], a @@ -118,7 +118,7 @@ PalletTownOakGreetsPlayerScript: ldh [hTextID], a call DisplayTextID ; oak faces the horizontally adjacent patch of grass to face pikachu - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a ld a, $2 ld [wSprite01StateData1MovementStatus], a @@ -136,7 +136,7 @@ PalletTownOakGreetsPlayerScript: PalletTownPikachuBattleScript: ; start the pikachu battle - ld a, ~(A_BUTTON | B_BUTTON) + ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a xor a ld [wListScrollOffset], a @@ -165,7 +165,7 @@ PalletTownAfterPikachuBattleScript: ld a, TEXT_PALLETTOWN_OAK_COME_WITH_ME ldh [hTextID], a call DisplayTextID - ld a, A_BUTTON | B_BUTTON | SELECT | START | D_RIGHT | D_LEFT | D_UP | D_DOWN + ld a, PAD_BUTTONS | PAD_CTRL_PAD ld [wJoyIgnore], a ; trigger the next script |