diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
| commit | 4aa1b44315ee26fa60015a99ccd51f900e5597fd (patch) | |
| tree | fdcac19f28b2e4febd96a895e72fce122b9e3b15 /src/item_use.c | |
| parent | ad7a7222a538380b446f9aecde44c5222ff3b68a (diff) | |
| parent | e39f55f55080108ced3ff5cb16b2181d7fec9d92 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/item_use.c')
| -rw-r--r-- | src/item_use.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/item_use.c b/src/item_use.c index a92161e9a..b906f91ad 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -50,7 +50,6 @@ extern u8 gUnknown_081A168F[]; extern u16 gBattlePartyID[]; -extern u16 gScriptItemId; extern u16 gBattleTypeFlags; static const u8 gSSTidalBetaString[] = _("この チケットで ふねに のりほうだい\nはやく のってみたいな"); |