diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /home/stone_queue.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'home/stone_queue.asm')
| -rw-r--r-- | home/stone_queue.asm | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/home/stone_queue.asm b/home/stone_queue.asm index d41db6fd7..b635cee16 100644 --- a/home/stone_queue.asm +++ b/home/stone_queue.asm @@ -1,4 +1,4 @@ -HandleStoneQueue:: ; 3567 +HandleStoneQueue:: ld a, [hROMBank] push af @@ -9,9 +9,8 @@ HandleStoneQueue:: ; 3567 ld a, b rst Bankswitch ret -; 3574 -.WarpAction: ; 3574 +.WarpAction: ld hl, OBJECT_MAP_OBJECT_INDEX add hl, de ld a, [hl] @@ -35,9 +34,8 @@ HandleStoneQueue:: ; 3567 .nope and a ret -; 3599 -.IsObjectOnWarp: ; 3599 +.IsObjectOnWarp: push de ld hl, OBJECT_NEXT_MAP_X @@ -56,9 +54,8 @@ HandleStoneQueue:: ; 3567 pop de ret -; 35b0 -.check_on_warp ; 35b0 +.check_on_warp ld hl, wCurrMapWarpsPointer ld a, [hli] ld h, [hl] @@ -102,9 +99,8 @@ HandleStoneQueue:: ; 3567 inc a scf ret -; 35de -.IsObjectInStoneTable: ; 35de +.IsObjectInStoneTable: inc e ld hl, CMDQUEUE_ADDR add hl, bc @@ -140,4 +136,3 @@ HandleStoneQueue:: ; 3567 .yes scf ret -; 3600 |