mirror of
https://github.com/pret/pokeplatinum.git
synced 2026-10-01 14:00:41 -05:00
Fix merge error
This commit is contained in:
@@ -2970,7 +2970,7 @@ static BOOL ScrCmd_ApplyMovement (ScriptContext * ctx)
|
||||
{
|
||||
u16 localID = ScriptContext_GetVar(ctx);
|
||||
u32 movementOffset = ScriptContext_ReadWord(ctx);
|
||||
LocalMapObject * object = sub_02040ED4(ctx->fieldSys, localID);
|
||||
MapObject * object = sub_02040ED4(ctx->fieldSys, localID);
|
||||
if (object == NULL) {
|
||||
GF_ASSERT(FALSE);
|
||||
return FALSE;
|
||||
|
||||
Reference in New Issue
Block a user