From 849b53623b2ace56ef40b7bbdefe29a86e10162e Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 12 Jul 2015 16:24:03 -0700 Subject: shake screen functions --- home/vblank.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home') 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] -- cgit v1.2.3 From 99df5f0fd79f063ee4c7ec364eadd175a3d83c42 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 12 Jul 2015 16:37:06 -0700 Subject: use constant for bg transfer dest hram var --- home/init.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'home') diff --git a/home/init.asm b/home/init.asm index 4ac2a4eb..5a74dca9 100644 --- a/home/init.asm +++ b/home/init.asm @@ -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 -- cgit v1.2.3 From 4a8c9993ad182296131ef87111e1b6d6e2af4201 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sun, 12 Jul 2015 23:00:48 -0700 Subject: named wram variables --- home/overworld.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'home') diff --git a/home/overworld.asm b/home/overworld.asm index 0e62a932..37daa0d0 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 -- cgit v1.2.3 From f66a74b9fcb762d693e89415836386bcad2475b5 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Mon, 13 Jul 2015 13:35:35 -0700 Subject: comment slot machine --- home/init.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'home') diff --git a/home/init.asm b/home/init.asm index 5a74dca9..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 -- cgit v1.2.3