update sprites to directory grit, update sprites in subrepo

icons.makefile

@@ -14,16 +14,16 @@ all: $(ICON_AR)
 
 .PHONY: clean
 clean:
-	rm -f $(ICON_AR) $(GFX_BUILD_DIR)/icons/*
+	@echo -e "TRYING TO CLEAN ICONS FROM WRONG MAKEFILE"
 
-$(ICON_AR): $(OBJ_FILES)
-	@echo -e "\e[1;32mCreating archive $@\e[0m"
-	$(AR) rcs $@ $^
+#$(ICON_AR): $(OBJ_FILES)
+#	@echo -e "\e[1;32mCreating archive $@\e[0m"
+#	$(AR) rcs $@ $^
 
-$(GFX_BUILD_DIR)/icons/%.o: $(GFX_BUILD_DIR)/icons/%.s
-	@echo -e "\e[32mAssembling $<\e[0m"
-	$(AS) -o $@ $<
+#$(GFX_BUILD_DIR)/icons/%.o: $(GFX_BUILD_DIR)/icons/%.s
+#	@echo -e "\e[32mAssembling $<\e[0m"
+#	$(AS) -o $@ $<
 
-$(GFX_BUILD_DIR)/icons/%.s: $(I_ASSET_ROOT)/pkmn_icons/%.png
-	@echo -e "\e[34mProcessing image $<\e[0m"
-	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gz! -m! -p! -s icon_$(notdir $(basename $<)) -o $@
+#$(GFX_BUILD_DIR)/icons/%.s: $(I_ASSET_ROOT)/pkmn_icons/%.png
+#	@echo -e "\e[34mProcessing image $<\e[0m"
+#	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gz! -m! -p! -s icon_$(notdir $(basename $<)) -o $@

sots-private

@@ -1 +1 @@
-Subproject commit b6e8c0cbbc187ba843d7d08e56bb59baf4209ff4
+Subproject commit c21c55f9cdc702b3630a68da9adb864870733768

sprites.makefile

@@ -98,39 +98,39 @@ $(GFX_BUILD_DIR)/sprites/normal_pal/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
 
 
 # Shiny Palette Targets
-$(GFX_BUILD_DIR)/sprites/shiny_pal/%.o: $(GFX_BUILD_DIR)/sprites/shiny_pal/%.s
-	@echo -e "\e[32mAssembling $<\e[0m"
-	$(AS) -o $@ $<
+#$(GFX_BUILD_DIR)/sprites/shiny_pal/%.o: $(GFX_BUILD_DIR)/sprites/shiny_pal/%.s
+#	@echo -e "\e[32mAssembling $<\e[0m"
+#	$(AS) -o $@ $<
 
-$(GFX_BUILD_DIR)/sprites/shiny_pal/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
-	@echo -e "\e[34mProcessing palette $< (shiny)\e[0m"
-	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 16 \
-		-s $(shell echo $(notdir $(basename $<)) | sed "s/shiny_/s_p_/g") \
-		-o $@
+#$(GFX_BUILD_DIR)/sprites/shiny_pal/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
+#	@echo -e "\e[34mProcessing palette $< (shiny)\e[0m"
+#	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 16 \
+#		-s $(shell echo $(notdir $(basename $<)) | sed "s/shiny_/s_p_/g") \
+#		-o $@
 
 
 # Front Sprite Targets
-$(GFX_BUILD_DIR)/sprites/front_sprites/%.o: $(GFX_BUILD_DIR)/sprites/front_sprites/%.s
-	@echo -e "\e[32mAssembling $<\e[0m"
-	$(AS) -o $@ $<
+#$(GFX_BUILD_DIR)/sprites/front_sprites/%.o: $(GFX_BUILD_DIR)/sprites/front_sprites/%.s
+#	@echo -e "\e[32mAssembling $<\e[0m"
+#	$(AS) -o $@ $<
 
-$(GFX_BUILD_DIR)/sprites/front_sprites/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
-	@echo -e "\e[34mProcessing sprite $< (front)\e[0m"
-	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 64 -m! -p! \
-		-s $(shell echo $(notdir $(basename $<)) | sed "s/normal_/front_/g") \
-		-o $@
+#$(GFX_BUILD_DIR)/sprites/front_sprites/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
+#	@echo -e "\e[34mProcessing sprite $< (front)\e[0m"
+#	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 64 -m! -p! \
+#		-s $(shell echo $(notdir $(basename $<)) | sed "s/normal_/front_/g") \
+#		-o $@
 
 
 # Back Sprite Targets
-$(GFX_BUILD_DIR)/sprites/back_sprites/%.o: $(GFX_BUILD_DIR)/sprites/bacj_sprites/%.s
-	@echo -e "\e[32mAssembling $<\e[0m"
-	$(AS) -o $@ $<
-
-$(GFX_BUILD_DIR)/sprites/back_sprites/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
-	@echo -e "\e[34mProcessing sprite $< (back)\e[0m"
-	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gzl -al 64 -aw 64 -m! -p! \
-		-s $(shell echo $(notdir $(basename $<)) | sed "s/normal_/back_/g") \
-		-o $@
+#$(GFX_BUILD_DIR)/sprites/back_sprites/%.o: $(GFX_BUILD_DIR)/sprites/bacj_sprites/%.s
+#	@echo -e "\e[32mAssembling $<\e[0m"
+#	$(AS) -o $@ $<
+
+#$(GFX_BUILD_DIR)/sprites/back_sprites/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
+#	@echo -e "\e[34mProcessing sprite $< (back)\e[0m"
+#	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gzl -al 64 -aw 64 -m! -p! \
+#		-s $(shell echo $(notdir $(basename $<)) | sed "s/normal_/back_/g") \
+#		-o $@
 
 
 # Misc hardcoded targets