diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2019-09-17 00:10:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 00:10:23 -0400 |
| commit | 945d3d3a27f6e5005e5481bb2ad36f1a2a220d3d (patch) | |
| tree | 7dc8f5a21c6bb7640aad82de03a314b0e919f3b2 /src/decoration.c | |
| parent | f4160ded9897f65e5ee7fa7050d195dfaa5bf5b2 (diff) | |
| parent | 06af24bce58b9285166d27fc371ad3c3dbb63a29 (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/decoration.c b/src/decoration.c index 94c1f40f4..cb371b300 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -2044,7 +2044,7 @@ const u32 *GetDecorationIconPicOrPalette(u16 decor, u8 mode) if (decor > NUM_DECORATIONS) decor = DECOR_NONE; - return gUnknown_085A6BE8[decor][mode]; + return gDecorIconTable[decor][mode]; } u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor) @@ -2096,7 +2096,7 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1 gSprites[spriteId].pos2.x = x + 4; gSprites[spriteId].pos2.y = y + 4; } - else if (gUnknown_085A6BE8[decor][0] == NULL) + else if (gDecorIconTable[decor][0] == NULL) { spriteId = AddDecorationIconObjectFromEventObject(tilesTag, paletteTag, decor); if (spriteId == MAX_SPRITES) |