revert merge coz its bugged

1 files changed, 0 insertions, 252 deletions

diff --git a/data/graphics/decorations/decoration_graphics.inc b/data/graphics/decorations/decoration_graphics.inc
deleted file mode 100644
index c7ea9be70..000000000
--- a/data/graphics/decorations/decoration_graphics.inc
+++ /dev/null
@@ -1,252 +0,0 @@
-gUnknown_08DB7AA0::
-	.incbin "graphics/decorations/decor_heavy_desk.4bpp.lz"
-
-gUnknown_08DB7B34::
-	.incbin "graphics/decorations/decor_heavy_desk.gbapal.lz"
-
-gUnknown_08DB7B5C::
-	.incbin "graphics/decorations/decor_ragged_desk.4bpp.lz"
-
-gUnknown_08DB7BEC::
-	.incbin "graphics/decorations/decor_ragged_desk.gbapal.lz"
-
-gUnknown_08DB7C08::
-	.incbin "graphics/decorations/decor_comfort_desk.4bpp.lz"
-
-gUnknown_08DB7CE8::
-	.incbin "graphics/decorations/decor_comfort_desk.gbapal.lz"
-
-gUnknown_08DB7D08::
-	.incbin "graphics/decorations/decor_pretty_desk.4bpp.lz"
-
-gUnknown_08DB7DCC::
-	.incbin "graphics/decorations/decor_pretty_desk.gbapal.lz"
-
-gUnknown_08DB7DF4::
-	.incbin "graphics/decorations/decor_brick_desk.4bpp.lz"
-
-gUnknown_08DB7EA0::
-	.incbin "graphics/decorations/decor_brick_desk.gbapal.lz"
-
-gUnknown_08DB7EC4::
-	.incbin "graphics/decorations/decor_camp_desk.4bpp.lz"
-
-gUnknown_08DB7F60::
-	.incbin "graphics/decorations/decor_camp_desk.gbapal.lz"
-
-gUnknown_08DB7F7C::
-	.incbin "graphics/decorations/decor_hard_desk.4bpp.lz"
-
-gUnknown_08DB8070::
-	.incbin "graphics/decorations/decor_hard_desk.gbapal.lz"
-
-gUnknown_08DB808C::
-	.incbin "graphics/decorations/decor_red_plant.4bpp.lz"
-
-gUnknown_08DB8138::
-	.incbin "graphics/decorations/decor_red_plant.gbapal.lz"
-
-gUnknown_08DB8160::
-	.incbin "graphics/decorations/decor_tropical_plant.4bpp.lz"
-
-gUnknown_08DB8218::
-	.incbin "graphics/decorations/decor_tropical_plant.gbapal.lz"
-
-gUnknown_08DB823C::
-	.incbin "graphics/decorations/decor_pretty_flowers.4bpp.lz"
-
-gUnknown_08DB8300::
-	.incbin "graphics/decorations/decor_pretty_flowers.gbapal.lz"
-
-gUnknown_08DB8328::
-	.incbin "graphics/decorations/decor_colorful_plant.4bpp.lz"
-
-gUnknown_08DB8430::
-	.incbin "graphics/decorations/decor_colorful_plant.gbapal.lz"
-
-gUnknown_08DB8458::
-	.incbin "graphics/decorations/decor_big_plant.4bpp.lz"
-
-gUnknown_08DB8528::
-	.incbin "graphics/decorations/decor_big_plant.gbapal.lz"
-
-gUnknown_08DB854C::
-	.incbin "graphics/decorations/decor_gorgeous_plant.4bpp.lz"
-
-gUnknown_08DB862C::
-	.incbin "graphics/decorations/decor_gorgeous_plant.gbapal.lz"
-
-gUnknown_08DB8654::
-	.incbin "graphics/decorations/decor_red_brick.4bpp.lz"
-
-gUnknown_08DB86C4::
-	.incbin "graphics/decorations/decor_red_brick.gbapal.lz"
-
-gUnknown_08DB86E0::
-	.incbin "graphics/decorations/decor_yellow_brick.4bpp.lz"
-
-gUnknown_08DB8750::
-	.incbin "graphics/decorations/decor_yellow_brick.gbapal.lz"
-
-gUnknown_08DB876C::
-	.incbin "graphics/decorations/decor_blue_brick.4bpp.lz"
-
-gUnknown_08DB87DC::
-	.incbin "graphics/decorations/decor_blue_brick.gbapal.lz"
-
-gUnknown_08DB87F8::
-	.incbin "graphics/decorations/decor_red_tent.4bpp.lz"
-
-gUnknown_08DB88D8::
-	.incbin "graphics/decorations/decor_red_tent.gbapal.lz"
-
-gUnknown_08DB8900::
-	.incbin "graphics/decorations/decor_blue_tent.4bpp.lz"
-
-gUnknown_08DB89E0::
-	.incbin "graphics/decorations/decor_blue_tent.gbapal.lz"
-
-gUnknown_08DB8A08::
-	.incbin "graphics/decorations/decor_solid_board.4bpp.lz"
-
-gUnknown_08DB8A68::
-	.incbin "graphics/decorations/decor_solid_board.gbapal.lz"
-
-gUnknown_08DB8A84::
-	.incbin "graphics/decorations/decor_slide.4bpp.lz"
-
-gUnknown_08DB8B40::
-	.incbin "graphics/decorations/decor_slide.gbapal.lz"
-
-gUnknown_08DB8B68::
-	.incbin "graphics/decorations/decor_tire.4bpp.lz"
-
-gUnknown_08DB8C40::
-	.incbin "graphics/decorations/decor_tire.gbapal.lz"
-
-gUnknown_08DB8C5C::
-	.incbin "graphics/decorations/decor_stand.4bpp.lz"
-
-gUnknown_08DB8CF4::
-	.incbin "graphics/decorations/decor_stand.gbapal.lz"
-
-gUnknown_08DB8D18::
-	.incbin "graphics/decorations/decor_breakable_door.4bpp.lz"
-
-gUnknown_08DB8DB0::
-	.incbin "graphics/decorations/decor_breakable_door.gbapal.lz"
-
-gUnknown_08DB8DD4::
-	.incbin "graphics/decorations/decor_sand_ornament.4bpp.lz"
-
-gUnknown_08DB8E80::
-	.incbin "graphics/decorations/decor_sand_ornament.gbapal.lz"
-
-gUnknown_08DB8EA0::
-	.incbin "graphics/decorations/decor_glass_ornament.4bpp.lz"
-
-gUnknown_08DB8F58::
-	.incbin "graphics/decorations/decor_glass_ornament.gbapal.lz"
-
-gUnknown_08DB8F7C::
-	.incbin "graphics/decorations/decor_surf_mat.4bpp.lz"
-
-gUnknown_08DB9038::
-	.incbin "graphics/decorations/decor_surf_mat.gbapal.lz"
-
-gUnknown_08DB9058::
-	.incbin "graphics/decorations/decor_thunder_mat.4bpp.lz"
-
-gUnknown_08DB9130::
-	.incbin "graphics/decorations/decor_thunder_mat.gbapal.lz"
-
-gUnknown_08DB9154::
-	.incbin "graphics/decorations/decor_fire_blast_mat.4bpp.lz"
-
-gUnknown_08DB9218::
-	.incbin "graphics/decorations/decor_fire_blast_mat.gbapal.lz"
-
-gUnknown_08DB9234::
-	.incbin "graphics/decorations/decor_powder_snow_mat.4bpp.lz"
-
-gUnknown_08DB92FC::
-	.incbin "graphics/decorations/decor_powder_snow_mat.gbapal.lz"
-
-gUnknown_08DB931C::
-	.incbin "graphics/decorations/decor_attract_mat.4bpp.lz"
-
-gUnknown_08DB93E8::
-	.incbin "graphics/decorations/decor_attract_mat.gbapal.lz"
-
-gUnknown_08DB940C::
-	.incbin "graphics/decorations/decor_fissure_mat.4bpp.lz"
-
-gUnknown_08DB94CC::
-	.incbin "graphics/decorations/decor_fissure_mat.gbapal.lz"
-
-gUnknown_08DB94E8::
-	.incbin "graphics/decorations/decor_spikes_mat.4bpp.lz"
-
-gUnknown_08DB95AC::
-	.incbin "graphics/decorations/decor_spikes_mat.gbapal.lz"
-
-gUnknown_08DB95D0::
-	.incbin "graphics/decorations/decor_snorlax_doll.4bpp.lz"
-
-gUnknown_08DB96C4::
-	.incbin "graphics/decorations/decor_snorlax_doll.gbapal.lz"
-
-gUnknown_08DB96EC::
-	.incbin "graphics/decorations/decor_rhydon_doll.4bpp.lz"
-
-gUnknown_08DB97F4::
-	.incbin "graphics/decorations/decor_rhydon_doll.gbapal.lz"
-
-gUnknown_08DB981C::
-	.incbin "graphics/decorations/decor_lapras_doll.4bpp.lz"
-
-gUnknown_08DB9908::
-	.incbin "graphics/decorations/decor_lapras_doll.gbapal.lz"
-
-gUnknown_08DB9930::
-	.incbin "graphics/decorations/decor_venusaur_doll.4bpp.lz"
-
-gUnknown_08DB9A54::
-	.incbin "graphics/decorations/decor_venusaur_doll.gbapal.lz"
-
-gUnknown_08DB9A7C::
-	.incbin "graphics/decorations/decor_charizard_doll.4bpp.lz"
-
-gUnknown_08DB9B7C::
-	.incbin "graphics/decorations/decor_charizard_doll.gbapal.lz"
-
-gUnknown_08DB9BA4::
-	.incbin "graphics/decorations/decor_blastoise_doll.4bpp.lz"
-
-gUnknown_08DB9CB0::
-	.incbin "graphics/decorations/decor_blastoise_doll.gbapal.lz"
-
-gUnknown_08DB9CD8::
-	.incbin "graphics/decorations/decor_wailmer_doll.4bpp.lz"
-
-gUnknown_08DB9DAC::
-	.incbin "graphics/decorations/decor_wailmer_doll.gbapal.lz"
-
-gUnknown_08DB9DD4::
-	.incbin "graphics/decorations/decor_regice_doll.4bpp.lz"
-
-gUnknown_08DB9EE4::
-	.incbin "graphics/decorations/decor_regice_doll.gbapal.lz"
-
-gUnknown_08DB9F08::
-	.incbin "graphics/decorations/decor_regirock_doll.4bpp.lz"
-
-gUnknown_08DB9FFC::
-	.incbin "graphics/decorations/decor_regirock_doll.gbapal.lz"
-
-gUnknown_08DBA020::
-	.incbin "graphics/decorations/decor_registeel_doll.4bpp.lz"
-
-gUnknown_08DBA12C::
-	.incbin "graphics/decorations/decor_registeel_doll.gbapal.lz"
-