summaryrefslogtreecommitdiff
path: root/home/overworld.asm
diff options
context:
space:
mode:
authorU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-06-05 14:01:18 -0500
committerU-Daniel-PC\Daniel <corrnondacqb@yahoo.com>2015-06-05 15:10:39 -0500
commitd48ea223eaad84af95e4f29043c279b56aa4ae88 (patch)
tree2fd8807ed257d9d9f03e351c2d6a71d7b208d671 /home/overworld.asm
parentb0b1f88b9466f0414e4a6c782b5348f46768c8c4 (diff)
Fix a lot of bugs
Diffstat (limited to 'home/overworld.asm')
-rw-r--r--home/overworld.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/home/overworld.asm b/home/overworld.asm
index b3008903..a0d52843 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -292,7 +292,7 @@ OverworldLoopLessDelay:: ; 0245 (0:0245)
ld c,$0a
call DelayFrames
jp EnterMap
-;.allPokemonFainted
+.allPokemonFainted
; ld a,$ff
; ld [W_ISINBATTLE],a
; call RunMapScript
@@ -638,7 +638,7 @@ CheckMapConnections:: ; 05db (0:05db)
ld [wCurrentTileBlockMapViewPointer + 1],a
.loadNewMap ; 06ce (0:06ce)
; load the connected map that was entered
- ld hl,[wd430]
+ ld hl,wd430
set 4,[hl]
ld a,$2
ld [wd431],a