ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-06 03:20:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix trigger tiles at end of sideways stairs (thx spherical ice for bug report)

Browse Source
This commit is contained in:
Evan 2021-01-26 12:26:56 -07:00 committed by ghoulslash
parent 01d08d3cee
commit 7b9f308547
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scrcmd.c
View File

@ -998,6 +998,7 @@ bool8 ScrCmd_applymovement(struct ScriptContext *ctx)
u16 localId = VarGet(ScriptReadHalfword(ctx)); u16 localId = VarGet(ScriptReadHalfword(ctx));
const void *movementScript = (const void *)ScriptReadWord(ctx); const void *movementScript = (const void *)ScriptReadWord(ctx);
gObjectEvents[GetObjectEventIdByLocalId(localId)].directionOverwrite = DIR_NONE
ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript); ScriptMovement_StartObjectMovementScript(localId, gSaveBlock1Ptr->location.mapNum, gSaveBlock1Ptr->location.mapGroup, movementScript);
sMovingNpcId = localId; sMovingNpcId = localId;
return FALSE; return FALSE;
@ -1010,6 +1011,7 @@ bool8 ScrCmd_applymovement_at(struct ScriptContext *ctx)
u8 mapGroup = ScriptReadByte(ctx); u8 mapGroup = ScriptReadByte(ctx);
u8 mapNum = ScriptReadByte(ctx); u8 mapNum = ScriptReadByte(ctx);
gObjectEvents[GetObjectEventIdByLocalId(localId)].directionOverwrite = DIR_NONE
ScriptMovement_StartObjectMovementScript(localId, mapNum, mapGroup, movementScript); ScriptMovement_StartObjectMovementScript(localId, mapNum, mapGroup, movementScript);
sMovingNpcId = localId; sMovingNpcId = localId;
return FALSE; return FALSE;