Merge branch 'master' of https://github.com/pret/pokeemerald into remove-temps

1 files changed, 58 insertions, 58 deletions

diff --git a/graphics_file_rules.mk b/graphics_file_rules.mk
index f9ea40532..9fd9091a4 100644
--- a/graphics_file_rules.mk
+++ b/graphics_file_rules.mk
@@ -14,7 +14,7 @@ ROULETTEGFXDIR := graphics/roulette
 SLOTMACHINEGFXDIR := graphics/slot_machine
 PKNAVGFXDIR := graphics/pokenav
 PKNAVOPTIONSGFXDIR := graphics/pokenav/options
-PSSGFXDIR := graphics/pokemon_storage
+WALLPAPERGFXDIR := graphics/pokemon_storage/wallpapers
 OBJEVENTGFXDIR := graphics/object_events
 MISCGFXDIR := graphics/misc
 
@@ -346,7 +346,7 @@ $(FONTGFXDIR)/keypad_icons.4bpp: %.4bpp: %.png
 graphics/title_screen/pokemon_logo.gbapal: %.gbapal: %.pal
 	$(GFX) $< $@ -num_colors 224
 
-graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png
+graphics/pokemon_jump/bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 63
 
 graphics/pokenav/region_map.8bpp: %.8bpp: %.png
@@ -437,7 +437,7 @@ $(BTLANMSPRGFXDIR)/spark.4bpp: $(BTLANMSPRGFXDIR)/spark_0.4bpp \
 						  $(BTLANMSPRGFXDIR)/spark_1.4bpp
 	@cat $^ >$@
 
-$(MASKSGFXDIR)/unknown_C2EA50.4bpp: %.4bpp: %.png
+$(MASKSGFXDIR)/unused_level_up.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 14
 
 $(BATTRANSGFXDIR)/vs_frame.4bpp: %.4bpp: %.png
@@ -476,7 +476,7 @@ $(RAYQUAZAGFXDIR)/scene_4/streaks.4bpp: %.4bpp: %.png
 $(RAYQUAZAGFXDIR)/scene_4/rayquaza.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 155
 
-graphics/picture_frame/frame5.4bpp: %.4bpp: %.png
+graphics/picture_frame/lobby.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 86
 
 $(ROULETTEGFXDIR)/roulette_tilt.4bpp: $(ROULETTEGFXDIR)/shroomish.4bpp \
@@ -502,7 +502,7 @@ $(BATTRANSGFXDIR)/frontier_square_1.4bpp: $(BATTRANSGFXDIR)/frontier_squares_bla
 $(BATTRANSGFXDIR)/frontier_square_2.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
 										 $(BATTRANSGFXDIR)/frontier_squares_2.4bpp
 	@cat $^ >$@
- 
+
 $(BATTRANSGFXDIR)/frontier_square_3.4bpp: $(BATTRANSGFXDIR)/frontier_squares_blanktiles.4bpp \
 										 $(BATTRANSGFXDIR)/frontier_squares_3.4bpp
 	@cat $^ >$@
@@ -520,162 +520,162 @@ $(UNUSEDGFXDIR)/intro_birch_beauty.4bpp: %.4bpp: %.png
 
 
 
-### PSS ###
+### Pokémon Storage System ###
 
-$(PSSGFXDIR)/forest_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/forest/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 55
 
-$(PSSGFXDIR)/forest.4bpp: $(PSSGFXDIR)/forest_frame.4bpp $(PSSGFXDIR)/forest_bg.4bpp
+$(WALLPAPERGFXDIR)/forest/tiles.4bpp: $(WALLPAPERGFXDIR)/forest/frame.4bpp $(WALLPAPERGFXDIR)/forest/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/city_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/city/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 52
 
-$(PSSGFXDIR)/city.4bpp: $(PSSGFXDIR)/city_frame.4bpp $(PSSGFXDIR)/city_bg.4bpp
+$(WALLPAPERGFXDIR)/city/tiles.4bpp: $(WALLPAPERGFXDIR)/city/frame.4bpp $(WALLPAPERGFXDIR)/city/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/desert.4bpp: $(PSSGFXDIR)/desert_frame.4bpp $(PSSGFXDIR)/desert_bg.4bpp
+$(WALLPAPERGFXDIR)/desert/tiles.4bpp: $(WALLPAPERGFXDIR)/desert/frame.4bpp $(WALLPAPERGFXDIR)/desert/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/savanna_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/savanna/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 45
 
-$(PSSGFXDIR)/savanna_bg.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/savanna/bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 23
 
-$(PSSGFXDIR)/savanna.4bpp: $(PSSGFXDIR)/savanna_frame.4bpp $(PSSGFXDIR)/savanna_bg.4bpp
+$(WALLPAPERGFXDIR)/savanna/tiles.4bpp: $(WALLPAPERGFXDIR)/savanna/frame.4bpp $(WALLPAPERGFXDIR)/savanna/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/crag_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/crag/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 49
 
-$(PSSGFXDIR)/crag.4bpp: $(PSSGFXDIR)/crag_frame.4bpp $(PSSGFXDIR)/crag_bg.4bpp
+$(WALLPAPERGFXDIR)/crag/tiles.4bpp: $(WALLPAPERGFXDIR)/crag/frame.4bpp $(WALLPAPERGFXDIR)/crag/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/volcano_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/volcano/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 56
 
-$(PSSGFXDIR)/volcano.4bpp: $(PSSGFXDIR)/volcano_frame.4bpp $(PSSGFXDIR)/volcano_bg.4bpp
+$(WALLPAPERGFXDIR)/volcano/tiles.4bpp: $(WALLPAPERGFXDIR)/volcano/frame.4bpp $(WALLPAPERGFXDIR)/volcano/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/snow_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/snow/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 57
 
-$(PSSGFXDIR)/snow.4bpp: $(PSSGFXDIR)/snow_frame.4bpp $(PSSGFXDIR)/snow_bg.4bpp
+$(WALLPAPERGFXDIR)/snow/tiles.4bpp: $(WALLPAPERGFXDIR)/snow/frame.4bpp $(WALLPAPERGFXDIR)/snow/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/cave_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/cave/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 55
 
-$(PSSGFXDIR)/cave.4bpp: $(PSSGFXDIR)/cave_frame.4bpp $(PSSGFXDIR)/cave_bg.4bpp
+$(WALLPAPERGFXDIR)/cave/tiles.4bpp: $(WALLPAPERGFXDIR)/cave/frame.4bpp $(WALLPAPERGFXDIR)/cave/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/beach_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/beach/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 46
 
-$(PSSGFXDIR)/beach_bg.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/beach/bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 23
 
-$(PSSGFXDIR)/beach.4bpp: $(PSSGFXDIR)/beach_frame.4bpp $(PSSGFXDIR)/beach_bg.4bpp
+$(WALLPAPERGFXDIR)/beach/tiles.4bpp: $(WALLPAPERGFXDIR)/beach/frame.4bpp $(WALLPAPERGFXDIR)/beach/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/seafloor_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/seafloor/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 54
 
-$(PSSGFXDIR)/seafloor.4bpp: $(PSSGFXDIR)/seafloor_frame.4bpp $(PSSGFXDIR)/seafloor_bg.4bpp
+$(WALLPAPERGFXDIR)/seafloor/tiles.4bpp: $(WALLPAPERGFXDIR)/seafloor/frame.4bpp $(WALLPAPERGFXDIR)/seafloor/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/river_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/river/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 51
 
-$(PSSGFXDIR)/river_bg.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/river/bg.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 11
 
-$(PSSGFXDIR)/river.4bpp: $(PSSGFXDIR)/river_frame.4bpp $(PSSGFXDIR)/river_bg.4bpp
+$(WALLPAPERGFXDIR)/river/tiles.4bpp: $(WALLPAPERGFXDIR)/river/frame.4bpp $(WALLPAPERGFXDIR)/river/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/sky_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/sky/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 45
 
-$(PSSGFXDIR)/sky.4bpp: $(PSSGFXDIR)/sky_frame.4bpp $(PSSGFXDIR)/sky_bg.4bpp
+$(WALLPAPERGFXDIR)/sky/tiles.4bpp: $(WALLPAPERGFXDIR)/sky/frame.4bpp $(WALLPAPERGFXDIR)/sky/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/polkadot_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/polkadot/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 54
 
-$(PSSGFXDIR)/polkadot.4bpp: $(PSSGFXDIR)/polkadot_frame.4bpp $(PSSGFXDIR)/polkadot_bg.4bpp
+$(WALLPAPERGFXDIR)/polkadot/tiles.4bpp: $(WALLPAPERGFXDIR)/polkadot/frame.4bpp $(WALLPAPERGFXDIR)/polkadot/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/pokecenter_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/pokecenter/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 35
 
-$(PSSGFXDIR)/pokecenter.4bpp: $(PSSGFXDIR)/pokecenter_frame.4bpp $(PSSGFXDIR)/pokecenter_bg.4bpp
+$(WALLPAPERGFXDIR)/pokecenter/tiles.4bpp: $(WALLPAPERGFXDIR)/pokecenter/frame.4bpp $(WALLPAPERGFXDIR)/pokecenter/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/machine_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/machine/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 33
 
-$(PSSGFXDIR)/machine.4bpp: $(PSSGFXDIR)/machine_frame.4bpp $(PSSGFXDIR)/machine_bg.4bpp
+$(WALLPAPERGFXDIR)/machine/tiles.4bpp: $(WALLPAPERGFXDIR)/machine/frame.4bpp $(WALLPAPERGFXDIR)/machine/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/plain_frame.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/plain/frame.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 18
 
-$(PSSGFXDIR)/plain.4bpp: $(PSSGFXDIR)/plain_frame.4bpp $(PSSGFXDIR)/plain_bg.4bpp
+$(WALLPAPERGFXDIR)/plain/tiles.4bpp: $(WALLPAPERGFXDIR)/plain/frame.4bpp $(WALLPAPERGFXDIR)/plain/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/friends_frame1.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 57
 
-$(PSSGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png
+$(WALLPAPERGFXDIR)/friends_frame2.4bpp: %.4bpp: %.png
 	$(GFX) $< $@ -num_tiles 57
 
-$(PSSGFXDIR)/zigzagoon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/zigzagoon_bg.4bpp
+$(WALLPAPERGFXDIR)/zigzagoon/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/zigzagoon/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/screen.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/screen_bg.4bpp
+$(WALLPAPERGFXDIR)/screen/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/screen/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/horizontal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/horizontal_bg.4bpp
+$(WALLPAPERGFXDIR)/horizontal/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/horizontal/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/diagonal.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/diagonal_bg.4bpp
+$(WALLPAPERGFXDIR)/diagonal/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/diagonal/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/block.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/block_bg.4bpp
+$(WALLPAPERGFXDIR)/block/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/block/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/ribbon.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/ribbon_bg.4bpp
+$(WALLPAPERGFXDIR)/ribbon/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/ribbon/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/pokecenter2.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/pokecenter2_bg.4bpp
+$(WALLPAPERGFXDIR)/pokecenter2/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/pokecenter2/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/frame.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/frame_bg.4bpp
+$(WALLPAPERGFXDIR)/frame/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/frame/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/blank.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/blank_bg.4bpp
+$(WALLPAPERGFXDIR)/blank/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/blank/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/circles.4bpp: $(PSSGFXDIR)/friends_frame1.4bpp $(PSSGFXDIR)/circles_bg.4bpp
+$(WALLPAPERGFXDIR)/circles/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame1.4bpp $(WALLPAPERGFXDIR)/circles/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/azumarill.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/azumarill_bg.4bpp
+$(WALLPAPERGFXDIR)/azumarill/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/azumarill/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/pikachu.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/pikachu_bg.4bpp
+$(WALLPAPERGFXDIR)/pikachu/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/pikachu/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/legendary.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/legendary_bg.4bpp
+$(WALLPAPERGFXDIR)/legendary/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/legendary/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/dusclops.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/dusclops_bg.4bpp
+$(WALLPAPERGFXDIR)/dusclops/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/dusclops/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/ludicolo.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/ludicolo_bg.4bpp
+$(WALLPAPERGFXDIR)/ludicolo/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/ludicolo/bg.4bpp
 	@cat $^ >$@
 
-$(PSSGFXDIR)/whiscash.4bpp: $(PSSGFXDIR)/friends_frame2.4bpp $(PSSGFXDIR)/whiscash_bg.4bpp
+$(WALLPAPERGFXDIR)/whiscash/tiles.4bpp: $(WALLPAPERGFXDIR)/friends_frame2.4bpp $(WALLPAPERGFXDIR)/whiscash/bg.4bpp
 	@cat $^ >$@
 
 $(OBJEVENTGFXDIR)/pics/effects/unknown_4F6D38/0.4bpp: %.4bpp: %.png