diff options
| author | SatoMew <SatoMew@users.noreply.github.com> | 2020-08-29 00:17:28 +0100 |
|---|---|---|
| committer | SatoMew <SatoMew@users.noreply.github.com> | 2020-08-29 00:17:28 +0100 |
| commit | 2bf30e571aa8d7268250a845784098df4c30f531 (patch) | |
| tree | 2378ea3077fe12b6eb3eb33c4e281a405c45dc97 /home/map_objects.asm | |
| parent | e4f053e312b7cce44e2b4e9b8449f3e724dda0bc (diff) | |
| parent | e9e60965a8ebe4939eb226832e21449c188d8e46 (diff) | |
Resolved conflict caused by my changes.
Diffstat (limited to 'home/map_objects.asm')
| -rw-r--r-- | home/map_objects.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/home/map_objects.asm b/home/map_objects.asm index 69bd60b..1362c84 100644 --- a/home/map_objects.asm +++ b/home/map_objects.asm @@ -685,4 +685,4 @@ SetObjectFacing:: ; 19C0 ld hl, OBJECT_DIRECTION_WALKING add hl, bc ld [hl], a - ret
\ No newline at end of file + ret |