diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-14 00:58:09 -0500 |
| commit | e25a7148d0a78549de4f33fa72d519dcaf660e97 (patch) | |
| tree | 5fcc95934c26b1fc86345b10f2a5c80fa740d083 /home | |
| parent | Use more *Coord (diff) | |
| parent | named town map stuff (diff) | |
| download | pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.tar.gz pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.tar.xz pokeyellow-e25a7148d0a78549de4f33fa72d519dcaf660e97.zip | |
Merge branch 'master' of https://github.com/YamaArashi/pokered
Conflicts:
engine/town_map.asm
Diffstat (limited to 'home')
| -rw-r--r-- | home/init.asm | 8 | ||||
| -rw-r--r-- | home/overworld.asm | 2 | ||||
| -rw-r--r-- | home/vblank.asm | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/home/init.asm b/home/init.asm index 4ac2a4eb..b3f31944 100644 --- a/home/init.asm +++ b/home/init.asm @@ -31,8 +31,8 @@ rLCDC_DEFAULT EQU %11100011 ld [$ff4a], a ld [$ff06], a ld [$ff07], a - ld [$ff47], a - ld [$ff48], a + ld [rBGP], a + ld [rOBP0], a ld [$ff49], a ld a, rLCDC_ENABLE_MASK @@ -101,9 +101,9 @@ rLCDC_DEFAULT EQU %11100011 ld [wc0ef], a ld [wc0f0], a ld a, $9c - ld [$ffbd], a + ld [H_AUTOBGTRANSFERDEST + 1], a xor a - ld [$ffbc], a + ld [H_AUTOBGTRANSFERDEST], a dec a ld [wUpdateSpritesEnabled], a diff --git a/home/overworld.asm b/home/overworld.asm index 4197e2a3..f0cde773 100644 --- a/home/overworld.asm +++ b/home/overworld.asm @@ -301,7 +301,7 @@ OverworldLoopLessDelay:: and a jp nz,CheckWarpsNoCollision predef ApplyOutOfBattlePoisonDamage ; also increment daycare mon exp - ld a,[wd12d] + ld a,[wOutOfBattleBlackout] and a jp nz,HandleBlackOut ; if all pokemon fainted .newBattle diff --git a/home/vblank.asm b/home/vblank.asm index d8288187..9adf537c 100644 --- a/home/vblank.asm +++ b/home/vblank.asm @@ -13,7 +13,7 @@ VBlank:: ld a, [hSCY] ld [rSCY], a - ld a, [wd0a0] + ld a, [wDisableVBlankWYUpdate] and a jr nz, .ok ld a, [hWY] |