diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:32:58 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:32:58 -0500 |
| commit | 65e35eb2195277214cfaecec183a2fba64e8e538 (patch) | |
| tree | c073aceff1ceba29fdb4d65767a18a07c15c7117 /src/rom6.c | |
| parent | 6675a6782f3c9be808672aa12c061f1d3f1f5d2e (diff) | |
| parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) | |
Merge branch 'master' into decompile_data
Diffstat (limited to 'src/rom6.c')
| -rw-r--r-- | src/rom6.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rom6.c b/src/rom6.c index c25f0f9f5..e71484b0a 100644 --- a/src/rom6.c +++ b/src/rom6.c @@ -13,7 +13,7 @@ #include "sprite.h" #include "task.h" -extern u16 gScriptLastTalked; +extern u16 gSpecialVar_LastTalked; extern void (*gFieldCallback)(void); extern u8 gLastFieldPokeMenuOpened; extern void (*gUnknown_03005CE4)(void); @@ -43,7 +43,7 @@ bool8 npc_before_player_of_type(u8 a) } else { - gScriptLastTalked = gMapObjects[mapObjId].localId; + gSpecialVar_LastTalked = gMapObjects[mapObjId].localId; return TRUE; } } |