diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:40:26 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:40:37 -0600 |
| commit | 754e911b4e95205bafa5dc93242da9cee3f2c5c6 (patch) | |
| tree | e544ba9723182224bf99c4fc144654517037296e /src/pokemon/pokeblock_feed.c | |
| parent | a753c44277c050fb24aaf97a8947c7f54e0dacd7 (diff) | |
Rename gScript* vars to gSpecialVar_*
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); |