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

10
engine/dma_transfer.asm
View File

@@ -119,7 +119,7 @@ Mobile_ReloadMapPart: ; 104099
.unreferenced_1040da
ld a, $1
ld [rVBK], a
ld a, $3
ld a, BANK(w3_d800)
ld [rSVBK], a
ld de, w3_d800
ld a, [hBGMapAddress + 1]
@@ -143,7 +143,7 @@ Mobile_ReloadMapPart: ; 104099
.unreferenced_104101
ld a, $1
ld [rVBK], a
ld a, $3
ld a, BANK(w3_d800)
ld [rSVBK], a
ld hl, w3_d800
call HDMATransferToWRAMBank3
@@ -221,7 +221,7 @@ CallInSafeGFXMode: ; 104177
ld [hMapAnims], a
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wScratchTileMap)
ld [rSVBK], a
ld a, [rVBK]
push af
@@ -472,7 +472,7 @@ _Get2bpp:: ; 104284
; switch to WRAM bank 6
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wScratchTileMap)
ld [rSVBK], a
push bc
@@ -542,7 +542,7 @@ _Get1bpp:: ; 1042b2
.bankswitch ; 1042d6
ld a, [rSVBK]
push af
ld a, $6
ld a, BANK(wScratchTileMap)
ld [rSVBK], a
push bc