summaryrefslogtreecommitdiff
path: root/common.asm
diff options
context:
space:
mode:
authorYamaArashi <devnull@localhost>2012-01-23 14:43:48 -0800
committerYamaArashi <devnull@localhost>2012-01-23 14:43:48 -0800
commit5ec8c853a61ccc082309ac494e3a7394e2bc9344 (patch)
tree985ce485229475b48d3f433ce569ad4f7e26040b /common.asm
parent505e717d07dbe8e9a2afc3322b68f703d1c7ec62 (diff)
add missing labels
hg-commit-id: f6c8feae4f1f
Diffstat (limited to 'common.asm')
-rw-r--r--common.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/common.asm b/common.asm
index ea9b1051..3d346345 100644
--- a/common.asm
+++ b/common.asm
@@ -597,8 +597,8 @@ OverworldLoopLessDelay:
jr nz,.oddLoop\@
ld a,[$d52a]
ld [$d528],a
- call $0683
- jp c,$0637
+ call NewBattle
+ jp c,.battleOccurred\@
jp OverworldLoop
.noDirectionChange\@
ld a,[$d52a] ; current direction
@@ -690,7 +690,7 @@ OverworldLoopLessDelay:
ld hl,$d736
res 2,[hl]
jp nc,CheckWarpsNoCollision ; check for warps if there was no battle
-; if a battle occurred
+.battleOccurred\@
ld hl,$d72d
res 6,[hl]
ld hl,$d733