diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-21 13:25:12 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-12-21 13:25:12 -0500 |
| commit | 0f116854b2408ea7750e9c3f8da4d4ea2a3e0d38 (patch) | |
| tree | 38bb9b6d56ea6c60be2087e9ff4e76b82c6a8d1b /src/field/party_menu.c | |
| parent | 272cd213391b5ce87cb2aeac263b3eedb0f19a07 (diff) | |
| parent | 85a8e5f1ded5a0a2354916617dd0b82091a42ee0 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby into assert
Diffstat (limited to 'src/field/party_menu.c')
| -rw-r--r-- | src/field/party_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/party_menu.c b/src/field/party_menu.c index 7d21c365a..089f93f9e 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -4314,7 +4314,7 @@ void TaughtMove(u8 taskId) u16 r4; gTasks[taskId].func = TaskDummy; - sub_806E8D0(taskId, gScriptItemId, sub_808B508); + sub_806E8D0(taskId, gSpecialVar_ItemId, sub_808B508); moveIndex = sub_809FA30(); r4 = GetMonData(ewram1C000.pokemon, MON_DATA_MOVE1 + moveIndex); GetMonNickname(ewram1C000.pokemon, gStringVar1); @@ -4340,7 +4340,7 @@ void StopTryingToTeachMove_806F588(u8 taskId) if (!gPaletteFade.active) { gTasks[taskId].func = TaskDummy; - sub_806E8D0(taskId, gScriptItemId, sub_808B508); + sub_806E8D0(taskId, gSpecialVar_ItemId, sub_808B508); StringCopy(gStringVar2, gMoveNames[ewram1C000.unk8]); StringExpandPlaceholders(gStringVar4, gOtherText_StopTryingTo); sub_806E834(gStringVar4, 1); |