diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /engine/routines | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'engine/routines')
| -rw-r--r-- | engine/routines/drawkrispackgfx.asm | 2 | ||||
| -rw-r--r-- | engine/routines/phonering_copytilemapatonce.asm | 4 | ||||
| -rw-r--r-- | engine/routines/savemenu_copytilemapatonce.asm | 4 | ||||
| -rw-r--r-- | engine/routines/trademonfrontpic.asm | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engine/routines/drawkrispackgfx.asm b/engine/routines/drawkrispackgfx.asm index f71e43db8..457dd7110 100644 --- a/engine/routines/drawkrispackgfx.asm +++ b/engine/routines/drawkrispackgfx.asm @@ -5,7 +5,7 @@ DrawKrisPackGFX: ; 48e81 ld a, [hli] ld e, a ld d, [hl] - ld hl, VTiles2 tile $50 + ld hl, vTiles2 tile $50 lb bc, BANK(PackFGFX), 15 call Request2bpp ret diff --git a/engine/routines/phonering_copytilemapatonce.asm b/engine/routines/phonering_copytilemapatonce.asm index 1780136d1..b1a726675 100644 --- a/engine/routines/phonering_copytilemapatonce.asm +++ b/engine/routines/phonering_copytilemapatonce.asm @@ -21,11 +21,11 @@ PhoneRing_CopyTilemapAtOnce: ; 4d188 jr c, .wait di - ld a, BANK(VBGMap2) + ld a, BANK(vBGMap2) ld [rVBK], a hlcoord 0, 0, AttrMap call .CopyTilemapAtOnce - ld a, BANK(VBGMap0) + ld a, BANK(vBGMap0) ld [rVBK], a hlcoord 0, 0 call .CopyTilemapAtOnce diff --git a/engine/routines/savemenu_copytilemapatonce.asm b/engine/routines/savemenu_copytilemapatonce.asm index 0adce91c6..5d4ed8b7d 100644 --- a/engine/routines/savemenu_copytilemapatonce.asm +++ b/engine/routines/savemenu_copytilemapatonce.asm @@ -18,11 +18,11 @@ SaveMenu_CopyTilemapAtOnce: ; 4cf45 (13:4f45) jr c, .WaitLY di - ld a, BANK(VBGMap2) + ld a, BANK(vBGMap2) ld [rVBK], a hlcoord 0, 0, AttrMap call .CopyTilemapAtOnce - ld a, BANK(VBGMap0) + ld a, BANK(vBGMap0) ld [rVBK], a hlcoord 0, 0 call .CopyTilemapAtOnce diff --git a/engine/routines/trademonfrontpic.asm b/engine/routines/trademonfrontpic.asm index 3a38688d7..e312042ff 100644 --- a/engine/routines/trademonfrontpic.asm +++ b/engine/routines/trademonfrontpic.asm @@ -1,7 +1,7 @@ GetTrademonFrontpic: ; 4d7fd ld a, [wOTTrademonSpecies] ld hl, wOTTrademonDVs - ld de, VTiles2 + ld de, vTiles2 push de push af predef GetUnownLetter |