thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-09-17 02:40:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20 from jojobear13/bugfixes

Browse source 
Bugfixes from ViWall's list
This commit is contained in:
Llinos Evans 2023-09-27 15:08:25 +01:00 committed by GitHub
parent a1e52924d0 653ef3cddc
commit 50991a65c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/tilesets/pair_collision_tile_ids.asm
View file

@ -21,4 +21,6 @@ TilePairCollisionsWater::
db FOREST, $14, $2E
db FOREST, $48, $2E
db CAVERN, $14, $05
db GYM , $14, $32 ;prevent surfing into statue base tile ($32) from water tile ($14)
db GYM , $14, $33 ;prevent surfing into statue base tile ($33) from water tile ($14)
db -1 ; end

10
data/tilesets/warp_tile_ids.asm
View file

@ -1,3 +1,5 @@
;Note: These warp tiles act like teleporters, initiating the warp when the player steps over them.
; Used for things like house entrances, cave entrances, etc.
WarpTileIDPointers:
table_width 2, WarpTileIDPointers
dw .OverworldWarpTileIDs
@ -103,16 +105,16 @@ ENDM
warp_tiles $1B, $1C, $0B, $0C, $58, $59
.CelesteWarpTileIDs:
warp_tiles $5A, $5C, $3A, $30, $50, $51 ; Like Forest but a bit better
warp_tiles $5A, $5C, $3A ; Like Forest but a bit better
.RocketHouseWarpTileIDs:
warp_tiles $53
warp_tiles
.BetaMartWarpTileIDs:
warp_tiles $1C, $1D, $1E, $1F, $0C, $0D, $0E, $0F, $4B, $4C
warp_tiles $1C, $1D, $1E, $1F, $0C, $0D, $0E, $0F, $4B
.JackyWarpTileIDs:
warp_tiles $04, $14
warp_tiles
.ShipPortWarpTileIDs:
.ClubWarpTileIDs:

1
engine/items/item_effects.asm
View file

@ -131,7 +131,6 @@ ItemUseLetter:
ld a, [wIsInBattle]
and a
jp nz, ItemUseNotTime
text_asm
ld hl, ChiefLetterText
call PrintText
jp TextScriptEnd