dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix defines in MAP_NUM and MAP_GROUP

Browse Source
This commit is contained in:
Bassoonian
2024-08-14 13:02:40 +02:00
parent a3d5f54b75
commit 5fefd743a2
34 changed files with 452 additions and 451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_control_avatar.c
+2 -2
View File
@@ -814,7 +814,7 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi
warpEvent = &gMapHeader.events->warps[warpEventId];
}
if (warpEvent->mapNum == MAP_NUM(DYNAMIC))
if (warpEvent->mapNum == MAP_NUM(MAP_DYNAMIC))
{
SetWarpDestinationToDynamicWarp(warpEvent->warpId);
}
@@ -825,7 +825,7 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi
SetWarpDestinationToMapWarp(warpEvent->mapGroup, warpEvent->mapNum, warpEvent->warpId);
UpdateEscapeWarp(position->x, position->y);
mapHeader = Overworld_GetMapHeaderByGroupAndId(warpEvent->mapGroup, warpEvent->mapNum);
if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(DYNAMIC))
if (mapHeader->events->warps[warpEvent->warpId].mapNum == MAP_NUM(MAP_DYNAMIC))
SetDynamicWarp(mapHeader->events->warps[warpEventId].warpId, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, warpEventId);
}
}