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

Define TileCollisionTable as a standard 'db' series

Browse Source
This commit is contained in:
Rangi
2020-02-13 19:01:47 -05:00
parent 53cf08b6b3
commit 88bbdb6a2f
6 changed files with 273 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
engine/overworld/npc_movement.asm
View File

@@ -75,7 +75,7 @@ WillObjectBumpIntoWater:
ld a, [hl]
ld d, a
call GetTileCollision
and a ; LANDTILE
and a ; LAND_TILE
jr z, WillObjectBumpIntoTile
scf
ret
@@ -87,7 +87,7 @@ WillObjectBumpIntoLand:
add hl, bc
ld a, [hl]
call GetTileCollision
cp WATERTILE
cp WATER_TILE
jr z, WillObjectBumpIntoTile
scf
ret
@@ -213,11 +213,11 @@ Function6fa1:
call GetCoordTile
call GetTileCollision
pop de
and a ; LANDTILE
and a ; LAND_TILE
jr nz, .not_land
call GetCoordTile
call GetTileCollision
and a ; LANDTILE
and a ; LAND_TILE
jr nz, .not_land
xor a
ret

6
engine/overworld/player_movement.asm
View File

@@ -738,7 +738,7 @@ ENDM
; Return 0 if tile a is land. Otherwise, return carry.
call GetTileCollision
and a ; LANDTILE?
and a ; LAND_TILE
ret z
scf
ret
@@ -748,11 +748,11 @@ ENDM
; Otherwise, return carry.
call GetTileCollision
cp WATERTILE
cp WATER_TILE
jr z, .Water
; Can walk back onto land from water.
and a ; LANDTILE?
and a ; LAND_TILE
jr z, .Land
jr .Neither