diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 13:53:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 13:53:31 -0500 |
| commit | 058d30fe806f4fd512ec6708bc68f54d6d98e356 (patch) | |
| tree | bf9d1569a453a085493a8cbb2efad390562cba63 /src/heal_location.c | |
| parent | a1ea8cc82958679baee1c65acc30069d051463c6 (diff) | |
| parent | 13357596b7ed70246a00d438ee37dc1c84b78415 (diff) | |
Merge branch 'master' into doc-routes1
Diffstat (limited to 'src/heal_location.c')
| -rw-r--r-- | src/heal_location.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/heal_location.c b/src/heal_location.c index 89d9478c0..5c31e2df3 100644 --- a/src/heal_location.c +++ b/src/heal_location.c @@ -124,13 +124,13 @@ void SetBlackoutRespawnWarpAndHealerNpc(struct WarpData * warp) if (VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 1) { - if (!gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2) + if (!gSaveBlock1Ptr->trainerTower[gSaveBlock1Ptr->towerChallengeId].spokeToOwner) VarSet(VAR_MAP_SCENE_TRAINER_TOWER, 0); gSpecialVar_LastTalked = 1; warp->x = 4; warp->y = 11; - warp->mapGroup = MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_LOBBY); - warp->mapNum = MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY); + warp->mapGroup = MAP_GROUP(TRAINER_TOWER_LOBBY); + warp->mapNum = MAP_NUM(TRAINER_TOWER_LOBBY); warp->warpId = 0xFF; } else @@ -155,7 +155,7 @@ void SetBlackoutRespawnWarpAndHealerNpc(struct WarpData * warp) warp->x = 5; warp->y = 4; } - else if (sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(SEVEN_ISLAND_TRAINER_TOWER_LOBBY) && sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(SEVEN_ISLAND_TRAINER_TOWER_LOBBY)) + else if (sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][0] == MAP_GROUP(TRAINER_TOWER_LOBBY) && sBlackoutRespawnHealCenterMapIdxs[healLocationIdx - 1][1] == MAP_NUM(TRAINER_TOWER_LOBBY)) { warp->x = 4; warp->y = 11; |