diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/overworld/map_objects.asm | 2 | ||||
| -rw-r--r-- | engine/overworld/npc_movement.asm | 8 | ||||
| -rw-r--r-- | engine/overworld/player_movement.asm | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index c9f1d7d1b..74b82880d 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -2444,7 +2444,7 @@ Function56cd: ; 56cd ld [hUsedSpriteTile], a ld hl, OBJECT_PALETTE add hl, bc - bit 7, [hl] + bit BIG_OBJECT_F, [hl] jr z, .ok7 ld a, d add 2 diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/npc_movement.asm index 5670935e8..d54061919 100644 --- a/engine/overworld/npc_movement.asm +++ b/engine/overworld/npc_movement.asm @@ -2,8 +2,8 @@ Function6ec1: ; 6ec1 ld hl, OBJECT_PALETTE add hl, bc - bit 5, [hl] - jr z, .not_bit_5 + bit WALK_ON_WATER_F, [hl] + jr z, .walks_on_land ld hl, OBJECT_FLAGS1 add hl, bc @@ -17,7 +17,7 @@ Function6ec1: ; 6ec1 ret c jr .resume -.not_bit_5 +.walks_on_land ld hl, OBJECT_FLAGS1 add hl, bc bit 4, [hl] @@ -331,7 +331,7 @@ IsNPCAtCoord: ; 7041 ld hl, OBJECT_PALETTE add hl, bc - bit 7, [hl] + bit BIG_OBJECT_F, [hl] jr z, .got call Function7171 diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index ef9afc7ad..f8bbe4952 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -684,7 +684,7 @@ DoPlayerMovement:: ; 80000 ld hl, OBJECT_PALETTE add hl, bc - bit 6, [hl] + bit STRENGTH_BOULDER_F, [hl] jr z, .not_boulder ld hl, OBJECT_FLAGS2 @@ -696,7 +696,7 @@ DoPlayerMovement:: ; 80000 ld hl, OBJECT_RANGE add hl, bc ld a, [hl] - and $fc + and %11111100 or d ld [hl], a |