From 881e54a52b965c87359774f80a516358f2001ecc Mon Sep 17 00:00:00 2001 From: pkmnsnfrn Date: Mon, 12 Aug 2024 06:51:09 -0700 Subject: [PATCH] Incremental improvement of getobjectfacing --- asm/macros/event.inc | 3 ++- src/event_object_movement.c | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/asm/macros/event.inc b/asm/macros/event.inc index 399ad6104f..9321f5b8c5 100644 --- a/asm/macros/event.inc +++ b/asm/macros/event.inc @@ -2408,6 +2408,7 @@ @ Gets the facing direction of a given event object and stores it in the variable \dest. .macro getobjectfacingdirection evObjId:req, dest:req - setvar VAR_TEMP_1, \evObjId + setvar VAR_0x8005, \evObjId specialvar \dest, Script_GetObjectFacingDirection .endm + diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 7facbab5c9..4105aa42a5 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -10633,9 +10633,8 @@ void GetDaycareGraphics(struct ScriptContext *ctx) gSpecialVar_Result = i; } -u8 Script_GetObjectFacingDirection(void) +u32 Script_GetObjectFacingDirection(void) { - u8 objId = GetObjectEventIdByLocalId(VarGet(VAR_TEMP_1)); - return gObjectEvents[objId].facingDirection; + return gObjectEvents[GetObjectEventIdByLocalId(gSpecialVar_0x8005)].facingDirection; }