diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /engine/menus/savemenu_copytilemapatonce.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'engine/menus/savemenu_copytilemapatonce.asm')
| -rw-r--r-- | engine/menus/savemenu_copytilemapatonce.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/menus/savemenu_copytilemapatonce.asm b/engine/menus/savemenu_copytilemapatonce.asm index 9b50494a4..8271603d9 100644 --- a/engine/menus/savemenu_copytilemapatonce.asm +++ b/engine/menus/savemenu_copytilemapatonce.asm @@ -1,4 +1,4 @@ -SaveMenu_CopyTilemapAtOnce: ; 4cf45 (13:4f45) +SaveMenu_CopyTilemapAtOnce: ld a, [hCGB] and a jp z, WaitBGMap @@ -38,7 +38,7 @@ SaveMenu_CopyTilemapAtOnce: ; 4cf45 (13:4f45) ld [hBGMapMode], a ret -.CopyTilemapAtOnce: ; 4cf80 (13:4f80) +.CopyTilemapAtOnce: ld [hSPBuffer], sp ; $ffd9 ld sp, hl ld a, [hBGMapAddress + 1] |