thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move more tables from engine/ to data/

Browse source 
This also splits the end of engine/battle/core.asm into engine/battle/effects.asm.
This commit is contained in:
Rangi 2020-06-23 17:50:50 -04:00
parent bdeb494add
commit 0a62d48df2
65 changed files with 2863 additions and 2825 deletions
Download patch file Download diff file Expand all files Collapse all files

28
engine/overworld/player_state.asm
View file

@ -157,12 +157,12 @@ IsWarpTileInFrontOfPlayer:
call _GetTileAndCoordsInFrontOfPlayer
ld a, [wCurMap]
cp SS_ANNE_BOW
jr z, .ssAnne5
jr z, IsSSAnneBowWarpTileInFrontOfPlayer
ld a, [wSpriteStateData1 + 9] ; player sprite's facing direction
srl a
ld c, a
ld b, 0
ld hl, .warpTileListPointers
ld hl, WarpTileListPointers
add hl, bc
ld a, [hli]
ld h, [hl]
@ -176,33 +176,17 @@ IsWarpTileInFrontOfPlayer:
pop hl
ret
.warpTileListPointers:
dw .facingDownWarpTiles
dw .facingUpWarpTiles
dw .facingLeftWarpTiles
dw .facingRightWarpTiles
INCLUDE "data/warp_carpet_tile_ids.asm"
.facingDownWarpTiles
db $01,$12,$17,$3D,$04,$18,$33,$FF
.facingUpWarpTiles
db $01,$5C,$FF
.facingLeftWarpTiles
db $1A,$4B,$FF
.facingRightWarpTiles
db $0F,$4E,$FF
.ssAnne5
IsSSAnneBowWarpTileInFrontOfPlayer:
ld a, [wTileInFrontOfPlayer]
cp $15
jr nz, .notSSAnne5Warp
scf
jr .done
jr IsWarpTileInFrontOfPlayer.done
.notSSAnne5Warp
and a
jr .done
jr IsWarpTileInFrontOfPlayer.done
IsPlayerStandingOnDoorTileOrWarpTile:
push hl