diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/overworld.asm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/home/overworld.asm b/home/overworld.asm index a41a7ba8..95b94646 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -1218,6 +1218,9 @@ SignLoop:: ; function to check if the player will jump down a ledge and check if the tile ahead is passable (when not surfing) ; sets the carry flag if there is a collision, and unsets it if there isn't a collision CollisionCheckOnLand:: + ld a, [wSlopNoclip] ; SL0P noclip: walk through everything (carry clear) + and a + ret nz ld a, [wMovementFlags] bit BIT_LEDGE_OR_FISHING, a jr nz, .noCollision @@ -1797,10 +1800,8 @@ LoadPlayerSpriteGraphicsCommon:: ; function to load data from the map header LoadMapHeader:: farcall MarkTownVisitedAndLoadToggleableObjects - jr asm_0dbd - -Func_0db5:: ; unreferenced - farcall LoadToggleableObjectData +; SL0P: removed unreferenced Func_0db5 (farcall LoadToggleableObjectData) to make +; room in ROM0 for the noclip hook in CollisionCheckOnLand. asm_0dbd: ld a, [wCurMapTileset] ld [wUnusedCurMapTilesetCopy], a |