diff options
| author | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-05 14:01:18 -0500 |
|---|---|---|
| committer | U-Daniel-PC\Daniel <corrnondacqb@yahoo.com> | 2015-06-05 15:10:39 -0500 |
| commit | d48ea223eaad84af95e4f29043c279b56aa4ae88 (patch) | |
| tree | 2fd8807ed257d9d9f03e351c2d6a71d7b208d671 /home | |
| parent | Merge branch 'master' of https://github.com/iimarckus/pokered (diff) | |
| download | pokeyellow-d48ea223eaad84af95e4f29043c279b56aa4ae88.tar.gz pokeyellow-d48ea223eaad84af95e4f29043c279b56aa4ae88.tar.xz pokeyellow-d48ea223eaad84af95e4f29043c279b56aa4ae88.zip | |
Fix a lot of bugs
Diffstat (limited to 'home')
| -rw-r--r-- | home/copy2.asm | 12 | ||||
| -rw-r--r-- | home/overworld.asm | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/home/copy2.asm b/home/copy2.asm index 318ed882..ad82260a 100644 --- a/home/copy2.asm +++ b/home/copy2.asm @@ -14,11 +14,11 @@ FarCopyDataDouble:: ; 15d4 (0:15d4) ld e,a ld a,b and a - jr z,.8bitcopyamount + jr z,.eightbitcopyamount ld a,c and a ; multiple of $100 jr z, .expandloop ; if so, do not increment b because the first instance of dec c results in underflow -.8bitcopyamount +.eightbitcopyamount inc b .expandloop ld a,[de] @@ -134,13 +134,13 @@ FillMemory:: ; 166e (0:166e) push af ld a,b and a - jr z, .8bitcopyamount + jr z, .eightbitcopyamount ld a,c and a - jr z, .mulitpleof$100 -.8bitcopyamount + jr z, .mulitpleof0x100 +.eightbitcopyamount inc b -.multipleof$100 +.mulitpleof0x100 pop af .loop ld [hli],a 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 |