dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document decor icons

Browse Source
This commit is contained in:
GriffinR
2019-09-12 13:55:37 -04:00
committed by huderlem
parent 2884f4ee4a
commit 6c9997a906
4 changed files with 296 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/graphics.h
+87 -84
View File
@@ -3093,90 +3093,93 @@ extern const u32 gPokeblock_Gfx[];
extern const u32 gItemIcon_QuestionMark[]; extern const u32 gItemIcon_QuestionMark[];
extern const u32 gItemIconPalette_QuestionMark[]; extern const u32 gItemIconPalette_QuestionMark[];
extern const u32 gUnknown_08DB7AA0[];
extern const u32 gUnknown_08DB7B34[]; // Decorations
extern const u32 gUnknown_08DB7B5C[]; extern const u32 gDecorIcon_HeavyDesk[];
extern const u32 gUnknown_08DB7BEC[]; extern const u32 gDecorIconPalette_HeavyDesk[];
extern const u32 gUnknown_08DB7C08[]; extern const u32 gDecorIcon_RaggedDesk[];
extern const u32 gUnknown_08DB7CE8[]; extern const u32 gDecorIconPalette_RaggedDesk[];
extern const u32 gUnknown_08DB7D08[]; extern const u32 gDecorIcon_ComfortDesk[];
extern const u32 gUnknown_08DB7DCC[]; extern const u32 gDecorIconPalette_ComfortDesk[];
extern const u32 gUnknown_08DB7DF4[]; extern const u32 gDecorIcon_PrettyDesk[];
extern const u32 gUnknown_08DB7EA0[]; extern const u32 gDecorIconPalette_PrettyDesk[];
extern const u32 gUnknown_08DB7EC4[]; extern const u32 gDecorIcon_BrickDesk[];
extern const u32 gUnknown_08DB7F60[]; extern const u32 gDecorIconPalette_BrickDesk[];
extern const u32 gUnknown_08DB7F7C[]; extern const u32 gDecorIcon_CampDesk[];
extern const u32 gUnknown_08DB8070[]; extern const u32 gDecorIconPalette_CampDesk[];
extern const u32 gUnknown_08DB808C[]; extern const u32 gDecorIcon_HardDesk[];
extern const u32 gUnknown_08DB8138[]; extern const u32 gDecorIconPalette_HardDesk[];
extern const u32 gUnknown_08DB8160[]; extern const u32 gDecorIcon_RedPlant[];
extern const u32 gUnknown_08DB8218[]; extern const u32 gDecorIconPalette_RedPlant[];
extern const u32 gUnknown_08DB823C[]; extern const u32 gDecorIcon_TropicalPlant[];
extern const u32 gUnknown_08DB8300[]; extern const u32 gDecorIconPalette_TropicalPlant[];
extern const u32 gUnknown_08DB8328[]; extern const u32 gDecorIcon_PrettyFlowers[];
extern const u32 gUnknown_08DB8430[]; extern const u32 gDecorIconPalette_PrettyFlowers[];
extern const u32 gUnknown_08DB8458[]; extern const u32 gDecorIcon_ColorfulPlant[];
extern const u32 gUnknown_08DB8528[]; extern const u32 gDecorIconPalette_ColorfulPlant[];
extern const u32 gUnknown_08DB854C[]; extern const u32 gDecorIcon_BigPlant[];
extern const u32 gUnknown_08DB862C[]; extern const u32 gDecorIconPalette_BigPlant[];
extern const u32 gUnknown_08DB8654[]; extern const u32 gDecorIcon_GorgeousPlant[];
extern const u32 gUnknown_08DB86C4[]; extern const u32 gDecorIconPalette_GorgeousPlant[];
extern const u32 gUnknown_08DB86E0[]; extern const u32 gDecorIcon_RedBrick[];
extern const u32 gUnknown_08DB8750[]; extern const u32 gDecorIconPalette_RedBrick[];
extern const u32 gUnknown_08DB876C[]; extern const u32 gDecorIcon_YellowBrick[];
extern const u32 gUnknown_08DB87DC[]; extern const u32 gDecorIconPalette_YellowBrick[];
extern const u32 gUnknown_08DB87F8[]; extern const u32 gDecorIcon_BlueBrick[];
extern const u32 gUnknown_08DB88D8[]; extern const u32 gDecorIconPalette_BlueBrick[];
extern const u32 gUnknown_08DB8900[]; extern const u32 gDecorIcon_RedTent[];
extern const u32 gUnknown_08DB89E0[]; extern const u32 gDecorIconPalette_RedTent[];
extern const u32 gUnknown_08DB8A08[]; extern const u32 gDecorIcon_BlueTent[];
extern const u32 gUnknown_08DB8A68[]; extern const u32 gDecorIconPalette_BlueTent[];
extern const u32 gUnknown_08DB8A84[]; extern const u32 gDecorIcon_SolidBoard[];
extern const u32 gUnknown_08DB8B40[]; extern const u32 gDecorIconPalette_SolidBoard[];
extern const u32 gUnknown_08DB8B68[]; extern const u32 gDecorIcon_Slide[];
extern const u32 gUnknown_08DB8C40[]; extern const u32 gDecorIconPalette_Slide[];
extern const u32 gUnknown_08DB8C5C[]; extern const u32 gDecorIcon_Tire[];
extern const u32 gUnknown_08DB8CF4[]; extern const u32 gDecorIconPalette_Tire[];
extern const u32 gUnknown_08DB8D18[]; extern const u32 gDecorIcon_Stand[];
extern const u32 gUnknown_08DB8DB0[]; extern const u32 gDecorIconPalette_Stand[];
extern const u32 gUnknown_08DB8DD4[]; extern const u32 gDecorIcon_BreakableDoor[];
extern const u32 gUnknown_08DB8E80[]; extern const u32 gDecorIconPalette_BreakableDoor[];
extern const u32 gUnknown_08DB8EA0[]; extern const u32 gDecorIcon_SandOrnament[];
extern const u32 gUnknown_08DB8F58[]; extern const u32 gDecorIconPalette_SandOrnament[];
extern const u32 gUnknown_08DB8F7C[]; extern const u32 gDecorIcon_GlassOrnament[];
extern const u32 gUnknown_08DB9038[]; extern const u32 gDecorIconPalette_GlassOrnament[];
extern const u32 gUnknown_08DB9058[]; extern const u32 gDecorIcon_SurfMat[];
extern const u32 gUnknown_08DB9130[]; extern const u32 gDecorIconPalette_SurfMat[];
extern const u32 gUnknown_08DB9154[]; extern const u32 gDecorIcon_ThunderMat[];
extern const u32 gUnknown_08DB9218[]; extern const u32 gDecorIconPalette_ThunderMat[];
extern const u32 gUnknown_08DB9234[]; extern const u32 gDecorIcon_FireBlastMat[];
extern const u32 gUnknown_08DB92FC[]; extern const u32 gDecorIconPalette_FireBlastMat[];
extern const u32 gUnknown_08DB931C[]; extern const u32 gDecorIcon_PowderSnowMat[];
extern const u32 gUnknown_08DB93E8[]; extern const u32 gDecorIconPalette_PowderSnowMat[];
extern const u32 gUnknown_08DB940C[]; extern const u32 gDecorIcon_AttractMat[];
extern const u32 gUnknown_08DB94CC[]; extern const u32 gDecorIconPalette_AttractMat[];
extern const u32 gUnknown_08DB94E8[]; extern const u32 gDecorIcon_FissureMat[];
extern const u32 gUnknown_08DB95AC[]; extern const u32 gDecorIconPalette_FissureMat[];
extern const u32 gUnknown_08DB95D0[]; extern const u32 gDecorIcon_SpikesMat[];
extern const u32 gUnknown_08DB96C4[]; extern const u32 gDecorIconPalette_SpikesMat[];
extern const u32 gUnknown_08DB96EC[]; extern const u32 gDecorIcon_SnorlaxDoll[];
extern const u32 gUnknown_08DB97F4[]; extern const u32 gDecorIconPalette_SnorlaxDoll[];
extern const u32 gUnknown_08DB981C[]; extern const u32 gDecorIcon_RhydonDoll[];
extern const u32 gUnknown_08DB9908[]; extern const u32 gDecorIconPalette_RhydonDoll[];
extern const u32 gUnknown_08DB9930[]; extern const u32 gDecorIcon_LaprasDoll[];
extern const u32 gUnknown_08DB9A54[]; extern const u32 gDecorIconPalette_LaprasDoll[];
extern const u32 gUnknown_08DB9A7C[]; extern const u32 gDecorIcon_VenusaurDoll[];
extern const u32 gUnknown_08DB9B7C[]; extern const u32 gDecorIconPalette_VenusaurDoll[];
extern const u32 gUnknown_08DB9BA4[]; extern const u32 gDecorIcon_CharizardDoll[];
extern const u32 gUnknown_08DB9CB0[]; extern const u32 gDecorIconPalette_CharizardDoll[];
extern const u32 gUnknown_08DB9CD8[]; extern const u32 gDecorIcon_BlastoiseDoll[];
extern const u32 gUnknown_08DB9DAC[]; extern const u32 gDecorIconPalette_BlastoiseDoll[];
extern const u32 gUnknown_08DB9DD4[]; extern const u32 gDecorIcon_WailmerDoll[];
extern const u32 gUnknown_08DB9EE4[]; extern const u32 gDecorIconPalette_WailmerDoll[];
extern const u32 gUnknown_08DB9F08[]; extern const u32 gDecorIcon_RegirockDoll[];
extern const u32 gUnknown_08DB9FFC[]; extern const u32 gDecorIconPalette_RegirockDoll[];
extern const u32 gUnknown_08DBA020[]; extern const u32 gDecorIcon_RegiceDoll[];
extern const u32 gUnknown_08DBA12C[]; extern const u32 gDecorIconPalette_RegiceDoll[];
extern const u32 gDecorIcon_RegisteelDoll[];
extern const u32 gDecorIconPalette_RegisteelDoll[];
extern const u32 gWallclock_Gfx[]; extern const u32 gWallclock_Gfx[];
extern const u16 gWallclockMale_Pal[]; extern const u16 gWallclockMale_Pal[];
extern const u16 gWallclockFemale_Pal[]; extern const u16 gWallclockFemale_Pal[];
src/data/decoration/icon.h
+123 -122
View File
@@ -1,123 +1,124 @@
const u32 *const gUnknown_085A6BE8[][2] = { const u32 *const gDecorIconTable[][2] =
{gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, {
{NULL, NULL}, [DECOR_NONE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark},
{NULL, NULL}, [DECOR_SMALL_DESK] = {NULL, NULL},
{gUnknown_08DB7AA0, gUnknown_08DB7B34}, [DECOR_POKEMON_DESK] = {NULL, NULL},
{gUnknown_08DB7B5C, gUnknown_08DB7BEC}, [DECOR_HEAVY_DESK] = {gDecorIcon_HeavyDesk, gDecorIconPalette_HeavyDesk},
{gUnknown_08DB7C08, gUnknown_08DB7CE8}, [DECOR_RAGGED_DESK] = {gDecorIcon_RaggedDesk, gDecorIconPalette_RaggedDesk},
{gUnknown_08DB7D08, gUnknown_08DB7DCC}, [DECOR_COMFORT_DESK] = {gDecorIcon_ComfortDesk, gDecorIconPalette_ComfortDesk},
{gUnknown_08DB7DF4, gUnknown_08DB7EA0}, [DECOR_PRETTY_DESK] = {gDecorIcon_PrettyDesk, gDecorIconPalette_PrettyDesk},
{gUnknown_08DB7EC4, gUnknown_08DB7F60}, [DECOR_BRICK_DESK] = {gDecorIcon_BrickDesk, gDecorIconPalette_BrickDesk},
{gUnknown_08DB7F7C, gUnknown_08DB8070}, [DECOR_CAMP_DESK] = {gDecorIcon_CampDesk, gDecorIconPalette_CampDesk},
{NULL, NULL}, [DECOR_HARD_DESK] = {gDecorIcon_HardDesk, gDecorIconPalette_HardDesk},
{NULL, NULL}, [DECOR_SMALL_CHAIR] = {NULL, NULL},
{NULL, NULL}, [DECOR_POKEMON_CHAIR] = {NULL, NULL},
{NULL, NULL}, [DECOR_HEAVY_CHAIR] = {NULL, NULL},
{NULL, NULL}, [DECOR_PRETTY_CHAIR] = {NULL, NULL},
{NULL, NULL}, [DECOR_COMFORT_CHAIR] = {NULL, NULL},
{NULL, NULL}, [DECOR_RAGGED_CHAIR] = {NULL, NULL},
{NULL, NULL}, [DECOR_BRICK_CHAIR] = {NULL, NULL},
{NULL, NULL}, [DECOR_CAMP_CHAIR] = {NULL, NULL},
{gUnknown_08DB808C, gUnknown_08DB8138}, [DECOR_HARD_CHAIR] = {NULL, NULL},
{gUnknown_08DB8160, gUnknown_08DB8218}, [DECOR_RED_PLANT] = {gDecorIcon_RedPlant, gDecorIconPalette_RedPlant},
{gUnknown_08DB823C, gUnknown_08DB8300}, [DECOR_TROPICAL_PLANT] = {gDecorIcon_TropicalPlant, gDecorIconPalette_TropicalPlant},
{gUnknown_08DB8328, gUnknown_08DB8430}, [DECOR_PRETTY_FLOWERS] = {gDecorIcon_PrettyFlowers, gDecorIconPalette_PrettyFlowers},
{gUnknown_08DB8458, gUnknown_08DB8528}, [DECOR_COLORFUL_PLANT] = {gDecorIcon_ColorfulPlant, gDecorIconPalette_ColorfulPlant},
{gUnknown_08DB854C, gUnknown_08DB862C}, [DECOR_BIG_PLANT] = {gDecorIcon_BigPlant, gDecorIconPalette_BigPlant},
{gUnknown_08DB8654, gUnknown_08DB86C4}, [DECOR_GORGEOUS_PLANT] = {gDecorIcon_GorgeousPlant, gDecorIconPalette_GorgeousPlant},
{gUnknown_08DB86E0, gUnknown_08DB8750}, [DECOR_RED_BRICK] = {gDecorIcon_RedBrick, gDecorIconPalette_RedBrick},
{gUnknown_08DB876C, gUnknown_08DB87DC}, [DECOR_YELLOW_BRICK] = {gDecorIcon_YellowBrick, gDecorIconPalette_YellowBrick},
{NULL, NULL}, [DECOR_BLUE_BRICK] = {gDecorIcon_BlueBrick, gDecorIconPalette_BlueBrick},
{NULL, NULL}, [DECOR_RED_BALLOON] = {NULL, NULL},
{NULL, NULL}, [DECOR_BLUE_BALLOON] = {NULL, NULL},
{gUnknown_08DB87F8, gUnknown_08DB88D8}, [DECOR_YELLOW_BALLOON] = {NULL, NULL},
{gUnknown_08DB8900, gUnknown_08DB89E0}, [DECOR_RED_TENT] = {gDecorIcon_RedTent, gDecorIconPalette_RedTent},
{gUnknown_08DB8A08, gUnknown_08DB8A68}, [DECOR_BLUE_TENT] = {gDecorIcon_BlueTent, gDecorIconPalette_BlueTent},
{gUnknown_08DB8A84, gUnknown_08DB8B40}, [DECOR_SOLID_BOARD] = {gDecorIcon_SolidBoard, gDecorIconPalette_SolidBoard},
{NULL, NULL}, [DECOR_SLIDE] = {gDecorIcon_Slide, gDecorIconPalette_Slide},
{NULL, NULL}, [DECOR_FENCE_LENGTH] = {NULL, NULL},
{gUnknown_08DB8B68, gUnknown_08DB8C40}, [DECOR_FENCE_WIDTH] = {NULL, NULL},
{gUnknown_08DB8C5C, gUnknown_08DB8CF4}, [DECOR_TIRE] = {gDecorIcon_Tire, gDecorIconPalette_Tire},
{NULL, NULL}, [DECOR_STAND] = {gDecorIcon_Stand, gDecorIconPalette_Stand},
{gUnknown_08DB8D18, gUnknown_08DB8DB0}, [DECOR_MUD_BALL] = {NULL, NULL},
{gUnknown_08DB8DD4, gUnknown_08DB8E80}, [DECOR_BREAKABLE_DOOR] = {gDecorIcon_BreakableDoor, gDecorIconPalette_BreakableDoor},
{NULL, NULL}, [DECOR_SAND_ORNAMENT] = {gDecorIcon_SandOrnament, gDecorIconPalette_SandOrnament},
{NULL, NULL}, [DECOR_SILVER_SHIELD] = {NULL, NULL},
{gUnknown_08DB8EA0, gUnknown_08DB8F58}, [DECOR_GOLD_SHIELD] = {NULL, NULL},
{NULL, NULL}, [DECOR_GLASS_ORNAMENT] = {gDecorIcon_GlassOrnament, gDecorIconPalette_GlassOrnament},
{NULL, NULL}, [DECOR_TV] = {NULL, NULL},
{NULL, NULL}, [DECOR_ROUND_TV] = {NULL, NULL},
{NULL, NULL}, [DECOR_CUTE_TV] = {NULL, NULL},
{NULL, NULL}, [DECOR_GLITTER_MAT] = {NULL, NULL},
{NULL, NULL}, [DECOR_JUMP_MAT] = {NULL, NULL},
{NULL, NULL}, [DECOR_SPIN_MAT] = {NULL, NULL},
{NULL, NULL}, [DECOR_C_LOW_NOTE_MAT] = {NULL, NULL},
{NULL, NULL}, [DECOR_D_NOTE_MAT] = {NULL, NULL},
{NULL, NULL}, [DECOR_E_NOTE_MAT] = {NULL, NULL},
{NULL, NULL}, [DECOR_F_NOTE_MAT] = {NULL, NULL},
{NULL, NULL}, [DECOR_G_NOTE_MAT] = {NULL, NULL},
{NULL, NULL}, [DECOR_A_NOTE_MAT] = {NULL, NULL},
{NULL, NULL}, [DECOR_B_NOTE_MAT] = {NULL, NULL},
{gUnknown_08DB8F7C, gUnknown_08DB9038}, [DECOR_C_HIGH_NOTE_MAT] = {NULL, NULL},
{gUnknown_08DB9058, gUnknown_08DB9130}, [DECOR_SURF_MAT] = {gDecorIcon_SurfMat, gDecorIconPalette_SurfMat},
{gUnknown_08DB9154, gUnknown_08DB9218}, [DECOR_THUNDER_MAT] = {gDecorIcon_ThunderMat, gDecorIconPalette_ThunderMat},
{gUnknown_08DB9234, gUnknown_08DB92FC}, [DECOR_FIRE_BLAST_MAT] = {gDecorIcon_FireBlastMat, gDecorIconPalette_FireBlastMat},
{gUnknown_08DB931C, gUnknown_08DB93E8}, [DECOR_POWDER_SNOW_MAT] = {gDecorIcon_PowderSnowMat, gDecorIconPalette_PowderSnowMat},
{gUnknown_08DB940C, gUnknown_08DB94CC}, [DECOR_ATTRACT_MAT] = {gDecorIcon_AttractMat, gDecorIconPalette_AttractMat},
{gUnknown_08DB94E8, gUnknown_08DB95AC}, [DECOR_FISSURE_MAT] = {gDecorIcon_FissureMat, gDecorIconPalette_FissureMat},
{NULL, NULL}, [DECOR_SPIKES_MAT] = {gDecorIcon_SpikesMat, gDecorIconPalette_SpikesMat},
{NULL, NULL}, [DECOR_BALL_POSTER] = {NULL, NULL},
{NULL, NULL}, [DECOR_GREEN_POSTER] = {NULL, NULL},
{NULL, NULL}, [DECOR_RED_POSTER] = {NULL, NULL},
{NULL, NULL}, [DECOR_BLUE_POSTER] = {NULL, NULL},
{NULL, NULL}, [DECOR_CUTE_POSTER] = {NULL, NULL},
{NULL, NULL}, [DECOR_PIKA_POSTER] = {NULL, NULL},
{NULL, NULL}, [DECOR_LONG_POSTER] = {NULL, NULL},
{NULL, NULL}, [DECOR_SEA_POSTER] = {NULL, NULL},
{NULL, NULL}, [DECOR_SKY_POSTER] = {NULL, NULL},
{NULL, NULL}, [DECOR_KISS_POSTER] = {NULL, NULL},
{NULL, NULL}, [DECOR_PICHU_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_PIKACHU_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_MARILL_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_TOGEPI_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_CYNDAQUIL_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_CHIKORITA_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_TOTODILE_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_JIGGLYPUFF_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_MEOWTH_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_CLEFAIRY_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_DITTO_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_SMOOCHUM_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_TREECKO_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_TORCHIC_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_MUDKIP_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_DUSKULL_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_WYNAUT_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_BALTOY_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_KECLEON_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_AZURILL_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_SKITTY_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_SWABLU_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_GULPIN_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_LOTAD_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_SEEDOT_DOLL] = {NULL, NULL},
{NULL, NULL}, [DECOR_PIKA_CUSHION] = {NULL, NULL},
{NULL, NULL}, [DECOR_ROUND_CUSHION] = {NULL, NULL},
{NULL, NULL}, [DECOR_KISS_CUSHION] = {NULL, NULL},
{NULL, NULL}, [DECOR_ZIGZAG_CUSHION] = {NULL, NULL},
{NULL, NULL}, [DECOR_SPIN_CUSHION] = {NULL, NULL},
{NULL, NULL}, [DECOR_DIAMOND_CUSHION] = {NULL, NULL},
{NULL, NULL}, [DECOR_BALL_CUSHION] = {NULL, NULL},
{NULL, NULL}, [DECOR_GRASS_CUSHION] = {NULL, NULL},
{NULL, NULL}, [DECOR_FIRE_CUSHION] = {NULL, NULL},
{gUnknown_08DB95D0, gUnknown_08DB96C4}, [DECOR_WATER_CUSHION] = {NULL, NULL},
{gUnknown_08DB96EC, gUnknown_08DB97F4}, [DECOR_SNORLAX_DOLL] = {gDecorIcon_SnorlaxDoll, gDecorIconPalette_SnorlaxDoll},
{gUnknown_08DB981C, gUnknown_08DB9908}, [DECOR_RHYDON_DOLL] = {gDecorIcon_RhydonDoll, gDecorIconPalette_RhydonDoll},
{gUnknown_08DB9930, gUnknown_08DB9A54}, [DECOR_LAPRAS_DOLL] = {gDecorIcon_LaprasDoll, gDecorIconPalette_LaprasDoll},
{gUnknown_08DB9A7C, gUnknown_08DB9B7C}, [DECOR_VENUSAUR_DOLL] = {gDecorIcon_VenusaurDoll, gDecorIconPalette_VenusaurDoll},
{gUnknown_08DB9BA4, gUnknown_08DB9CB0}, [DECOR_CHARIZARD_DOLL] = {gDecorIcon_CharizardDoll, gDecorIconPalette_CharizardDoll},
{gUnknown_08DB9CD8, gUnknown_08DB9DAC}, [DECOR_BLASTOISE_DOLL] = {gDecorIcon_BlastoiseDoll, gDecorIconPalette_BlastoiseDoll},
{gUnknown_08DB9F08, gUnknown_08DB9FFC}, [DECOR_WAILMER_DOLL] = {gDecorIcon_WailmerDoll, gDecorIconPalette_WailmerDoll},
{gUnknown_08DB9DD4, gUnknown_08DB9EE4}, [DECOR_REGIROCK_DOLL] = {gDecorIcon_RegirockDoll, gDecorIconPalette_RegirockDoll},
{gUnknown_08DBA020, gUnknown_08DBA12C} [DECOR_REGICE_DOLL] = {gDecorIcon_RegiceDoll, gDecorIconPalette_RegiceDoll},
[DECOR_REGISTEEL_DOLL] = {gDecorIcon_RegisteelDoll, gDecorIconPalette_RegisteelDoll}
}; };
src/data/graphics/decorations.h
+84 -84
View File
@@ -1,125 +1,125 @@
const u32 gUnknown_08DB7AA0[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.4bpp.lz"); const u32 gDecorIcon_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.4bpp.lz");
const u32 gUnknown_08DB7B34[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.gbapal.lz"); const u32 gDecorIconPalette_HeavyDesk[] = INCBIN_U32("graphics/decorations/decor_heavy_desk.gbapal.lz");
const u32 gUnknown_08DB7B5C[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.4bpp.lz"); const u32 gDecorIcon_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.4bpp.lz");
const u32 gUnknown_08DB7BEC[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.gbapal.lz"); const u32 gDecorIconPalette_RaggedDesk[] = INCBIN_U32("graphics/decorations/decor_ragged_desk.gbapal.lz");
const u32 gUnknown_08DB7C08[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.4bpp.lz"); const u32 gDecorIcon_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.4bpp.lz");
const u32 gUnknown_08DB7CE8[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.gbapal.lz"); const u32 gDecorIconPalette_ComfortDesk[] = INCBIN_U32("graphics/decorations/decor_comfort_desk.gbapal.lz");
const u32 gUnknown_08DB7D08[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.4bpp.lz"); const u32 gDecorIcon_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.4bpp.lz");
const u32 gUnknown_08DB7DCC[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.gbapal.lz"); const u32 gDecorIconPalette_PrettyDesk[] = INCBIN_U32("graphics/decorations/decor_pretty_desk.gbapal.lz");
const u32 gUnknown_08DB7DF4[] = INCBIN_U32("graphics/decorations/decor_brick_desk.4bpp.lz"); const u32 gDecorIcon_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.4bpp.lz");
const u32 gUnknown_08DB7EA0[] = INCBIN_U32("graphics/decorations/decor_brick_desk.gbapal.lz"); const u32 gDecorIconPalette_BrickDesk[] = INCBIN_U32("graphics/decorations/decor_brick_desk.gbapal.lz");
const u32 gUnknown_08DB7EC4[] = INCBIN_U32("graphics/decorations/decor_camp_desk.4bpp.lz"); const u32 gDecorIcon_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.4bpp.lz");
const u32 gUnknown_08DB7F60[] = INCBIN_U32("graphics/decorations/decor_camp_desk.gbapal.lz"); const u32 gDecorIconPalette_CampDesk[] = INCBIN_U32("graphics/decorations/decor_camp_desk.gbapal.lz");
const u32 gUnknown_08DB7F7C[] = INCBIN_U32("graphics/decorations/decor_hard_desk.4bpp.lz"); const u32 gDecorIcon_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.4bpp.lz");
const u32 gUnknown_08DB8070[] = INCBIN_U32("graphics/decorations/decor_hard_desk.gbapal.lz"); const u32 gDecorIconPalette_HardDesk[] = INCBIN_U32("graphics/decorations/decor_hard_desk.gbapal.lz");
const u32 gUnknown_08DB808C[] = INCBIN_U32("graphics/decorations/decor_red_plant.4bpp.lz"); const u32 gDecorIcon_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.4bpp.lz");
const u32 gUnknown_08DB8138[] = INCBIN_U32("graphics/decorations/decor_red_plant.gbapal.lz"); const u32 gDecorIconPalette_RedPlant[] = INCBIN_U32("graphics/decorations/decor_red_plant.gbapal.lz");
const u32 gUnknown_08DB8160[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.4bpp.lz"); const u32 gDecorIcon_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.4bpp.lz");
const u32 gUnknown_08DB8218[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.gbapal.lz"); const u32 gDecorIconPalette_TropicalPlant[] = INCBIN_U32("graphics/decorations/decor_tropical_plant.gbapal.lz");
const u32 gUnknown_08DB823C[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.4bpp.lz"); const u32 gDecorIcon_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.4bpp.lz");
const u32 gUnknown_08DB8300[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.gbapal.lz"); const u32 gDecorIconPalette_PrettyFlowers[] = INCBIN_U32("graphics/decorations/decor_pretty_flowers.gbapal.lz");
const u32 gUnknown_08DB8328[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.4bpp.lz"); const u32 gDecorIcon_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.4bpp.lz");
const u32 gUnknown_08DB8430[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.gbapal.lz"); const u32 gDecorIconPalette_ColorfulPlant[] = INCBIN_U32("graphics/decorations/decor_colorful_plant.gbapal.lz");
const u32 gUnknown_08DB8458[] = INCBIN_U32("graphics/decorations/decor_big_plant.4bpp.lz"); const u32 gDecorIcon_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.4bpp.lz");
const u32 gUnknown_08DB8528[] = INCBIN_U32("graphics/decorations/decor_big_plant.gbapal.lz"); const u32 gDecorIconPalette_BigPlant[] = INCBIN_U32("graphics/decorations/decor_big_plant.gbapal.lz");
const u32 gUnknown_08DB854C[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.4bpp.lz"); const u32 gDecorIcon_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.4bpp.lz");
const u32 gUnknown_08DB862C[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.gbapal.lz"); const u32 gDecorIconPalette_GorgeousPlant[] = INCBIN_U32("graphics/decorations/decor_gorgeous_plant.gbapal.lz");
const u32 gUnknown_08DB8654[] = INCBIN_U32("graphics/decorations/decor_red_brick.4bpp.lz"); const u32 gDecorIcon_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.4bpp.lz");
const u32 gUnknown_08DB86C4[] = INCBIN_U32("graphics/decorations/decor_red_brick.gbapal.lz"); const u32 gDecorIconPalette_RedBrick[] = INCBIN_U32("graphics/decorations/decor_red_brick.gbapal.lz");
const u32 gUnknown_08DB86E0[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.4bpp.lz"); const u32 gDecorIcon_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.4bpp.lz");
const u32 gUnknown_08DB8750[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.gbapal.lz"); const u32 gDecorIconPalette_YellowBrick[] = INCBIN_U32("graphics/decorations/decor_yellow_brick.gbapal.lz");
const u32 gUnknown_08DB876C[] = INCBIN_U32("graphics/decorations/decor_blue_brick.4bpp.lz"); const u32 gDecorIcon_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.4bpp.lz");
const u32 gUnknown_08DB87DC[] = INCBIN_U32("graphics/decorations/decor_blue_brick.gbapal.lz"); const u32 gDecorIconPalette_BlueBrick[] = INCBIN_U32("graphics/decorations/decor_blue_brick.gbapal.lz");
const u32 gUnknown_08DB87F8[] = INCBIN_U32("graphics/decorations/decor_red_tent.4bpp.lz"); const u32 gDecorIcon_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.4bpp.lz");
const u32 gUnknown_08DB88D8[] = INCBIN_U32("graphics/decorations/decor_red_tent.gbapal.lz"); const u32 gDecorIconPalette_RedTent[] = INCBIN_U32("graphics/decorations/decor_red_tent.gbapal.lz");
const u32 gUnknown_08DB8900[] = INCBIN_U32("graphics/decorations/decor_blue_tent.4bpp.lz"); const u32 gDecorIcon_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.4bpp.lz");
const u32 gUnknown_08DB89E0[] = INCBIN_U32("graphics/decorations/decor_blue_tent.gbapal.lz"); const u32 gDecorIconPalette_BlueTent[] = INCBIN_U32("graphics/decorations/decor_blue_tent.gbapal.lz");
const u32 gUnknown_08DB8A08[] = INCBIN_U32("graphics/decorations/decor_solid_board.4bpp.lz"); const u32 gDecorIcon_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.4bpp.lz");
const u32 gUnknown_08DB8A68[] = INCBIN_U32("graphics/decorations/decor_solid_board.gbapal.lz"); const u32 gDecorIconPalette_SolidBoard[] = INCBIN_U32("graphics/decorations/decor_solid_board.gbapal.lz");
const u32 gUnknown_08DB8A84[] = INCBIN_U32("graphics/decorations/decor_slide.4bpp.lz"); const u32 gDecorIcon_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.4bpp.lz");
const u32 gUnknown_08DB8B40[] = INCBIN_U32("graphics/decorations/decor_slide.gbapal.lz"); const u32 gDecorIconPalette_Slide[] = INCBIN_U32("graphics/decorations/decor_slide.gbapal.lz");
const u32 gUnknown_08DB8B68[] = INCBIN_U32("graphics/decorations/decor_tire.4bpp.lz"); const u32 gDecorIcon_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.4bpp.lz");
const u32 gUnknown_08DB8C40[] = INCBIN_U32("graphics/decorations/decor_tire.gbapal.lz"); const u32 gDecorIconPalette_Tire[] = INCBIN_U32("graphics/decorations/decor_tire.gbapal.lz");
const u32 gUnknown_08DB8C5C[] = INCBIN_U32("graphics/decorations/decor_stand.4bpp.lz"); const u32 gDecorIcon_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.4bpp.lz");
const u32 gUnknown_08DB8CF4[] = INCBIN_U32("graphics/decorations/decor_stand.gbapal.lz"); const u32 gDecorIconPalette_Stand[] = INCBIN_U32("graphics/decorations/decor_stand.gbapal.lz");
const u32 gUnknown_08DB8D18[] = INCBIN_U32("graphics/decorations/decor_breakable_door.4bpp.lz"); const u32 gDecorIcon_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.4bpp.lz");
const u32 gUnknown_08DB8DB0[] = INCBIN_U32("graphics/decorations/decor_breakable_door.gbapal.lz"); const u32 gDecorIconPalette_BreakableDoor[] = INCBIN_U32("graphics/decorations/decor_breakable_door.gbapal.lz");
const u32 gUnknown_08DB8DD4[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.4bpp.lz"); const u32 gDecorIcon_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.4bpp.lz");
const u32 gUnknown_08DB8E80[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.gbapal.lz"); const u32 gDecorIconPalette_SandOrnament[] = INCBIN_U32("graphics/decorations/decor_sand_ornament.gbapal.lz");
const u32 gUnknown_08DB8EA0[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.4bpp.lz"); const u32 gDecorIcon_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.4bpp.lz");
const u32 gUnknown_08DB8F58[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.gbapal.lz"); const u32 gDecorIconPalette_GlassOrnament[] = INCBIN_U32("graphics/decorations/decor_glass_ornament.gbapal.lz");
const u32 gUnknown_08DB8F7C[] = INCBIN_U32("graphics/decorations/decor_surf_mat.4bpp.lz"); const u32 gDecorIcon_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.4bpp.lz");
const u32 gUnknown_08DB9038[] = INCBIN_U32("graphics/decorations/decor_surf_mat.gbapal.lz"); const u32 gDecorIconPalette_SurfMat[] = INCBIN_U32("graphics/decorations/decor_surf_mat.gbapal.lz");
const u32 gUnknown_08DB9058[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.4bpp.lz"); const u32 gDecorIcon_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.4bpp.lz");
const u32 gUnknown_08DB9130[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.gbapal.lz"); const u32 gDecorIconPalette_ThunderMat[] = INCBIN_U32("graphics/decorations/decor_thunder_mat.gbapal.lz");
const u32 gUnknown_08DB9154[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.4bpp.lz"); const u32 gDecorIcon_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.4bpp.lz");
const u32 gUnknown_08DB9218[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.gbapal.lz"); const u32 gDecorIconPalette_FireBlastMat[] = INCBIN_U32("graphics/decorations/decor_fire_blast_mat.gbapal.lz");
const u32 gUnknown_08DB9234[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.4bpp.lz"); const u32 gDecorIcon_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.4bpp.lz");
const u32 gUnknown_08DB92FC[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.gbapal.lz"); const u32 gDecorIconPalette_PowderSnowMat[] = INCBIN_U32("graphics/decorations/decor_powder_snow_mat.gbapal.lz");
const u32 gUnknown_08DB931C[] = INCBIN_U32("graphics/decorations/decor_attract_mat.4bpp.lz"); const u32 gDecorIcon_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.4bpp.lz");
const u32 gUnknown_08DB93E8[] = INCBIN_U32("graphics/decorations/decor_attract_mat.gbapal.lz"); const u32 gDecorIconPalette_AttractMat[] = INCBIN_U32("graphics/decorations/decor_attract_mat.gbapal.lz");
const u32 gUnknown_08DB940C[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.4bpp.lz"); const u32 gDecorIcon_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.4bpp.lz");
const u32 gUnknown_08DB94CC[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.gbapal.lz"); const u32 gDecorIconPalette_FissureMat[] = INCBIN_U32("graphics/decorations/decor_fissure_mat.gbapal.lz");
const u32 gUnknown_08DB94E8[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.4bpp.lz"); const u32 gDecorIcon_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.4bpp.lz");
const u32 gUnknown_08DB95AC[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.gbapal.lz"); const u32 gDecorIconPalette_SpikesMat[] = INCBIN_U32("graphics/decorations/decor_spikes_mat.gbapal.lz");
const u32 gUnknown_08DB95D0[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.4bpp.lz"); const u32 gDecorIcon_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.4bpp.lz");
const u32 gUnknown_08DB96C4[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.gbapal.lz"); const u32 gDecorIconPalette_SnorlaxDoll[] = INCBIN_U32("graphics/decorations/decor_snorlax_doll.gbapal.lz");
const u32 gUnknown_08DB96EC[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.4bpp.lz"); const u32 gDecorIcon_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.4bpp.lz");
const u32 gUnknown_08DB97F4[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.gbapal.lz"); const u32 gDecorIconPalette_RhydonDoll[] = INCBIN_U32("graphics/decorations/decor_rhydon_doll.gbapal.lz");
const u32 gUnknown_08DB981C[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.4bpp.lz"); const u32 gDecorIcon_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.4bpp.lz");
const u32 gUnknown_08DB9908[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.gbapal.lz"); const u32 gDecorIconPalette_LaprasDoll[] = INCBIN_U32("graphics/decorations/decor_lapras_doll.gbapal.lz");
const u32 gUnknown_08DB9930[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.4bpp.lz"); const u32 gDecorIcon_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.4bpp.lz");
const u32 gUnknown_08DB9A54[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.gbapal.lz"); const u32 gDecorIconPalette_VenusaurDoll[] = INCBIN_U32("graphics/decorations/decor_venusaur_doll.gbapal.lz");
const u32 gUnknown_08DB9A7C[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.4bpp.lz"); const u32 gDecorIcon_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.4bpp.lz");
const u32 gUnknown_08DB9B7C[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.gbapal.lz"); const u32 gDecorIconPalette_CharizardDoll[] = INCBIN_U32("graphics/decorations/decor_charizard_doll.gbapal.lz");
const u32 gUnknown_08DB9BA4[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.4bpp.lz"); const u32 gDecorIcon_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.4bpp.lz");
const u32 gUnknown_08DB9CB0[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.gbapal.lz"); const u32 gDecorIconPalette_BlastoiseDoll[] = INCBIN_U32("graphics/decorations/decor_blastoise_doll.gbapal.lz");
const u32 gUnknown_08DB9CD8[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.4bpp.lz"); const u32 gDecorIcon_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.4bpp.lz");
const u32 gUnknown_08DB9DAC[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.gbapal.lz"); const u32 gDecorIconPalette_WailmerDoll[] = INCBIN_U32("graphics/decorations/decor_wailmer_doll.gbapal.lz");
const u32 gUnknown_08DB9DD4[] = INCBIN_U32("graphics/decorations/decor_regice_doll.4bpp.lz"); const u32 gDecorIcon_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.4bpp.lz");
const u32 gUnknown_08DB9EE4[] = INCBIN_U32("graphics/decorations/decor_regice_doll.gbapal.lz"); const u32 gDecorIconPalette_RegiceDoll[] = INCBIN_U32("graphics/decorations/decor_regice_doll.gbapal.lz");
const u32 gUnknown_08DB9F08[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.4bpp.lz"); const u32 gDecorIcon_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.4bpp.lz");
const u32 gUnknown_08DB9FFC[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.gbapal.lz"); const u32 gDecorIconPalette_RegirockDoll[] = INCBIN_U32("graphics/decorations/decor_regirock_doll.gbapal.lz");
const u32 gUnknown_08DBA020[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.4bpp.lz"); const u32 gDecorIcon_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.4bpp.lz");
const u32 gUnknown_08DBA12C[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.gbapal.lz"); const u32 gDecorIconPalette_RegisteelDoll[] = INCBIN_U32("graphics/decorations/decor_registeel_doll.gbapal.lz");
src/decoration.c
+2 -2
View File
@@ -2043,7 +2043,7 @@ const u32 *GetDecorationIconPicOrPalette(u16 decor, u8 mode)
if (decor > NUM_DECORATIONS) if (decor > NUM_DECORATIONS)
decor = DECOR_NONE; decor = DECOR_NONE;
return gUnknown_085A6BE8[decor][mode]; return gDecorIconTable[decor][mode];
} }
u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor) u8 AddDecorationIconObjectFromEventObject(u16 tilesTag, u16 paletteTag, u8 decor)
@@ -2095,7 +2095,7 @@ u8 AddDecorationIconObject(u8 decor, s16 x, s16 y, u8 priority, u16 tilesTag, u1
gSprites[spriteId].pos2.x = x + 4; gSprites[spriteId].pos2.x = x + 4;
gSprites[spriteId].pos2.y = y + 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); spriteId = AddDecorationIconObjectFromEventObject(tilesTag, paletteTag, decor);
if (spriteId == MAX_SPRITES) if (spriteId == MAX_SPRITES)