diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/animations.asm | 8 | ||||
| -rw-r--r-- | engine/overworld/trainer_sight.asm | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index a6d12012..ce6c6d5d 100644 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -1935,7 +1935,7 @@ AnimationSubstitute: ; Changes the pokemon's sprite to the mini sprite ld hl, wTempPic xor a - ld bc, $310 + ld bc, 7 * 7 tiles call FillMemory ldh a, [hWhoseTurn] and a @@ -2120,7 +2120,7 @@ GetMonSpriteTileMapPointerFromRowCount: ldh a, [hWhoseTurn] and a jr nz, .enemyTurn - ld a, 20 * 5 + 1 + ld a, 5 * SCREEN_WIDTH + 1 jr .next .enemyTurn ld a, 12 @@ -2133,7 +2133,7 @@ GetMonSpriteTileMapPointerFromRowCount: sub b and a jr z, .done - ld de, 20 + ld de, SCREEN_WIDTH .loop add hl, de dec a @@ -2294,7 +2294,7 @@ CopyTileIDs: dec c jr nz, .columnLoop pop hl - ld bc, 20 + ld bc, SCREEN_WIDTH add hl, bc pop bc dec b diff --git a/engine/overworld/trainer_sight.asm b/engine/overworld/trainer_sight.asm index f32b558a..da845fda 100644 --- a/engine/overworld/trainer_sight.asm +++ b/engine/overworld/trainer_sight.asm @@ -97,8 +97,8 @@ TrainerWalkUpToPlayer:: swap a dec a ld c, a ; bc = steps yet to go to reach player - xor a - ld b, a ; a = direction to go to + xor a ; NPC_MOVEMENT_DOWN + ld b, a jr .writeWalkScript .facingUp ld a, [wTrainerScreenY] @@ -111,7 +111,7 @@ TrainerWalkUpToPlayer:: dec a ld c, a ; bc = steps yet to go to reach player ld b, $0 - ld a, $40 ; a = direction to go to + ld a, NPC_MOVEMENT_UP jr .writeWalkScript .facingRight ld a, [wTrainerScreenX] @@ -124,7 +124,7 @@ TrainerWalkUpToPlayer:: dec a ld c, a ; bc = steps yet to go to reach player ld b, $0 - ld a, $c0 ; a = direction to go to + ld a, NPC_MOVEMENT_RIGHT jr .writeWalkScript .facingLeft ld a, [wTrainerScreenX] @@ -137,7 +137,7 @@ TrainerWalkUpToPlayer:: dec a ld c, a ; bc = steps yet to go to reach player ld b, $0 - ld a, $80 ; a = direction to go to + ld a, NPC_MOVEMENT_LEFT .writeWalkScript ld hl, wNPCMovementDirections2 ld de, wNPCMovementDirections2 |