pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2025-01-23 09:16:20 -08:00
Code Issues Packages Projects Releases Wiki Activity

.CheckNPC label and comment correction

Browse Source
This commit is contained in:
vulcandth 2022-11-07 20:27:09 -06:00
parent 8b429e2a54
commit f7d26fbe9c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
engine/overworld/player_movement.asm
View File

@ -613,7 +613,8 @@ ENDM
.CheckNPC: .CheckNPC:
; Returns 0 if there is an NPC in front that you can't move ; Returns 0 if there is an NPC in front that you can't move
; Returns 1 if there is no NPC in front ; 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 ld a, 0
ldh [hMapObjectIndex], a ldh [hMapObjectIndex], a
; Load the next X coordinate into d ; Load the next X coordinate into d
@ -631,14 +632,14 @@ ENDM
; Find an object struct with coordinates equal to d,e ; Find an object struct with coordinates equal to d,e
ld bc, wObjectStructs ; redundant ld bc, wObjectStructs ; redundant
farcall IsNPCAtCoord farcall IsNPCAtCoord
jr nc, .is_npc jr nc, .no_npc
call .CheckStrengthBoulder call .CheckStrengthBoulder
jr c, .no_bump jr c, .no_bump
xor a xor a ; bump
ret ret
.is_npc .no_npc
ld a, 1 ld a, 1
ret ret