diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:59:37 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 11:59:37 -0600 |
| commit | 85a8e5f1ded5a0a2354916617dd0b82091a42ee0 (patch) | |
| tree | 9d04e3c1d115d496af910f2a1714e6e3fe82d77b /include | |
| parent | 871ae4c283ec8bc7730df52790b5ca53baa82230 (diff) | |
| parent | 19895d28322609e6f67797bfec9851e0cb5a2182 (diff) | |
Merge pull request #497 from huderlem/script_commands
Port event script names from pokeemerald
Diffstat (limited to 'include')
| -rw-r--r-- | include/event_data.h | 6 | ||||
| -rw-r--r-- | include/item_use.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/event_data.h b/include/event_data.h index 80c6b9478..5656ab8dc 100644 --- a/include/event_data.h +++ b/include/event_data.h @@ -37,8 +37,8 @@ extern u16 gSpecialVar_0x8008; extern u16 gSpecialVar_0x8009; extern u16 gSpecialVar_0x800A; extern u16 gSpecialVar_0x800B; -extern u16 gScriptResult; -extern u16 gScriptLastTalked; -extern u16 gScriptFacing; +extern u16 gSpecialVar_Result; +extern u16 gSpecialVar_LastTalked; +extern u16 gSpecialVar_Facing; #endif // GUARD_EVENT_DATA_H diff --git a/include/item_use.h b/include/item_use.h index 227c0c9ee..ee7939824 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -1,7 +1,7 @@ #ifndef GUARD_ITEM_USE_H #define GUARD_ITEM_USE_H -extern u16 gScriptItemId; +extern u16 gSpecialVar_ItemId; void ItemUseOutOfBattle_Mail(u8); void ItemUseOutOfBattle_Bike(u8); |