diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-22 16:12:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-22 16:12:27 -0600 |
| commit | ebbe826133661d3faabc17f9167fa565b405514a (patch) | |
| tree | 52687e79258567b4d88c184b6692e035d0ff3e14 /src/decoration.c | |
| parent | 87fd6b8dc21b37b656f16e3f11832c6951328750 (diff) | |
| parent | c805bab48324f946845e1f81002035e4bdb07e62 (diff) | |
Merge pull request #437 from DizzyEggg/storage
Pokemon Storage System
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/decoration.c b/src/decoration.c index dd691721a..addca6954 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -519,7 +519,7 @@ void sub_8126B80(u8 taskId) if (!gPaletteFade.active) { - menuPos = GetMenuCursorPos(); + menuPos = Menu_GetCursorPos(); switch (Menu_ProcessInput()) { default: @@ -527,7 +527,7 @@ void sub_8126B80(u8 taskId) sSecretBasePCMenuActions[sSecretBasePCMenuCursorPos].func.void_u8(taskId); break; case -2: - sSecretBasePCMenuCursorPos = GetMenuCursorPos(); + sSecretBasePCMenuCursorPos = Menu_GetCursorPos(); if ((s8)menuPos != sSecretBasePCMenuCursorPos) { sub_8126C08(); @@ -2065,7 +2065,7 @@ u8 AddDecorationIconObjectFromIconTable(u16 tilesTag, u16 paletteTag, u8 decor) LoadSpriteSheet(&sheet); palette.data = GetDecorationIconPicOrPalette(decor, 1); palette.tag = paletteTag; - LoadCompressedObjectPalette(&palette); + LoadCompressedSpritePalette(&palette); template = malloc(sizeof(struct SpriteTemplate)); *template = gItemIconSpriteTemplate; template->tileTag = tilesTag; |