diff options
| author | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-09-25 00:45:00 -0500 |
| commit | a02a98ee7ada1a658e28698484058be2796dc0df (patch) | |
| tree | 945986054565bd8b5212fc755415096050d1d3a8 /engine/pikachu/pikachu_follow.asm | |
| parent | Use long option flags for rgbgfx, same as tools/gfx (diff) | |
| parent | Use `const_skip` (diff) | |
| download | pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.gz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.tar.xz pokeyellow-a02a98ee7ada1a658e28698484058be2796dc0df.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/pikachu/pikachu_follow.asm')
| -rw-r--r-- | engine/pikachu/pikachu_follow.asm | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/engine/pikachu/pikachu_follow.asm b/engine/pikachu/pikachu_follow.asm index 9575c341..a33da505 100644 --- a/engine/pikachu/pikachu_follow.asm +++ b/engine/pikachu/pikachu_follow.asm @@ -364,7 +364,7 @@ SpawnPikachu_:: bit 7, [hl] jp nz, Func_fc745 ld a, [wFontLoaded] - bit 0, a + bit BIT_FONT_LOADED, a jp nz, Func_fc76a call CheckPikachuFollowingPlayer jp nz, Func_fc76a @@ -915,8 +915,8 @@ TryDoubleAddPikachuStepVectorToScreenPixelCoords: ld a, [wWalkBikeSurfState] cp $1 ; biking jr nz, AddPikachuStepVectorToScreenPixelCoords - ld a, [wd736] - bit 6, a + ld a, [wMovementFlags] + bit BIT_LEDGE_OR_FISHING, a jr nz, AddPikachuStepVectorToScreenPixelCoords DoubleAddPikachuStepVectorToScreenPixelCoords: ld hl, wSpritePikachuStateData1YStepVector - wSpritePikachuStateData1 @@ -987,8 +987,8 @@ UpdatePikachuWalkingSprite: dec a swap a ld d, a - ld a, [wd736] - bit 7, a + ld a, [wMovementFlags] + bit BIT_SPINNING, a jr nz, .copy_player ld hl, wSpritePikachuStateData1FacingDirection - wSpritePikachuStateData1 add hl, bc @@ -996,7 +996,7 @@ UpdatePikachuWalkingSprite: or d ld d, a ld a, [wFontLoaded] - bit 0, a + bit BIT_FONT_LOADED, a jr z, .normal_get_sprite_index call Func_fcae2 ret c @@ -1257,8 +1257,8 @@ CheckAbsoluteValueLessThan2: Func_fcc08:: call Func_fcc23 ret nc - ld a, [wd736] - bit 6, a + ld a, [wMovementFlags] + bit BIT_LEDGE_OR_FISHING, a jr nz, .asm_fcc1b call Func_fcc42 ret c @@ -1294,13 +1294,13 @@ Func_fcc23: Func_fcc42: xor a ld a, [wPlayerDirection] - bit 3, a + bit PLAYER_DIR_BIT_UP, a jr nz, .asm_fcc58 - bit 2, a + bit PLAYER_DIR_BIT_DOWN, a jr nz, .asm_fcc5b - bit 1, a + bit PLAYER_DIR_BIT_LEFT, a jr nz, .asm_fcc5e - bit 0, a + bit PLAYER_DIR_BIT_RIGHT, a jr nz, .asm_fcc61 scf ret @@ -1332,13 +1332,13 @@ Func_fcc64: set 6, [hl] xor a ld a, [wPlayerDirection] - bit 3, a + bit PLAYER_DIR_BIT_UP, a jr nz, .asm_fcc86 - bit 2, a + bit PLAYER_DIR_BIT_DOWN, a jr nz, .asm_fcc89 - bit 1, a + bit PLAYER_DIR_BIT_LEFT, a jr nz, .asm_fcc8c - bit 0, a + bit PLAYER_DIR_BIT_RIGHT, a jr nz, .asm_fcc8f scf ret |