diff options
| author | dannye <corrnondacqb@yahoo.com> | 2016-07-18 01:32:24 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2016-07-18 01:32:24 -0500 |
| commit | 7c01509b6b69b4dc33f5d739589d50f26ffd65b0 (patch) | |
| tree | 89b4000a56c9e3d942666639c83416100f360f88 /engine/town_map.asm | |
| parent | 80bae03975a84dadf080c79f52216866dd410cf8 (diff) | |
| parent | fc474c8ee740acbe662b06db0d9cab8edc6680e9 (diff) | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/town_map.asm')
| -rwxr-xr-x | engine/town_map.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/town_map.asm b/engine/town_map.asm index c73b27c8..d417e0a3 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -141,7 +141,7 @@ LoadTownMap_Fly: call LoadFontTilePatterns ld de, BirdSprite ld hl, vSprites + $40 - lb bc, BANK(BirdSprite), $0c + lb bc, BANK(BirdSprite), $c call CopyVideoData ld de, TownMapUpArrow ld hl, vChars1 + $6d0 @@ -355,12 +355,12 @@ DrawPlayerOrBirdSprite: call WritePlayerOrBirdSpriteOAM pop hl ld de, wcd6d -.asm_711dc +.loop ld a, [hli] ld [de], a inc de - cp $50 - jr nz, .asm_711dc + cp "@" + jr nz, .loop ld hl, wOAMBuffer ld de, wTileMapBackup ld bc, $a0 @@ -397,8 +397,8 @@ DisplayWildLocations: jr nz, .drawPlayerSprite ; if no OAM entries were written, print area unknown text coord hl, 1, 7 - ld b, $2 - ld c, $f + ld b, 2 + ld c, 15 call TextBoxBorder coord hl, 2, 9 ld de, AreaUnknownText |