diff --git a/graphics/item_pc/unk_8E85458.bin b/graphics/item_pc/bg.bin
similarity index 100%
rename from graphics/item_pc/unk_8E85458.bin
rename to graphics/item_pc/bg.bin
diff --git a/graphics/item_pc/unk_8E85408.pal b/graphics/item_pc/bg.pal
similarity index 100%
rename from graphics/item_pc/unk_8E85408.pal
rename to graphics/item_pc/bg.pal
diff --git a/graphics/item_pc/bg.png b/graphics/item_pc/bg.png
new file mode 100644
index 000000000..4db6a6bcb
Binary files /dev/null and b/graphics/item_pc/bg.png differ
diff --git a/graphics/item_pc/unk_8E85090.png b/graphics/item_pc/unk_8E85090.png
deleted file mode 100644
index 6c6748683..000000000
Binary files a/graphics/item_pc/unk_8E85090.png and /dev/null differ
diff --git a/graphics/ss_anne/smoke.png b/graphics/ss_anne/smoke.png
new file mode 100644
index 000000000..556024787
Binary files /dev/null and b/graphics/ss_anne/smoke.png differ
diff --git a/graphics/ss_anne/unk_8479838.png b/graphics/ss_anne/unk_8479838.png
deleted file mode 100644
index e7d0d8c44..000000000
Binary files a/graphics/ss_anne/unk_8479838.png and /dev/null differ
diff --git a/graphics/ss_anne/unk_8479A38.png b/graphics/ss_anne/unk_8479A38.png
deleted file mode 100644
index 98fbc8d97..000000000
Binary files a/graphics/ss_anne/unk_8479A38.png and /dev/null differ
diff --git a/graphics/ss_anne/wake.png b/graphics/ss_anne/wake.png
new file mode 100644
index 000000000..b7ce6763f
Binary files /dev/null and b/graphics/ss_anne/wake.png differ
diff --git a/graphics/teachy_tv/tiles.png b/graphics/teachy_tv/tiles.png
index e867de82b..fdf32ca30 100644
Binary files a/graphics/teachy_tv/tiles.png and b/graphics/teachy_tv/tiles.png differ
diff --git a/graphics/tm_case/unk_8E84D90.png b/graphics/tm_case/disc.png
similarity index 100%
rename from graphics/tm_case/unk_8E84D90.png
rename to graphics/tm_case/disc.png
diff --git a/graphics/tm_case/unk_8E84F20.pal b/graphics/tm_case/disc_types_1.pal
similarity index 100%
rename from graphics/tm_case/unk_8E84F20.pal
rename to graphics/tm_case/disc_types_1.pal
diff --git a/graphics/tm_case/unk_8E85068.pal b/graphics/tm_case/disc_types_2.pal
similarity index 100%
rename from graphics/tm_case/unk_8E85068.pal
rename to graphics/tm_case/disc_types_2.pal
diff --git a/graphics/tm_case/unk_8E99118.png b/graphics/tm_case/hm.png
similarity index 100%
rename from graphics/tm_case/unk_8E99118.png
rename to graphics/tm_case/hm.png
diff --git a/graphics/tm_case/unk_8E84A24.bin b/graphics/tm_case/menu.bin
similarity index 100%
rename from graphics/tm_case/unk_8E84A24.bin
rename to graphics/tm_case/menu.bin
diff --git a/graphics/tm_case/unk_8E84D20.pal b/graphics/tm_case/menu_female.pal
similarity index 100%
rename from graphics/tm_case/unk_8E84D20.pal
rename to graphics/tm_case/menu_female.pal
diff --git a/graphics/tm_case/unk_8E84CB0.pal b/graphics/tm_case/menu_male.pal
similarity index 100%
rename from graphics/tm_case/unk_8E84CB0.pal
rename to graphics/tm_case/menu_male.pal
diff --git a/graphics/tm_case/unk_8E84B70.bin b/graphics/tm_case/tm_case.bin
similarity index 100%
rename from graphics/tm_case/unk_8E84B70.bin
rename to graphics/tm_case/tm_case.bin
diff --git a/graphics/tm_case/tm_case.png b/graphics/tm_case/tm_case.png
new file mode 100644
index 000000000..ce013967e
Binary files /dev/null and b/graphics/tm_case/tm_case.png differ
diff --git a/graphics/tm_case/unk_8E845D8.png b/graphics/tm_case/unk_8E845D8.png
deleted file mode 100644
index 2729ac568..000000000
Binary files a/graphics/tm_case/unk_8E845D8.png and /dev/null differ
diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index 0aa81586d..d9ac26cfa 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -100,13 +100,13 @@ graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
 	$(GFX) $< $@ -num_colors 224
 
 graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 63
+	$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
 
 $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 29
+	$(GFX) $< $@ -num_tiles 29 -Wnum_tiles
 
 $(MISCGFXDIR)/markings2.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 25
+	$(GFX) $< $@ -num_tiles 25 -Wnum_tiles
 
 $(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \
 						$(INTERFACEGFXDIR)/menu_1.gbapal
@@ -150,13 +150,13 @@ $(UNUSEDGFXDIR)/redyellowgreen_frame.bin: $(UNUSEDGFXDIR)/red_frame.bin \
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/color_frames.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 353
+	$(GFX) $< $@ -num_tiles 353 -Wnum_tiles
 
 $(BATINTGFXDIR)/unused_window2bar.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 5
+	$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
 
 $(BATINTGFXDIR)/level_up_banner.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 36
+	$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
 
 $(BATINTGFXDIR)/window.gbapal: $(BATINTGFXDIR)/window1.gbapal $(BATINTGFXDIR)/window2.gbapal
 	cat $^ > $@
@@ -175,7 +175,7 @@ $(UNUSEDGFXDIR)/old_contest_2.4bpp: $(UNUSEDGFXDIR)/old_contest_2_1.4bpp \
 	@cat $^ >$@
 
 $(UNKNOWNGFXDIR)/unknown_D196E4.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 36
+	$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
 
 $(BTLANMSPRGFXDIR)/ice_crystals.4bpp: $(BTLANMSPRGFXDIR)/ice_crystals_0.4bpp \
 						  $(BTLANMSPRGFXDIR)/ice_crystals_1.4bpp \
@@ -197,13 +197,13 @@ $(BTLANMSPRGFXDIR)/spark.4bpp: $(BTLANMSPRGFXDIR)/spark_0.4bpp \
 	@cat $^ >$@
 
 $(MASKSGFXDIR)/unknown_D2EC24.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 14
+	$(GFX) $< $@ -num_tiles 14 -Wnum_tiles
 
 $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 16
+	$(GFX) $< $@ -num_tiles 16 -Wnum_tiles
 
 $(INTERFACEGFXDIR)/party_menu_misc.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 62
+	$(GFX) $< $@ -num_tiles 62 -Wnum_tiles
 
 $(TYPESGFXDIR)/move_types.4bpp: $(types:%=$(TYPESGFXDIR)/%.4bpp) $(contest_types:%=$(TYPESGFXDIR)/contest_%.4bpp)
 	@cat $^ >$@
@@ -214,29 +214,29 @@ $(TYPESGFXDIR)/move_types.gbapal: $(TYPESGFXDIR)/move_types_1.gbapal \
 	@cat $^ >$@
 
 $(INTERFACEGFXDIR)/bag_screen.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/rayquaza.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 227
+	$(GFX) $< $@ -num_tiles 227 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/overcast.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 313
+	$(GFX) $< $@ -num_tiles 313 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/rayquaza_fly1.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 124
+	$(GFX) $< $@ -num_tiles 124 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/rayquaza_tail_fix.4bpp: $(RAYQUAZAGFXDIR)/rayquaza_tail.4bpp
 	cp $< $@
 	head -c 12 /dev/zero >> $@
 
 $(RAYQUAZAGFXDIR)/chase_streaks.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 19
+	$(GFX) $< $@ -num_tiles 19 -Wnum_tiles
 
 $(RAYQUAZAGFXDIR)/rayquaza_chase.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 155
+	$(GFX) $< $@ -num_tiles 155 -Wnum_tiles
 
 graphics/picture_frame/frame5.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 86
+	$(GFX) $< $@ -num_tiles 86 -Wnum_tiles
 
 $(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \
 									  $(ROULETTEGFXDIR)/tailow.4bpp
@@ -249,10 +249,10 @@ $(ROULETTEGFXDIR)/poke_icons2.4bpp: $(ROULETTEGFXDIR)/wynaut.4bpp \
 	@cat $^ >$@
 
 $(BATTRANSGFXDIR)/85BBC14.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(BATTRANSGFXDIR)/rayquaza.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 938
+	$(GFX) $< $@ -num_tiles 938 -Wnum_tiles
 
 $(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
 										 $(BATTRANSGFXDIR)/frontier_squares_1.4bpp
@@ -275,16 +275,16 @@ $(SLOTMACHINEGFXDIR)/reel_time_gfx.4bpp: $(SLOTMACHINEGFXDIR)/reel_time_pikachu.
 	@cat $^ >$@
 
 $(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 822
+	$(GFX) $< $@ -num_tiles 822 -Wnum_tiles
 
 $(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 55
+	$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
 
 $(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 52
+	$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
 
 $(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp
 	@cat $^ >$@
@@ -293,97 +293,97 @@ $(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.
 	@cat $^ >$@
 
 $(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 45
+	$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
 
 $(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 23
+	$(GFX) $< $@ -num_tiles 23 -Wnum_tiles
 
 $(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 49
+	$(GFX) $< $@ -num_tiles 49 -Wnum_tiles
 
 $(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 56
+	$(GFX) $< $@ -num_tiles 56 -Wnum_tiles
 
 $(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 55
+	$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
 
 $(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 46
+	$(GFX) $< $@ -num_tiles 46 -Wnum_tiles
 
 $(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 23
+	$(GFX) $< $@ -num_tiles 23 -Wnum_tiles
 
 $(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 54
+	$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
 
 $(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 51
+	$(GFX) $< $@ -num_tiles 51 -Wnum_tiles
 
 $(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 11
+	$(GFX) $< $@ -num_tiles 11 -Wnum_tiles
 
 $(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 45
+	$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
 
 $(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/polkadot_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 54
+	$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
 
 $(PSSGFXDIR)/polkadot.4bpp: $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 35
+	$(GFX) $< $@ -num_tiles 35 -Wnum_tiles
 
 $(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 33
+	$(GFX) $< $@ -num_tiles 33 -Wnum_tiles
 
 $(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 18
+	$(GFX) $< $@ -num_tiles 18 -Wnum_tiles
 
 $(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp
 	@cat $^ >$@
 
 $(PSSGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(PSSGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(PSSGFXDIR)/zigzagoon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/zigzagoon_bg.4bpp
 	@cat $^ >$@
@@ -449,70 +449,70 @@ $(FIELDEFFECTSGFXDIR)/pics/tree_disguise.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 4
 
 $(INTERFACEGFXDIR)/selector_outline.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 8
+	$(GFX) $< $@ -num_tiles 8 -Wnum_tiles
 	
 $(BATTRANSGFXDIR)/frontier_transition.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 43
+	$(GFX) $< $@ -num_tiles 43 -Wnum_tiles
 
-graphics/tm_case/unk_8E845D8.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 91
+graphics/tm_case/tm_case.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 91 -Wnum_tiles
 
 $(PKNAVGFXDIR)/header.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(PKNAVGFXDIR)/outline.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 	
 $(PKNAVGFXDIR)/ui_matchcall.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 13
+	$(GFX) $< $@ -num_tiles 13 -Wnum_tiles
 
 $(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 232
+	$(GFX) $< $@ -num_tiles 232 -Wnum_tiles
 
 $(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
-	$(GFX) $< $@ -num_tiles 233
+	$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
 
 $(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp
 	@cat $^ >$@
 	
 $(FAMECHECKERGFXDIR)/spinning_pokeball.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 15
+	$(GFX) $< $@ -num_tiles 15 -Wnum_tiles
 
 $(FAMECHECKERGFXDIR)/bg.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 165
+	$(GFX) $< $@ -num_tiles 165 -Wnum_tiles
 
 graphics/seagallop/water.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 41
+	$(GFX) $< $@ -num_tiles 41 -Wnum_tiles
 
 graphics/link/321start.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 4 -mheight 4
 
 $(TEXTWINDOWGFXDIR)/unk_8470B0C.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 19
+	$(GFX) $< $@ -num_tiles 19 -Wnum_tiles
 
 $(SLOTMACHINEGFXDIR)/unk_8466620.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 66
+	$(GFX) $< $@ -num_tiles 66 -Wnum_tiles
 
 $(SLOTMACHINEGFXDIR)/unk_84659d0.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 138
+	$(GFX) $< $@ -num_tiles 138 -Wnum_tiles
 
 $(TEACHYTVGFXDIR)/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 233
+	$(GFX) $< $@ -num_tiles 233 -Wnum_tiles
 
-$(SSANNEGFXDIR)/unk_8479A38.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 17
+$(SSANNEGFXDIR)/smoke.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 17 -Wnum_tiles
 
-$(ITEMPCGFXDIR)/unk_8E85090.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 82
+$(ITEMPCGFXDIR)/bg.4bpp: %.4bpp: %.png
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TITLESCREENGFXDIR)/firered/box_art_mon.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 135
+	$(GFX) $< $@ -num_tiles 135 -Wnum_tiles
 
 $(TITLESCREENGFXDIR)/leafgreen/box_art_mon.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 123
+	$(GFX) $< $@ -num_tiles 123 -Wnum_tiles
 
 $(CREDITSGFXDIR)/unk_8EAE548.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 77
+	$(GFX) $< $@ -num_tiles 77 -Wnum_tiles
 
 POKEDEXAREAMARKERSDATADIR := graphics/pokedex/area_markers
 
@@ -535,188 +535,188 @@ graphics/misc/emoticons.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -mwidth 2 -mheight 2
 
 $(ITEMMENUGFXDIR)/bag_tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 55
+	$(GFX) $< $@ -num_tiles 55 -Wnum_tiles
 
 $(INTROGFXDIR)/scene_1/grass.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 397
+	$(GFX) $< $@ -num_tiles 397 -Wnum_tiles
 
 $(INTROGFXDIR)/scene_2/plants.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 17
+	$(GFX) $< $@ -num_tiles 17 -Wnum_tiles
 
 $(INTROGFXDIR)/scene_2/nidorino_close.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 170
+	$(GFX) $< $@ -num_tiles 170 -Wnum_tiles
 
 $(INTROGFXDIR)/scene_2/gengar_close.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 114
+	$(GFX) $< $@ -num_tiles 114 -Wnum_tiles
 
 $(INTROGFXDIR)/scene_3/gengar_anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 348
+	$(GFX) $< $@ -num_tiles 348 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/building/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 77
+	$(GFX) $< $@ -num_tiles 77 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/cave/anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 106
+	$(GFX) $< $@ -num_tiles 106 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/cave/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 84
+	$(GFX) $< $@ -num_tiles 84 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/grass/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 98
+	$(GFX) $< $@ -num_tiles 98 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/indoor/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 77
+	$(GFX) $< $@ -num_tiles 77 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/longgrass/anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 133
+	$(GFX) $< $@ -num_tiles 133 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/longgrass/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 98
+	$(GFX) $< $@ -num_tiles 98 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/mountain/anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 47
+	$(GFX) $< $@ -num_tiles 47 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/pond/anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 36
+	$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/pond/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 75
+	$(GFX) $< $@ -num_tiles 75 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/sand/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 83
+	$(GFX) $< $@ -num_tiles 83 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/underwater/anim.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 26
+	$(GFX) $< $@ -num_tiles 26 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/underwater/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 85
+	$(GFX) $< $@ -num_tiles 85 -Wnum_tiles
 
 $(BATTLETERRAINGFXDIR)/water/terrain.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 81
+	$(GFX) $< $@ -num_tiles 81 -Wnum_tiles
 
 $(BERRYPOUCHGFXDIR)/background.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 52
+	$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
 
 $(HALLOFFAMEGFXDIR)/hall_of_fame.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 29
+	$(GFX) $< $@ -num_tiles 29 -Wnum_tiles
 
 $(TILESETGFXDIR)/primary/general/anim/water_current_landwatersedge/7.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 47
+	$(GFX) $< $@ -num_tiles 47 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/altering_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 391
+	$(GFX) $< $@ -num_tiles 391 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/berry_forest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 395
+	$(GFX) $< $@ -num_tiles 395 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/digletts_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 398
+	$(GFX) $< $@ -num_tiles 398 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/dotted_hole/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 317
+	$(GFX) $< $@ -num_tiles 317 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/icefall_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 399
+	$(GFX) $< $@ -num_tiles 399 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/lost_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 404
+	$(GFX) $< $@ -num_tiles 404 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/monean_chamber/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 326
+	$(GFX) $< $@ -num_tiles 326 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/mt_ember/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 355
+	$(GFX) $< $@ -num_tiles 355 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/mt_moon/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 364
+	$(GFX) $< $@ -num_tiles 364 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/pokemon_mansion/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 388
+	$(GFX) $< $@ -num_tiles 388 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/pokemon_tower/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 290
+	$(GFX) $< $@ -num_tiles 290 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/power_plant/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 368
+	$(GFX) $< $@ -num_tiles 368 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/rock_tunnel/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 407
+	$(GFX) $< $@ -num_tiles 407 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/rocket_hideout/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 194
+	$(GFX) $< $@ -num_tiles 194 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/rocket_warehouse/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 234
+	$(GFX) $< $@ -num_tiles 234 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/safari_zone/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 330
+	$(GFX) $< $@ -num_tiles 330 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/seafoam_islands/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 408
+	$(GFX) $< $@ -num_tiles 408 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/silph_co/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 355
+	$(GFX) $< $@ -num_tiles 355 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/victory_road/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 375
+	$(GFX) $< $@ -num_tiles 375 -Wnum_tiles
 
 $(MAPPREVIEWGFXDIR)/viridian_forest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 389
+	$(GFX) $< $@ -num_tiles 389 -Wnum_tiles
 
 $(NAMINGGFXDIR)/cursor.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 5
+	$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
 
 $(NAMINGGFXDIR)/cursor_squished.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 5
+	$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
 
 $(NAMINGGFXDIR)/cursor_filled.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 5
+	$(GFX) $< $@ -num_tiles 5 -Wnum_tiles
 
 
 $(WALLPAPERGFXDIR)/beach/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 60
+	$(GFX) $< $@ -num_tiles 60 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 61
+	$(GFX) $< $@ -num_tiles 61 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 40
+	$(GFX) $< $@ -num_tiles 40 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/crag/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 54
+	$(GFX) $< $@ -num_tiles 54 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/desert/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 52
+	$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/forest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/pokecenter/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/river/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 63
+	$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/savanna/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 45
+	$(GFX) $< $@ -num_tiles 45 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/seafloor/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 53
+	$(GFX) $< $@ -num_tiles 53 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/simple/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 25
+	$(GFX) $< $@ -num_tiles 25 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/sky/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 52
+	$(GFX) $< $@ -num_tiles 52 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/snow/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 51
+	$(GFX) $< $@ -num_tiles 51 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/stars/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 37
+	$(GFX) $< $@ -num_tiles 37 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/tiles/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 31
+	$(GFX) $< $@ -num_tiles 31 -Wnum_tiles
 
 $(WALLPAPERGFXDIR)/volcano/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 57
+	$(GFX) $< $@ -num_tiles 57 -Wnum_tiles
diff --git a/include/graphics.h b/include/graphics.h
index c486aa058..5efc885bc 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2866,15 +2866,15 @@ extern const u16 gFameCheckerBg3Tilemap[0x400];
 extern const u16 gFameCheckerBg2Tilemap[0x400];
 
 // tm_case
-extern const u32 gUnknown_8E845D8[];
-extern const u32 gUnknown_8E84A24[];
-extern const u32 gUnknown_8E84B70[];
-extern const u32 gUnknown_8E84CB0[];
-extern const u32 gUnknown_8E84D20[];
-extern const u32 gTMCase_TMSpriteGfx[];
-extern const u32 gUnknown_8E84F20[];
-extern const u32 gUnknown_8E85068[];
-extern const u8 gUnknown_8E99118[];
+extern const u32 gTMCase_Gfx[];
+extern const u32 gTMCaseMenu_Tilemap[];
+extern const u32 gTMCase_Tilemap[];
+extern const u32 gTMCaseMenu_Male_Pal[];
+extern const u32 gTMCaseMenu_Female_Pal[];
+extern const u32 gTMCaseDisc_Gfx[];
+extern const u32 gTMCaseDiscTypes1_Pal[];
+extern const u32 gTMCaseDiscTypes2_Pal[];
+extern const u8 gTMCaseHM_Gfx[];
 extern const u16 gTMCaseMainWindowPalette[];
 
 // egg_hatch
diff --git a/src/graphics.c b/src/graphics.c
index 440083539..b4ab91a60 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -1123,18 +1123,18 @@ const u32 gBag_Pal[] = INCBIN_U32("graphics/interface/bag.gbapal.lz");
 const u32 gSwapLine_Gfx[] = INCBIN_U32("graphics/interface/bag_swap.4bpp.lz");
 const u32 gSwapLine_Pal[] = INCBIN_U32("graphics/interface/bag_swap.gbapal.lz");
 
-const u32 gUnknown_8E845D8[] = INCBIN_U32("graphics/tm_case/unk_8E845D8.4bpp.lz");
-const u32 gUnknown_8E84A24[] = INCBIN_U32("graphics/tm_case/unk_8E84A24.bin.lz");
-const u32 gUnknown_8E84B70[] = INCBIN_U32("graphics/tm_case/unk_8E84B70.bin.lz");
-const u32 gUnknown_8E84CB0[] = INCBIN_U32("graphics/tm_case/unk_8E84CB0.gbapal.lz");
-const u32 gUnknown_8E84D20[] = INCBIN_U32("graphics/tm_case/unk_8E84D20.gbapal.lz");
-const u32 gTMCase_TMSpriteGfx[] = INCBIN_U32("graphics/tm_case/unk_8E84D90.4bpp.lz");
-const u32 gUnknown_8E84F20[] = INCBIN_U32("graphics/tm_case/unk_8E84F20.gbapal.lz");
-const u32 gUnknown_8E85068[] = INCBIN_U32("graphics/tm_case/unk_8E85068.gbapal.lz");
+const u32 gTMCase_Gfx[] = INCBIN_U32("graphics/tm_case/tm_case.4bpp.lz");
+const u32 gTMCaseMenu_Tilemap[] = INCBIN_U32("graphics/tm_case/menu.bin.lz");
+const u32 gTMCase_Tilemap[] = INCBIN_U32("graphics/tm_case/tm_case.bin.lz");
+const u32 gTMCaseMenu_Male_Pal[] = INCBIN_U32("graphics/tm_case/menu_male.gbapal.lz");
+const u32 gTMCaseMenu_Female_Pal[] = INCBIN_U32("graphics/tm_case/menu_female.gbapal.lz");
+const u32 gTMCaseDisc_Gfx[] = INCBIN_U32("graphics/tm_case/disc.4bpp.lz");
+const u32 gTMCaseDiscTypes1_Pal[] = INCBIN_U32("graphics/tm_case/disc_types_1.gbapal.lz");
+const u32 gTMCaseDiscTypes2_Pal[] = INCBIN_U32("graphics/tm_case/disc_types_2.gbapal.lz");
 
-const u8 gItemPcTiles[] = INCBIN_U8("graphics/item_pc/unk_8E85090.4bpp.lz");
-const u32 gItemPcBgPals[] = INCBIN_U32("graphics/item_pc/unk_8E85408.gbapal.lz");
-const u8 gItemPcTilemap[] = INCBIN_U8("graphics/item_pc/unk_8E85458.bin.lz");
+const u8 gItemPcTiles[] = INCBIN_U8("graphics/item_pc/bg.4bpp.lz");
+const u32 gItemPcBgPals[] = INCBIN_U32("graphics/item_pc/bg.gbapal.lz");
+const u8 gItemPcTilemap[] = INCBIN_U8("graphics/item_pc/bg.bin.lz");
 
 const u32 gBerryPouchSpriteTiles[] = INCBIN_U32("graphics/berry_pouch/berry_pouch.4bpp.lz");
 const u8 gBerryPouchBgGfx[] = INCBIN_U8("graphics/berry_pouch/background.4bpp.lz");
@@ -1212,7 +1212,7 @@ const u32 gNamingScreenPageSwapButton_Gfx[] = INCBIN_U32("graphics/naming_screen
 const u32 gNamingScreenInputArrow_Gfx[]     = INCBIN_U32("graphics/naming_screen/input_arrow.4bpp");
 const u32 gNamingScreenUnderscore_Gfx[]     = INCBIN_U32("graphics/naming_screen/underscore.4bpp");
 
-const u8 gUnknown_8E99118[] = INCBIN_U8("graphics/tm_case/unk_8E99118.4bpp");
+const u8 gTMCaseHM_Gfx[] = INCBIN_U8("graphics/tm_case/hm.4bpp");
 
 const u16 gKantoTrainerCard_Pal[] = INCBIN_U16("graphics/trainer_card/0star.gbapal");
 const u32 gKantoTrainerCard_Gfx[] = INCBIN_U32("graphics/trainer_card/card.4bpp.lz");
diff --git a/src/ss_anne.c b/src/ss_anne.c
index ce46bc6f6..71335915a 100644
--- a/src/ss_anne.c
+++ b/src/ss_anne.c
@@ -18,8 +18,8 @@ static void WakeSpriteCallback(struct Sprite *sprite);
 static void CreateSmokeSprite(void);
 static void SmokeSpriteCallback(struct Sprite *sprite);
 
-static const u16 sWakeTiles[] = INCBIN_U16("graphics/ss_anne/unk_8479838.4bpp");
-static const u16 sSmokeTiles[] = INCBIN_U16("graphics/ss_anne/unk_8479A38.4bpp");
+static const u16 sWakeTiles[] = INCBIN_U16("graphics/ss_anne/wake.4bpp");
+static const u16 sSmokeTiles[] = INCBIN_U16("graphics/ss_anne/smoke.4bpp");
 
 static const struct SpriteSheet sSpriteSheets[] = {
     {(const void *)sWakeTiles, sizeof(sWakeTiles), SPRITE_TAG_WAKE},
diff --git a/src/tm_case.c b/src/tm_case.c
index 73807c670..8ef9e7fbb 100644
--- a/src/tm_case.c
+++ b/src/tm_case.c
@@ -226,7 +226,7 @@ static const union AnimCmd *const sTMSpriteAnims[] = {
 };
 
 static const struct CompressedSpriteSheet sTMSpriteSheet = {
-    (const void *)gTMCase_TMSpriteGfx,
+    (const void *)gTMCaseDisc_Gfx,
     0x400,
     TM_CASE_TM_TAG
 };
@@ -241,7 +241,7 @@ static const struct SpriteTemplate sTMSpriteTemplate = {
     SpriteCallbackDummy
 };
 
-static const u16 sTMSpritePaletteOffsetByType[] = {
+static const u16 sTMSpritePaletteOffsetByType[NUMBER_OF_MON_TYPES] = {
     [TYPE_NORMAL]   = 0x000,
     [TYPE_FIRE]     = 0x010,
     [TYPE_WATER]    = 0x020,
@@ -440,25 +440,25 @@ static bool8 HandleLoadTMCaseGraphicsAndPalettes(void)
     {
     case 0:
         ResetTempTileDataBuffers();
-        DecompressAndCopyTileDataToVram(1, gUnknown_8E845D8, 0, 0, 0);
+        DecompressAndCopyTileDataToVram(1, gTMCase_Gfx, 0, 0, 0);
         sTMCaseDynamicResources->seqId++;
         break;
     case 1:
         if (FreeTempTileDataBuffersIfPossible() != TRUE)
         {
-            LZDecompressWram(gUnknown_8E84A24, sTilemapBuffer);
+            LZDecompressWram(gTMCaseMenu_Tilemap, sTilemapBuffer);
             sTMCaseDynamicResources->seqId++;
         }
         break;
     case 2:
-        LZDecompressWram(gUnknown_8E84B70, GetBgTilemapBuffer(1));
+        LZDecompressWram(gTMCase_Tilemap, GetBgTilemapBuffer(1));
         sTMCaseDynamicResources->seqId++;
         break;
     case 3:
         if (gSaveBlock2Ptr->playerGender == MALE)
-            LoadCompressedPalette(gUnknown_8E84CB0, 0, 0x80);
+            LoadCompressedPalette(gTMCaseMenu_Male_Pal, 0, 0x80);
         else
-            LoadCompressedPalette(gUnknown_8E84D20, 0, 0x80);
+            LoadCompressedPalette(gTMCaseMenu_Female_Pal, 0, 0x80);
         sTMCaseDynamicResources->seqId++;
         break;
     case 4:
@@ -1387,7 +1387,7 @@ static void TMCase_MoveCursor_UpdatePrintedTMInfo(u16 itemId)
 
 static void PlaceHMTileInWindow(u8 windowId, u8 x, u8 y)
 {
-    BlitBitmapToWindow(windowId, gUnknown_8E99118, x, y, 16, 12);
+    BlitBitmapToWindow(windowId, gTMCaseHM_Gfx, x, y, 16, 12);
 }
 
 static void HandlePrintMoneyOnHand(void)
@@ -1423,7 +1423,7 @@ static void RemoveTMContextMenu(u8 * a0)
 static u8 CreateTMSprite(u16 itemId)
 {
     u8 spriteId = CreateSprite(&sTMSpriteTemplate, 0x29, 0x2E, 0);
-    u8 r5;
+    u8 tmIdx;
     if (itemId == ITEM_NONE)
     {
         UpdateTMSpritePosition(&gSprites[spriteId], 0xFF);
@@ -1431,17 +1431,17 @@ static u8 CreateTMSprite(u16 itemId)
     }
     else
     {
-        r5 = itemId - 33;
-        SetTMSpriteAnim(&gSprites[spriteId], r5);
+        tmIdx = itemId - ITEM_TM01;
+        SetTMSpriteAnim(&gSprites[spriteId], tmIdx);
         TintTMSpriteByType(gBattleMoves[ItemIdToBattleMoveId(itemId)].type);
-        UpdateTMSpritePosition(&gSprites[spriteId], r5);
+        UpdateTMSpritePosition(&gSprites[spriteId], tmIdx);
         return spriteId;
     }
 }
 
 static void SetTMSpriteAnim(struct Sprite *sprite, u8 idx)
 {
-    if (idx >= 50)
+    if (idx >= NUM_TECHNICAL_MACHINES)
         StartSpriteAnim(sprite, 1);
     else
         StartSpriteAnim(sprite, 0);
@@ -1517,14 +1517,17 @@ static void SpriteCB_MoveTMSpriteInCase(struct Sprite *sprite)
     }
 }
 
+// - 1 excludes TYPE_MYSTERY
+#define NUM_TM_COLORS ((NUMBER_OF_MON_TYPES - 1) * 16)
+
 static void LoadTMTypePalettes(void)
 {
     struct SpritePalette spritePalette;
 
-    sTMSpritePaletteBuffer = Alloc(0x110 * sizeof(u16));
-    LZDecompressWram(gUnknown_8E84F20, sTMSpritePaletteBuffer);
-    LZDecompressWram(gUnknown_8E85068, sTMSpritePaletteBuffer + 0x100);
-    spritePalette.data = sTMSpritePaletteBuffer + 0x110;
+    sTMSpritePaletteBuffer = Alloc(NUM_TM_COLORS * sizeof(u16));
+    LZDecompressWram(gTMCaseDiscTypes1_Pal, sTMSpritePaletteBuffer); // Decompress the first 16
+    LZDecompressWram(gTMCaseDiscTypes2_Pal, sTMSpritePaletteBuffer + 0x100); // Decompress the rest (Only 17 total, this is just Dragon type)
+    spritePalette.data = sTMSpritePaletteBuffer + NUM_TM_COLORS;
     spritePalette.tag = TM_CASE_TM_TAG;
     LoadSpritePalette(&spritePalette);
 }
diff --git a/tileset_rules.mk b/tileset_rules.mk
index 707bceb8d..a868248cf 100644
--- a/tileset_rules.mk
+++ b/tileset_rules.mk
@@ -1,202 +1,202 @@
 TILESETGFXDIR := data/tilesets
 
 $(TILESETGFXDIR)/primary/building/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 640
+	$(GFX) $< $@ -num_tiles 640 -Wnum_tiles
 
 $(TILESETGFXDIR)/primary/general/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 640
+	$(GFX) $< $@ -num_tiles 640 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pallet_town/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 76
+	$(GFX) $< $@ -num_tiles 76 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/lavender_town/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 256
+	$(GFX) $< $@ -num_tiles 256 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cinnabar_island/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 128
+	$(GFX) $< $@ -num_tiles 128 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_center/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 376
+	$(GFX) $< $@ -num_tiles 376 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cable_club/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 632
+	$(GFX) $< $@ -num_tiles 632 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/fuchsia_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 92
+	$(GFX) $< $@ -num_tiles 92 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pewter_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 207
+	$(GFX) $< $@ -num_tiles 207 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/saffron_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 82
+	$(GFX) $< $@ -num_tiles 82 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/viridian_forest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 101
+	$(GFX) $< $@ -num_tiles 101 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/seafoam_islands/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 318
+	$(GFX) $< $@ -num_tiles 318 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/generic_building_2/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 152
+	$(GFX) $< $@ -num_tiles 152 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/underground_path/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 50
+	$(GFX) $< $@ -num_tiles 50 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/restaurant_hotel/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 76
+	$(GFX) $< $@ -num_tiles 76 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/burgled_house/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 172
+	$(GFX) $< $@ -num_tiles 172 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/berry_forest/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 101
+	$(GFX) $< $@ -num_tiles 101 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/sevii_islands_45/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 374
+	$(GFX) $< $@ -num_tiles 374 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_league/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 340
+	$(GFX) $< $@ -num_tiles 340 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/viridian_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 112
+	$(GFX) $< $@ -num_tiles 112 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/vermilion_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 140
+	$(GFX) $< $@ -num_tiles 140 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/indigo_plateau/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 247
+	$(GFX) $< $@ -num_tiles 247 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 256
+	$(GFX) $< $@ -num_tiles 256 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/bike_shop/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 60
+	$(GFX) $< $@ -num_tiles 60 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/viridian_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 90
+	$(GFX) $< $@ -num_tiles 90 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cerulean_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 119
+	$(GFX) $< $@ -num_tiles 119 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cinnabar_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 146
+	$(GFX) $< $@ -num_tiles 146 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/unused_gatehouse_1/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 144
+	$(GFX) $< $@ -num_tiles 144 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/unused_gatehouse_2/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 144
+	$(GFX) $< $@ -num_tiles 144 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/power_plant/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 80
+	$(GFX) $< $@ -num_tiles 80 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_tower/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 128
+	$(GFX) $< $@ -num_tiles 128 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/school/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 50
+	$(GFX) $< $@ -num_tiles 50 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/dummy_3/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 2
+	$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/navel_rock/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 282
+	$(GFX) $< $@ -num_tiles 282 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/sevii_islands_67/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 374
+	$(GFX) $< $@ -num_tiles 374 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/hall_of_fame/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 208
+	$(GFX) $< $@ -num_tiles 208 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pewter_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 280
+	$(GFX) $< $@ -num_tiles 280 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/celadon_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 244
+	$(GFX) $< $@ -num_tiles 244 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/saffron_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 262
+	$(GFX) $< $@ -num_tiles 262 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/dummy_1/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 2
+	$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/generic_building_1/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 63
+	$(GFX) $< $@ -num_tiles 63 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/hoenn_building/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 383
+	$(GFX) $< $@ -num_tiles 383 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/vermilion_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 247
+	$(GFX) $< $@ -num_tiles 247 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/ss_anne/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 245
+	$(GFX) $< $@ -num_tiles 245 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/rock_tunnel/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 256
+	$(GFX) $< $@ -num_tiles 256 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cerulean_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 246
+	$(GFX) $< $@ -num_tiles 246 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/sea_cottage/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 68
+	$(GFX) $< $@ -num_tiles 68 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/safari_zone_building/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 90
+	$(GFX) $< $@ -num_tiles 90 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/fan_club_daycare/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 85
+	$(GFX) $< $@ -num_tiles 85 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/dummy_4/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 2
+	$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/tanoby_ruins/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 74
+	$(GFX) $< $@ -num_tiles 74 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/trainer_tower/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 343
+	$(GFX) $< $@ -num_tiles 343 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/cerulean_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 158
+	$(GFX) $< $@ -num_tiles 158 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/fuchsia_city/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 191
+	$(GFX) $< $@ -num_tiles 191 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/mart/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 36
+	$(GFX) $< $@ -num_tiles 36 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/museum/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 137
+	$(GFX) $< $@ -num_tiles 137 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/lab/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 102
+	$(GFX) $< $@ -num_tiles 102 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/game_corner/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 171
+	$(GFX) $< $@ -num_tiles 171 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/celadon_gym/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 103
+	$(GFX) $< $@ -num_tiles 103 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/dummy_2/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 2
+	$(GFX) $< $@ -num_tiles 2 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/digletts_cave/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 248
+	$(GFX) $< $@ -num_tiles 248 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/department_store/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 201
+	$(GFX) $< $@ -num_tiles 201 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/pokemon_mansion/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 350
+	$(GFX) $< $@ -num_tiles 350 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/condominiums/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 384
+	$(GFX) $< $@ -num_tiles 384 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/mt_ember/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 288
+	$(GFX) $< $@ -num_tiles 288 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/sevii_islands_123/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 374
+	$(GFX) $< $@ -num_tiles 374 -Wnum_tiles
 
 $(TILESETGFXDIR)/secondary/island_harbor/tiles.4bpp: %.4bpp: %.png
-	$(GFX) $< $@ -num_tiles 165
+	$(GFX) $< $@ -num_tiles 165 -Wnum_tiles