diff options
| author | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
|---|---|---|
| committer | U-Fish-PC\Daniel <corrnondacqb@yahoo.com> | 2014-05-30 13:17:47 -0400 |
| commit | 286c160c27e58caad32f776cec684eb8cb2cb22a (patch) | |
| tree | d89563a88a9674837896d6e88b9c9431b708bf97 /engine/town_map.asm | |
| parent | c8a5720cca08631dcc20d036731e261a09a9a76e (diff) | |
| parent | 188ac8a9b4816dd98df0108314e58885c3b07452 (diff) | |
Merge branch 'master' of https://github.com/yenatch/pokered
Conflicts:
engine/battle/1c.asm
Diffstat (limited to 'engine/town_map.asm')
| -rwxr-xr-x | engine/town_map.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/town_map.asm b/engine/town_map.asm index 3be90604..ea2d3171 100755 --- a/engine/town_map.asm +++ b/engine/town_map.asm @@ -19,7 +19,7 @@ DisplayTownMap: ; 70e3e (1c:4e3e) ld de, wTileMapBackup ld bc, $10 call CopyData - ld hl, $8040 + ld hl, vSprites + $40 ld de, TownMapCursor ; $4f40 ld bc, (BANK(TownMapCursor) << 8) + $04 call CopyVideoDataDouble @@ -143,11 +143,11 @@ LoadTownMap_Fly: ; 70f90 (1c:4f90) call LoadPlayerSpriteGraphics call LoadFontTilePatterns ld de, BirdSprite ; $4d80 - ld hl, $8040 + ld hl, vSprites + $40 ld bc, (BANK(BirdSprite) << 8) + $0c call CopyVideoData ld de, TownMapUpArrow ; $5093 - ld hl, $8ed0 + ld hl, vChars1 + $6d0 ld bc, (BANK(TownMapUpArrow) << 8) + $01 call CopyVideoDataDouble call Func_71070 @@ -294,12 +294,12 @@ LoadTownMap: ; 7109b (1c:509b) call TextBoxBorder call DisableLCD ld hl, WorldMapTileGraphics ; $65a8 - ld de, $9600 + ld de, vChars2 + $600 ld bc, $100 ld a, BANK(WorldMapTileGraphics) call FarCopyData2 ld hl, MonNestIcon ; $56be - ld de, $8040 + ld de, vSprites + $40 ld bc, $8 ld a, BANK(MonNestIcon) call FarCopyDataDouble |