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 /src/pokemon/pokeblock_feed.c | |
| parent | 871ae4c283ec8bc7730df52790b5ca53baa82230 (diff) | |
| parent | 19895d28322609e6f67797bfec9851e0cb5a2182 (diff) | |
Merge pull request #497 from huderlem/script_commands
Port event script names from pokeemerald
Diffstat (limited to 'src/pokemon/pokeblock_feed.c')
| -rw-r--r-- | src/pokemon/pokeblock_feed.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pokemon/pokeblock_feed.c b/src/pokemon/pokeblock_feed.c index 389c4bb25..8e3adda12 100644 --- a/src/pokemon/pokeblock_feed.c +++ b/src/pokemon/pokeblock_feed.c @@ -645,7 +645,7 @@ static bool8 sub_8147B20(struct Pokemon* mon) ewram1FFFF++; break; case 5: - SetPokeblockFeedSpritePal(gScriptItemId); + SetPokeblockFeedSpritePal(gSpecialVar_ItemId); LoadCompressedObjectPalette(&sPokeblockFeedSpritePal); ewram1FFFF++; break; @@ -722,7 +722,7 @@ static void Task_WaitForAtePokeblockText(u8 taskID) static void Task_PrintAtePokeblockText(u8 taskID) { struct Pokemon* mon = &gPlayerParty[gPokeblockMonID]; - struct Pokeblock* pokeblock = &gSaveBlock1.pokeblocks[gScriptItemId]; + struct Pokeblock* pokeblock = &gSaveBlock1.pokeblocks[gSpecialVar_ItemId]; gPokeblockGain = PokeblockGetGain(GetNature(mon), pokeblock); GetMonNickname(mon, gStringVar1); |