diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-24 17:39:50 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-24 17:39:50 -0500 |
| commit | e400fe5142731422b0f542749d913d569997159e (patch) | |
| tree | 004b17f7b444c4bbc8bbb80e3b189a48287ed4b7 /engine/overworld.asm | |
| parent | 70e6b5947b5cc9ca9fd93c720c7f97d9e018da2d (diff) | |
| parent | 3e7f3bbeb6dd2d3cff6343dea2298502faa14185 (diff) | |
Merge pull request #423 from roukaour/master
Fix issues #262, #345, #347, #396, #408, and #412
Diffstat (limited to 'engine/overworld.asm')
| -rwxr-xr-x | engine/overworld.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/overworld.asm b/engine/overworld.asm index a085d1d5a..a505ecd66 100755 --- a/engine/overworld.asm +++ b/engine/overworld.asm @@ -112,7 +112,7 @@ GetPlayerSprite: ; 14183 AddMapSprites: ; 141c9 - call GetMapPermission + call GetMapEnvironment call CheckOutdoorMap jr z, .outdoor call AddIndoorSprites @@ -178,14 +178,14 @@ MapCallbackSprites_LoadUsedSpritesGFX: ; 14209 ret nz ld c, EMOTE_SHADOW - callba LoadEmote - call GetMapPermission + farcall LoadEmote + call GetMapEnvironment call CheckOutdoorMap ld c, EMOTE_GRASS_RUSTLE jr z, .outdoor ld c, EMOTE_BOULDER_DUST .outdoor - callba LoadEmote + farcall LoadEmote ret ; 14236 @@ -265,7 +265,7 @@ GetMonSprite: ; 14259 and a jr z, .NoBreedmon - callba LoadOverworldMonIcon + farcall LoadOverworldMonIcon ld l, 1 ld h, 0 |