diff options
| author | yenatch <yenatch@gmail.com> | 2018-06-05 07:04:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-05 07:04:54 -0400 |
| commit | dbf05e48ebe2cd841a3d710f5bc9f24db2f068a0 (patch) | |
| tree | 2b05ffe9e84a2c6212da18169141cfaa1ed40dd4 /engine/overworld/map_objects.asm | |
| parent | c61d6a3a5a602d5594071e9446bb3d93b5d99a75 (diff) | |
| parent | 6f4e968b7038a2478c6bcf98b71aa81ed9d21f6a (diff) | |
Merge pull request #517 from mid-kid/master
Some fixes all around
Diffstat (limited to 'engine/overworld/map_objects.asm')
| -rw-r--r-- | engine/overworld/map_objects.asm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 6652beead..7ed1d5f5f 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -2116,13 +2116,13 @@ SpawnEmote: ; 5547 ShakeGrass: ; 5556 push bc - ld de, .data_5562 + ld de, .GrassObject call CopyTempObjectData call InitTempObject pop bc ret -.data_5562 +.GrassObject db $00, PAL_OW_TREE, SPRITEMOVEDATA_GRASS ; 5565 @@ -2140,6 +2140,7 @@ ShakeScreen: ; 5565 .ScreenShakeObject: db $00, PAL_OW_SILVER, SPRITEMOVEDATA_SCREENSHAKE ; 5579 + DespawnEmote: ; 5579 push bc ld a, [hMapObjectIndexBuffer] |