diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/OaksLab_2.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to '')
| -rw-r--r-- | scripts/OaksLab_2.asm (renamed from scripts/OaksLab2.asm) | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/scripts/OaksLab2.asm b/scripts/OaksLab_2.asm index b0519827..f642aa7b 100644 --- a/scripts/OaksLab2.asm +++ b/scripts/OaksLab_2.asm @@ -1,26 +1,26 @@ -Func_f1be0:: +OaksLabPikachuMovementScript:: ld a, [wYCoord] cp 3 - jr z, .asm_f1bf0 + jr z, .movement2 ld b, SPRITE_FACING_DOWN - ld hl, Data_f1bf9 + ld hl, OaksLabPikachuMovementData1 call TryApplyPikachuMovementData ret -.asm_f1bf0 +.movement2 ld b, SPRITE_FACING_LEFT - ld hl, Data_f1bfe + ld hl, OaksLabPikachuMovementData2 call TryApplyPikachuMovementData ret -Data_f1bf9: +OaksLabPikachuMovementData1: db $00 db $1f db $1e db $38 db $3f -Data_f1bfe: +OaksLabPikachuMovementData2: db $00 db $1d db $20 |