dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move heal locations data to their associated map.json (#673)

Browse Source
This commit is contained in:
GriffinR
2024-10-11 15:17:18 -04:00
committed by GitHub
parent 967a1f98b4
commit bb50006fc9
54 changed files with 446 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overworld.c
+3 -3
View File
@@ -611,7 +611,7 @@ void SetWarpDestinationToHealLocation(u8 healLocationId)
{
const struct HealLocation *warp = GetHealLocation(healLocationId);
if (warp)
SetWarpDestination(warp->group, warp->map, -1, warp->x, warp->y);
SetWarpDestination(warp->mapGroup, warp->mapNum, -1, warp->x, warp->y);
}
void SetWarpDestinationToLastHealLocation(void)
@@ -628,7 +628,7 @@ void SetLastHealLocationWarp(u8 healLocationId)
{
const struct HealLocation *healLocation = GetHealLocation(healLocationId);
if (healLocation)
SetWarpData(&gSaveBlock1Ptr->lastHealLocation, healLocation->group, healLocation->map, -1, healLocation->x, healLocation->y);
SetWarpData(&gSaveBlock1Ptr->lastHealLocation, healLocation->mapGroup, healLocation->mapNum, -1, healLocation->x, healLocation->y);
}
void UpdateEscapeWarp(s16 x, s16 y)
@@ -690,7 +690,7 @@ void SetContinueGameWarpToHealLocation(u8 healLocationId)
{
const struct HealLocation *warp = GetHealLocation(healLocationId);
if (warp)
SetWarpData(&gSaveBlock1Ptr->continueGameWarp, warp->group, warp->map, -1, warp->x, warp->y);
SetWarpData(&gSaveBlock1Ptr->continueGameWarp, warp->mapGroup, warp->mapNum, -1, warp->x, warp->y);
}
void SetContinueGameWarpToDynamicWarp(int unused)