aboutsummaryrefslogtreecommitdiffstats
path: root/engine/overworld/missable_objects.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-11-04 20:11:52 -0500
committerGitHub <noreply@github.com>2020-11-04 20:11:52 -0500
commited03fc4f4a3287a01647e528abba27aac1937de0 (patch)
tree32fef70a31af3a0b5ad2b0d34042c312574fb42d /engine/overworld/missable_objects.asm
parentMerge branch 'master' of https://github.com/pret/pokered (diff)
parentStart reorganizing pokeyellow (diff)
downloadpokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.tar.gz
pokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.tar.xz
pokeyellow-ed03fc4f4a3287a01647e528abba27aac1937de0.zip
Merge pull request #59 from Rangi42/master
Start reorganizing pokeyellow
Diffstat (limited to 'engine/overworld/missable_objects.asm')
-rw-r--r--engine/overworld/missable_objects.asm8
1 files changed, 2 insertions, 6 deletions
diff --git a/engine/overworld/missable_objects.asm b/engine/overworld/missable_objects.asm
index 358a9b9f..bcaa731b 100644
--- a/engine/overworld/missable_objects.asm
+++ b/engine/overworld/missable_objects.asm
@@ -15,17 +15,13 @@ MarkTownVisitedAndLoadMissableObjects::
add hl, bc
ld a, [hli] ; load missable objects pointer in hl
ld h, [hl]
- ; fall through
-
-; LoadMissableObjects:
-; seems to not exist in yellow (predef replaced with something near TryPushingBoulder)
ld l, a
push hl
ld a, l
- sub MissableObjects & $ff ; calculate difference between out pointer and the base pointer
+ sub LOW(MissableObjects) ; calculate difference between out pointer and the base pointer
ld l, a
ld a, h
- sbc MissableObjects / $100
+ sbc HIGH(MissableObjects)
ld h, a
ld a, h
ldh [hDividend], a