diff options
| author | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-07-20 23:05:28 -0700 |
| commit | 973721491c38aa3014f5b28982227a618d2f6b59 (patch) | |
| tree | e01415064e6da53a471d75b2eb0113846650322b /home/window.asm | |
| parent | a3c6931fa8edd09fcea678fd8d2e9988951380de (diff) | |
| parent | 0b5471f385d3cc66bb4ae7aa4191ce3af9f50cac (diff) | |
Merge remote-tracking branch 'kanzure/master' into gfx-script
Diffstat (limited to 'home/window.asm')
| -rw-r--r-- | home/window.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/home/window.asm b/home/window.asm index 8c1e95134..850b7466e 100644 --- a/home/window.asm +++ b/home/window.asm @@ -40,8 +40,8 @@ Function2de2:: ; 2de2 call Function2e31 ld a, $90 ld [hWY], a - call Functione4a - callba Functionb8000 + call Special_ReplaceKrisSprite + callba ReturnFromMapSetupScript callba Function106594 ret ; 2e08 @@ -83,7 +83,7 @@ Function2e31:: ; 2e31 ld [hBGMapMode], a ld a, $1 ld [hOAMUpdate], a - call Function1ad2 + call DrawOnMap xor a ld [hOAMUpdate], a call DelayFrame |