Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/TheMostCuriousThing/pokecrystal (resolve PR #460)

Browse Source 
# Conflicts:
#	engine/battle/core.asm
#	engine/save.asm
This commit is contained in:
Remy Oukaour
2018-01-14 23:00:22 -05:00
parent 5c28d05bb4 6c5cd7a963
commit dfcca93b45
54 changed files with 298 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/load_pics.asm
View File

@@ -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