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

Rename map scene vars and partially document Oak's lab

Browse Source
This commit is contained in:
PikalaxALT
2019-10-18 12:49:59 -04:00
parent 9903f7a77a
commit 4f15cb02d2
89 changed files with 475 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/heal_location.c
+3 -3
View File
@@ -122,10 +122,10 @@ void SetBlackoutRespawnWarpAndHealerNpc(struct WarpData * warp)
{
u32 healLocationIdx;
if (VarGet(VAR_0x4082) == 1)
if (VarGet(VAR_MAP_SCENE_TRAINER_TOWER) == 1)
{
if (!gSaveBlock1Ptr->unkArray[gSaveBlock1Ptr->unkArrayIdx].unkA_2)
VarSet(VAR_0x4082, 0);
VarSet(VAR_MAP_SCENE_TRAINER_TOWER, 0);
gSpecialVar_LastTalked = 1;
warp->x = 4;
warp->y = 11;
@@ -159,7 +159,7 @@ void SetBlackoutRespawnWarpAndHealerNpc(struct WarpData * warp)
{
warp->x = 4;
warp->y = 11;
VarSet(VAR_0x4082, 0);
VarSet(VAR_MAP_SCENE_TRAINER_TOWER, 0);
}
else
{