diff --git a/engine/overworld/player_movement.asm b/engine/overworld/player_movement.asm index b0654e0f2..0c3924844 100644 --- a/engine/overworld/player_movement.asm +++ b/engine/overworld/player_movement.asm @@ -613,7 +613,8 @@ ENDM .CheckNPC: ; Returns 0 if there is an NPC in front that you can't move ; Returns 1 if there is no NPC in front -; Returns 2 if there is a movable NPC in front +; Returns 2 if there is a movable NPC in front. The game actually treats +; this the same as an NPC in front (bump). ld a, 0 ldh [hMapObjectIndex], a ; Load the next X coordinate into d @@ -631,14 +632,14 @@ ENDM ; Find an object struct with coordinates equal to d,e ld bc, wObjectStructs ; redundant farcall IsNPCAtCoord - jr nc, .is_npc + jr nc, .no_npc call .CheckStrengthBoulder jr c, .no_bump - xor a + xor a ; bump ret -.is_npc +.no_npc ld a, 1 ret