Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6

This commit is contained in:
GriffinR committed 2025-05-14 11:50:11 -04:00
commit 929bc8b990
276 files changed
+11759 -11089

No files matched your search

+2
View File
@@ -437,7 +437,9 @@ static const struct DoorGraphics *GetDoorGraphics(const struct DoorGraphics *gfx
static s8 StartDoorAnimationTask(const struct DoorGraphics *gfx, const struct DoorAnimFrame *frames, u32 x, u32 y)
{
if (FuncIsActiveTask(Task_AnimateDoor) == TRUE)
{
return -1;
}
else
{
u8 taskId = CreateTask(Task_AnimateDoor, 0x50);