fix: ignore trainerRange on OW templates when trainerType nonzero

This commit is contained in:
Ariel A 2025-03-09 19:41:16 -04:00
parent 841d0cf251
commit f6efe480fa

View File

@ -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;