Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Identify more collision-related constants and data

Browse Source
This commit is contained in:
Rangi
2019-03-03 13:30:27 -05:00
parent e671636bba
commit dc396822d7
4 changed files with 70 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
engine/overworld/npc_movement.asm
View File

@@ -114,7 +114,10 @@ WillObjectBumpIntoTile:
ret
.data_6f5b
db DOWN_MASK, UP_MASK, RIGHT_MASK, LEFT_MASK
db DOWN_MASK ; DOWN
db UP_MASK ; UP
db RIGHT_MASK ; LEFT
db LEFT_MASK ; RIGHT
Function6f5f:
ld hl, OBJECT_STANDING_TILE
@@ -137,19 +140,22 @@ Function6f5f:
ret
.data_6f7b
db UP_MASK, DOWN_MASK, LEFT_MASK, RIGHT_MASK
db UP_MASK ; DOWN
db DOWN_MASK ; UP
db LEFT_MASK ; LEFT
db RIGHT_MASK ; RIGHT
Function6f7f:
ld d, a
and $f0
cp HI_NYBBLE_SIDE_WALLS
jr z, .done
cp HI_NYBBLE_UNUSED_C0
jr z, .done
jr z, .continue
cp HI_NYBBLE_SIDE_BUOYS
jr z, .continue
xor a
ret
.done
.continue
ld a, d
and 7
ld e, a
@@ -161,8 +167,14 @@ Function6f7f:
ret
.data_6f99
db 8, 4, 1, 2
db 10, 6, 9, 5
db RIGHT_MASK ; COLL_RIGHT_WALL/BUOY
db LEFT_MASK ; COLL_LEFT_WALL/BUOY
db DOWN_MASK ; COLL_UP_WALL/BUOY
db UP_MASK ; COLL_DOWN_WALL/BUOY
db UP_MASK | RIGHT_MASK ; COLL_DOWN_RIGHT_WALL/BUOY
db UP_MASK | LEFT_MASK ; COLL_DOWN_LEFT_WALL/BUOY
db DOWN_MASK | RIGHT_MASK ; COLL_UP_RIGHT_WALL/BUOY
db DOWN_MASK | LEFT_MASK ; COLL_UP_LEFT_WALL/BUOY
Function6fa1:
ld hl, OBJECT_DIRECTION_WALKING
@@ -493,7 +505,7 @@ Unreferenced_Function7113:
cp d
jr nz, .check_current_coords
ldh a, [hObjectStructIndexBuffer]
cp $0
cp PLAYER_OBJECT
jr z, .next
jr .yes