diff options
| author | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
|---|---|---|
| committer | Cameron Hall <cameronghall@cox.net> | 2018-01-21 13:53:32 -0600 |
| commit | 11a9371349e1743a18dce28cc60b69dd6a29b665 (patch) | |
| tree | e696d1fda7556af8b5234eae833ea2fd146fc75d /src/engine/sprite.c | |
| parent | 7383117626ebb2b3d993e5ad8855da5752c9cce8 (diff) | |
| parent | 68a402883f780a61f54c2f0c8740429d0b2b3a81 (diff) | |
resolve merge conflicts and make it compile
Diffstat (limited to 'src/engine/sprite.c')
| -rw-r--r-- | src/engine/sprite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/sprite.c b/src/engine/sprite.c index eaffedfdc..df8c66750 100644 --- a/src/engine/sprite.c +++ b/src/engine/sprite.c @@ -827,7 +827,7 @@ void ProcessSpriteCopyRequests(void) #if DEBUG else { - unref_sub_80AB084(sDmaOverErrorMsg); + Crash(sDmaOverErrorMsg); } #endif } @@ -844,7 +844,7 @@ void RequestSpriteCopy(const void *src, u8 *dest, u16 size) #if DEBUG else { - unref_sub_80AB084(sDmaOverErrorMsg); + Crash(sDmaOverErrorMsg); } #endif } |