From f6efe480fa4363eacf59538e6e68ec34fa6f6a1d Mon Sep 17 00:00:00 2001
From: Ariel A <24759293+aarant@users.noreply.github.com>
Date: Sun, 9 Mar 2025 19:41:16 -0400
Subject: [PATCH] fix: ignore trainerRange on OW templates when trainerType
 nonzero

---
 src/event_object_movement.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index f63624e135..be4c5abfd8 100644
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1738,7 +1738,7 @@ static u16 PackGraphicsId(const struct ObjectEventTemplate *template) {
         if (template->script && template->script[0] == 0x7d) {
             form = T1_READ_16(&template->script[2]);
             form = (form >> 10) & 0x1F;
-        } else if (template->trainerRange_berryTreeId) {
+        } else if (template->trainerRange_berryTreeId && !template->trainerType) {
             form = template->trainerRange_berryTreeId & 0x1F;
         }
         graphicsId |= form << OBJ_EVENT_GFX_SPECIES_BITS;