diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-06-23 19:06:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 19:06:14 -0500 |
| commit | ff927ba730e45a843c1e183b5f05646f96378af0 (patch) | |
| tree | 530f89782772bb76a76fbdd28247f1c6e3248483 /engine/overworld/player_animations.asm | |
| parent | Merge pull request #243 from Nog-Frog/rename-unused-cd40 (diff) | |
| parent | Move more tables from engine/ to data/ (diff) | |
| download | pokeyellow-ff927ba730e45a843c1e183b5f05646f96378af0.tar.gz pokeyellow-ff927ba730e45a843c1e183b5f05646f96378af0.tar.xz pokeyellow-ff927ba730e45a843c1e183b5f05646f96378af0.zip | |
Merge pull request #250 from Rangi42/master
Move more tables from engine/ to data/
Diffstat (limited to 'engine/overworld/player_animations.asm')
| -rwxr-xr-x | engine/overworld/player_animations.asm | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm index a17e67bd..0f17de8f 100755 --- a/engine/overworld/player_animations.asm +++ b/engine/overworld/player_animations.asm @@ -349,7 +349,7 @@ GetPlayerTeleportAnimFrameDelay: IsPlayerStandingOnWarpPadOrHole: ld b, 0 - ld hl, .warpPadAndHoleData + ld hl, WarpPadAndHoleData ld a, [wCurMapTileset] ld c, a .loop @@ -373,13 +373,7 @@ IsPlayerStandingOnWarpPadOrHole: ld [wStandingOnWarpPadOrHole], a ret -; format: db tileset id, tile id, value to be put in [wStandingOnWarpPadOrHole] -.warpPadAndHoleData: - db FACILITY, $20, 1 ; warp pad - db FACILITY, $11, 2 ; hole - db CAVERN, $22, 2 ; hole - db INTERIOR, $55, 1 ; warp pad - db $FF +INCLUDE "data/warp_pad_hole_tile_ids.asm" FishingAnim: ld c, 10 |