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

Fix inaccurate denotations to the concepts of tile, tile collision, and collision permission (#1078)

Browse Source
This commit is contained in:
xCrystal
2024-01-07 14:51:27 +01:00
parent 7f3b87950a
commit e0c278a595
17 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
engine/overworld/tile_events.asm
View File

@@ -1,6 +1,6 @@
CheckWarpCollision::
; Is this tile a warp?
ld a, [wPlayerTile]
ld a, [wPlayerTileCollision]
cp COLL_PIT
jr z, .warp
cp COLL_PIT_68
@@ -18,7 +18,7 @@ CheckWarpCollision::
CheckDirectionalWarp::
; If this is a directional warp, clear carry (press the designated button to warp).
; Else, set carry (immediate warp).
ld a, [wPlayerTile]
ld a, [wPlayerTileCollision]
cp COLL_WARP_CARPET_DOWN
jr z, .directional
cp COLL_WARP_CARPET_LEFT
@@ -37,7 +37,7 @@ CheckDirectionalWarp::
CheckWarpFacingDown:
ld de, 1
ld hl, .blocks
ld a, [wPlayerTile]
ld a, [wPlayerTileCollision]
call IsInArray
ret
@@ -54,7 +54,7 @@ CheckWarpFacingDown:
db -1
CheckGrassCollision::
ld a, [wPlayerTile]
ld a, [wPlayerTileCollision]
ld hl, .blocks
ld de, 1
call IsInArray
@@ -90,7 +90,7 @@ CheckCutCollision:
db -1
GetWarpSFX::
ld a, [wPlayerTile]
ld a, [wPlayerTileCollision]
ld de, SFX_ENTER_DOOR
cp COLL_DOOR
ret z