diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2018-06-24 21:23:51 -0400 |
| commit | e2fb7acac0e3c1d598021b52fc2583dd983321bc (patch) | |
| tree | ea5922596ce167e5b0485ea3bacd65f43339ca60 /home/sprite_updates.asm | |
| parent | 1a888f22004aec967d2b6049ede7e04b1815f956 (diff) | |
| parent | 364854623267a8a39242243b0cdf80144e868642 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# engine/items/mart.asm
Diffstat (limited to 'home/sprite_updates.asm')
| -rw-r--r-- | home/sprite_updates.asm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/home/sprite_updates.asm b/home/sprite_updates.asm index 121afc87b..d263363a6 100644 --- a/home/sprite_updates.asm +++ b/home/sprite_updates.asm @@ -1,4 +1,4 @@ -DisableSpriteUpdates:: ; 0x2ed3 +DisableSpriteUpdates:: xor a ld [hMapAnims], a ld a, [wVramState] @@ -7,9 +7,8 @@ DisableSpriteUpdates:: ; 0x2ed3 ld a, $0 ld [wSpriteUpdatesEnabled], a ret -; 0x2ee4 -EnableSpriteUpdates:: ; 2ee4 +EnableSpriteUpdates:: ld a, $1 ld [wSpriteUpdatesEnabled], a ld a, [wVramState] @@ -18,4 +17,3 @@ EnableSpriteUpdates:: ; 2ee4 ld a, $1 ld [hMapAnims], a ret -; 2ef6 |