diff options
| -rw-r--r-- | engine/learn.asm | 4 | ||||
| -rw-r--r-- | home.asm | 21 | ||||
| -rwxr-xr-x | home/copy_tilemap.asm | 20 | ||||
| -rw-r--r-- | home/serial.asm | 6 | ||||
| -rw-r--r-- | wram.asm | 2 |
5 files changed, 27 insertions, 26 deletions
diff --git a/engine/learn.asm b/engine/learn.asm index d285d326..8049850f 100644 --- a/engine/learn.asm +++ b/engine/learn.asm @@ -1,5 +1,5 @@ LearnMove: - call BackUpTilesToBuffer + call LoadTileMapToTempTileMap ld a, [wCurPartyMon] ld hl, wPartyMon1Nickname call GetNick @@ -147,7 +147,7 @@ LearnMove: ld [wcede], a call StaticMenuJoypad push af - call ReloadTilesFromBuffer + call LoadTempTileMapToTileMap pop af pop hl bit 1, a @@ -153,26 +153,7 @@ _de_:: INCLUDE "home/clear_sprites.asm" INCLUDE "home/copy2.asm" - -BackUpTilesToBuffer:: - hlcoord 0, 0 - decoord 0, 0, wTileMapBackup - ld bc, SCREEN_HEIGHT * SCREEN_WIDTH - jp CopyBytes - -ReloadTilesFromBuffer:: - xor a - ld [hBGMapMode], a - call ReloadTilesFromBuffer_ - ld a, $1 - ld [hBGMapMode], a - ret - -ReloadTilesFromBuffer_:: - hlcoord 0, 0, wTileMapBackup - decoord 0, 0 - ld bc, SCREEN_HEIGHT * SCREEN_WIDTH - jp CopyBytes +INCLUDE "home/copy_tilemap.asm" Function317b:: ; 317b (0:317b) ld hl, wStringBuffer2 diff --git a/home/copy_tilemap.asm b/home/copy_tilemap.asm new file mode 100755 index 00000000..c361b309 --- /dev/null +++ b/home/copy_tilemap.asm @@ -0,0 +1,20 @@ +LoadTileMapToTempTileMap:: +; Load wTileMap into wTempTileMap + hlcoord 0, 0 + decoord 0, 0, wTempTileMap + ld bc, wTileMapEnd - wTileMap + call CopyBytes + +Call_LoadTempTileMapToTileMap:: + xor a + ldh [hBGMapMode], a + call LoadTempTileMapToTileMap + ld a, 1 + ldh [hBGMapMode], a + ret + +LoadTempTileMapToTileMap:: + hlcoord 0, 0, wTempTileMap + decoord 0, 0 + ld bc, wTileMapEnd - wTileMap + call CopyBytes
\ No newline at end of file diff --git a/home/serial.asm b/home/serial.asm index c57d77ee..262d7ad9 100644 --- a/home/serial.asm +++ b/home/serial.asm @@ -255,13 +255,13 @@ Function7ec:: ; 7ec ret Function813:: ; 813 - call BackUpTilesToBuffer + call LoadTileMapToTempTileMap callfar PlaceWaitingText call WaitLinkTransfer - jp ReloadTilesFromBuffer + jp Call_LoadTempTileMapToTileMap Function822:: ; 822 - call BackUpTilesToBuffer + call LoadTileMapToTempTileMap callfar PlaceWaitingText jp WaitLinkTransfer @@ -251,7 +251,7 @@ wTileMapEnd:: ; c508 SECTION "Animated Objects", WRAM0 wMisc:: ; c508 -wTileMapBackup:: ; c508 +wTempTileMap:: ; c508 ; ds SCREEN_HEIGHT * SCREEN_WIDTH wAnimatedObjectDynamicVTileOffsets:: ds 10 * 2 ; c508 wAnimatedObjectStructs:: ; c51c |