summaryrefslogtreecommitdiff
path: root/src/battle_setup.c
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-11-05 14:57:02 -0700
committerYamaArashi <shadow962@live.com>2016-11-05 15:10:37 -0700
commit716476e798c19e528bfa502444118d7fb412f88d (patch)
tree7b8169062d4848ed2edd4fa98add7fff135b3909 /src/battle_setup.c
parente31301d6ea7a772df3f25b7ce60d261e0c039cc0 (diff)
script special variables
Diffstat (limited to 'src/battle_setup.c')
-rw-r--r--src/battle_setup.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 9a28b2d35..dc8564a99 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -150,7 +150,7 @@ extern struct TrainerEyeTrainer gTrainerEyeTrainers[];
extern u8 gOtherText_CancelWithTerminator[];
extern u16 gUnknown_020239F8;
-extern u16 gUnknown_0202E8DE;
+extern u16 gScriptLastTalked;
extern u8 gUnknown_02024D26;
extern u16 gBadgeFlags[];
@@ -696,7 +696,7 @@ void battle_80801F0(void)
{
if (gTrainerMapObjectLocalId)
{
- gUnknown_0202E8DE = gTrainerMapObjectLocalId;
+ gScriptLastTalked = gTrainerMapObjectLocalId;
gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(gTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
}
}
@@ -745,7 +745,7 @@ u8 *TrainerBattleConfigure(u8 *data)
void TrainerWantsBattle(u8 trainerMapObjId, u8 *trainerScript)
{
gSelectedMapObject = trainerMapObjId;
- gUnknown_0202E8DE = gMapObjects[trainerMapObjId].localId;
+ gScriptLastTalked = gMapObjects[trainerMapObjId].localId;
TrainerBattleConfigure(trainerScript + 1);
ScriptContext1_SetupScript(gUnknown_0819F80B);
ScriptContext2_Enable();