diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-03 07:56:05 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-03 07:56:05 -0500 |
| commit | 1c1fe276ca59726bb0008c60006c6b48cd093573 (patch) | |
| tree | 817fb9c92dd798e89a891c3924bda3df955344e0 /engine/map_setup.asm | |
| parent | 25c126c69beebfdf26d0de286e25c65f6f3db16e (diff) | |
| parent | 2faa4a0f70edd91bde908139b3fd5b6b5aebf017 (diff) | |
Merge pull request #324 from PikalaxALT/master
Movement and map objects
Diffstat (limited to 'engine/map_setup.asm')
| -rw-r--r-- | engine/map_setup.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/map_setup.asm b/engine/map_setup.asm index 8b1e3a7fe..0e391b31c 100644 --- a/engine/map_setup.asm +++ b/engine/map_setup.asm @@ -313,7 +313,7 @@ SuspendMapAnims: ; 154d3 LoadObjectsRunCallback_02: ; 154d7 ld a, $2 call RunMapCallback - callba Function2454f + callba LoadObjectMasks callba Function8177 ret ; 154ea (5:54ea) |