diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:00:22 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2018-01-14 23:00:22 -0500 |
| commit | dfcca93b451cecb6857f8b6bc6b9f67e997b09c9 (patch) | |
| tree | acf41a46e600fa3452536f97dc3f934968b3c839 /gfx/load_pics.asm | |
| parent | 5c28d05bb40b47f084a34eb732da92c899e18db6 (diff) | |
| parent | 6c5cd7a963fb2b5eed109aeef25f041eabba0004 (diff) | |
Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)
# Conflicts:
# engine/battle/core.asm
# engine/save.asm
Diffstat (limited to 'gfx/load_pics.asm')
| -rwxr-xr-x | gfx/load_pics.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gfx/load_pics.asm b/gfx/load_pics.asm index 86cf4123e..e58ecb615 100755 --- a/gfx/load_pics.asm +++ b/gfx/load_pics.asm @@ -206,7 +206,7 @@ Predef_GetMonBackpic: ; 5116c ld c, a ld a, [rSVBK] push af - ld a, $6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a push de @@ -327,7 +327,7 @@ Predef_GetTrainerPic: ; 5120d call AddNTimes ld a, [rSVBK] push af - ld a, $6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a push de ld a, BANK(TrainerPicPointers) @@ -358,7 +358,7 @@ Predef_Decompress: ; 5125d ld a, [rSVBK] push af - ld a, 6 + ld a, BANK(wDecompressScratch) ld [rSVBK], a push de |