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/OaksLab.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/OaksLab.asm')
| -rw-r--r-- | scripts/OaksLab.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/OaksLab.asm b/scripts/OaksLab.asm index 8a2b7de3..9695b99e 100644 --- a/scripts/OaksLab.asm +++ b/scripts/OaksLab.asm @@ -126,7 +126,7 @@ OaksLabFollowedOakScript: ret OaksLabOakChooseMonSpeechScript: - ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN + ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a ld a, TEXT_OAKSLAB_RIVAL_FED_UP_WITH_WAITING ldh [hTextID], a @@ -293,7 +293,7 @@ OaksLabRivalChoosesStarterScript: ld a, [wStatusFlags5] bit BIT_SCRIPTED_NPC_MOVEMENT, a ret nz - ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN + ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a ld a, OAKSLAB_RIVAL ldh [hSpriteIndex], a @@ -416,7 +416,7 @@ OaksLabRivalStartBattleScript: ret OaksLabRivalEndBattleScript: - ld a, PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN + ld a, PAD_CTRL_PAD ld [wJoyIgnore], a ld a, PLAYER_DIR_UP ld [wPlayerMovingDirection], a @@ -557,7 +557,7 @@ OaksLabOakGivesPokedexScript: ret nz call EnableAutoTextBoxDrawing call PlayDefaultMusic - ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN + ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a call OaksLabRivalFaceUpOakFaceDownScript ld a, TEXT_OAKSLAB_RIVAL_WHAT_DID_YOU_CALL_ME_FOR @@ -931,7 +931,7 @@ OaksLabMonChoiceMenu: call AddPartyMon ld hl, wStatusFlags4 set BIT_GOT_STARTER, [hl] - ld a, PAD_SELECT | PAD_START | PAD_RIGHT | PAD_LEFT | PAD_UP | PAD_DOWN + ld a, PAD_SELECT | PAD_START | PAD_CTRL_PAD ld [wJoyIgnore], a ld a, SCRIPT_OAKSLAB_CHOSE_STARTER_SCRIPT ld [wOaksLabCurScript], a |