diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-28 01:30:36 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-28 01:30:36 -0500 |
| commit | da28d1a84b0499bead314e17ae2ff0d13eb03196 (patch) | |
| tree | c212adfc53d1996c06f2e4be1d6e480e687a2ad8 /home/map.asm | |
| parent | bad9e33530af8cdc29ce5629df682fc7915bfff0 (diff) | |
| parent | 2c4777f3363cd64d05fb00084fd83dff8ac31674 (diff) | |
Merge pull request #437 from roukaour/master
Reorganize battle/; rename most "header" misnomers; gfx/pics → gfx/pokemon
Diffstat (limited to 'home/map.asm')
| -rw-r--r-- | home/map.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/home/map.asm b/home/map.asm index 1becaa64a..83b5adf11 100644 --- a/home/map.asm +++ b/home/map.asm @@ -1391,7 +1391,7 @@ UpdateBGMapColumn:: ; 27f8 ret ; 2821 -LoadTileset:: ; 2821 +LoadTilesetGFX:: ; 2821 ld hl, TilesetAddress ld a, [hli] ld h, [hl] @@ -2054,7 +2054,7 @@ ReloadTilesetAndPalettes:: ; 2bae call SwitchToAnyMapBank farcall UpdateTimeOfDayPal call OverworldTextModeSwitch - call LoadTileset + call LoadTilesetGFX ld a, 9 call SkipMusic pop af @@ -2372,17 +2372,17 @@ GetFishingGroup:: ; 2d19 ret ; 2d27 -LoadTilesetHeader:: ; 2d27 +LoadTileset:: ; 2d27 push hl push bc ld hl, Tilesets - ld bc, TilesetHeaderEnd - TilesetHeader + ld bc, TilesetEnd - Tileset ld a, [wTileset] call AddNTimes ld de, TilesetBank - ld bc, TilesetHeaderEnd - TilesetHeader + ld bc, TilesetEnd - Tileset ld a, BANK(Tilesets) call FarCopyBytes |