diff options
| author | dannye <33dannye@gmail.com> | 2021-01-06 22:01:30 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2021-01-06 22:01:30 -0600 |
| commit | 0dc8af64aab2658a882f73d34bd7a5cc6563f7a1 (patch) | |
| tree | e9b1a552f849a7c4bef055725b018937b3f5c56c /src/engine/bank03.asm | |
| parent | fec3f3580a54dbaa3dfb138398c92b37d6c58dee (diff) | |
| parent | a99feeb46f165fd7c4419811be4b3f591d8f1dad (diff) | |
Merge branch 'anims' of https://github.com/ElectroDeoxys/poketcg
Diffstat (limited to 'src/engine/bank03.asm')
| -rwxr-xr-x | src/engine/bank03.asm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/engine/bank03.asm b/src/engine/bank03.asm index 8f39e57..2e3f0d9 100755 --- a/src/engine/bank03.asm +++ b/src/engine/bank03.asm @@ -268,8 +268,8 @@ Func_c1f8: ; c1f8 (3:41f8) ld [wd112], a ld [wd3b8], a call EnableSRAM - ld a, [s0a007] - ld [wd421], a + ld a, [sAnimationsDisabled] + ld [wAnimationsDisabled], a ld a, [s0a006] ld [wTextSpeed], a call DisableSRAM @@ -567,7 +567,7 @@ Func_c49c: ; c49c (3:449c) Func_c4b9: ; c4b9 (3:44b9) xor a - ld [wd4ca], a + ld [wVRAMTileOffset], a ld [wd4cb], a ld a, $1d farcall Func_80418 @@ -579,10 +579,13 @@ Func_c4b9: ; c4b9 (3:44b9) .asm_c4d1 ld a, b ld [wd337], a - ld a, $0 + + ; load Player's sprite for overworld + ld a, SPRITE_OW_PLAYER farcall CreateSpriteAndAnimBufferEntry ld a, [wWhichSprite] ld [wPlayerSpriteIndex], a + ld b, $2 ld a, [wCurMap] cp OVERWORLD_MAP |