diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:39:13 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:39:13 -0500 |
| commit | 73c16c109cdb996fa59f5aa63e9f030c21cbe54f (patch) | |
| tree | b0b4b7eefc77441d711105cf036b273f22ce2ec2 /src/field/event_data.c | |
| parent | 56bf99fd9106b3cc8fac45cc051cbeeec40e34aa (diff) | |
| parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/field/event_data.c')
| -rw-r--r-- | src/field/event_data.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/event_data.c b/src/field/event_data.c index 3b3ac7bca..587da8138 100644 --- a/src/field/event_data.c +++ b/src/field/event_data.c @@ -18,9 +18,9 @@ EWRAM_DATA u16 gSpecialVar_0x8008 = 0; EWRAM_DATA u16 gSpecialVar_0x8009 = 0; EWRAM_DATA u16 gSpecialVar_0x800A = 0; EWRAM_DATA u16 gSpecialVar_0x800B = 0; -EWRAM_DATA u16 gScriptResult = 0; -EWRAM_DATA u16 gScriptLastTalked = 0; -EWRAM_DATA u16 gScriptFacing = 0; +EWRAM_DATA u16 gSpecialVar_Result = 0; +EWRAM_DATA u16 gSpecialVar_LastTalked = 0; +EWRAM_DATA u16 gSpecialVar_Facing = 0; EWRAM_DATA u8 gUnknown_0202E8E2[16] = {0}; extern u16 *gSpecialVars[]; |