image cleanup cont

icons.makefile

@@ -1,5 +1,7 @@
-AS = arm-none-eabi-as
-LD = arm-none-eabi-ld
+AS = @arm-none-eabi-as
+LD = @arm-none-eabi-ld
+AR = @arm-none-eabi-ar
+GRIT = @grit
 
 GFX_BUILD_DIR = gfx_build
 
@@ -15,10 +17,13 @@ clean:
 	rm -f $(ICON_AR) $(GFX_BUILD_DIR)/icons/*
 
 $(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/%.s: $(I_ASSET_ROOT)/pkmn_icons/%.png
-	grit $< -fts -fh! -g -gB 4 -gt -gz! -m! -p! -s icon_$(notdir $(basename $<)) -o $@
+	@echo -e "\e[34mProcessing image $<\e[0m"
+	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gz! -m! -p! -s icon_$(notdir $(basename $<)) -o $@

makefile

@@ -53,18 +53,18 @@ ASM_SRC     := $(call rwildcard,src/,*.s)
 C_SRC       := $(call rwildcard,src/,*.c)
 DATA_SRC    := $(call rwildcard,data/,*.s)
 STRING		:= $(call rwildcard,string/$(LAN)/,*.txt)
-STRING_SRC	:= $(STRING:%.txt=%.S)
+STRING_SRC	:= $(STRING:%.txt=%.s)
 
 GEN_OBJ		:= $(GEN_SRC:%.c=$(BLDPATH)/%.o)
-STRING_OBJ	:= $(STRING_SRC:%.S=$(BLDPATH)/%.o)
+STRING_OBJ	:= $(STRING_SRC:%.s=$(BLDPATH)/%.o)
 ASM_OBJ     := $(ASM_SRC:%.s=$(BLDPATH)/%.o)
 C_OBJ       := $(C_SRC:%.c=$(BLDPATH)/%.o)
 DATA_OBJ    := $(DATA_SRC:%.s=$(BLDPATH)/%.o)
-ALL_OBJ     := $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(GEN_OBJ)
+ALL_OBJ     := $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(GEN_OBJ) $(STRING_OBJ)
 
 
 .PRECIOUS: $(STRING_SRC)
-$(STRINGDIR)/%.S: $(STRINGDIR)/%.txt
+$(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
 	$(STRAGB) -o $@ -i $< -t string/table.tbl -e 0xFF
 
 $(BLDPATH)/%.o: %.c $(ASSETS)
@@ -97,7 +97,7 @@ rom: main.asm $(MAIN_OBJ)
 		sed -e '{s/^/0x/g};{/.*\sA\s.*/d};{s/\sT\s/ /g}' > $(OUTPATH)/__symbols.sym
 	@echo "*** SUCCESSFULLY BUILT PROJECT ***"
 	
-$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $(STRING_OBJ)#$(B_ENGINE)
+$(MAIN_OBJ): $(ALL_OBJ) $(ICONS_AR) $(SPRITES) $(MUSIC_AR) $(SMPL_AR) $(VOICE_AR) $(LIST_AR) $(CRY_AR) $()#$(B_ENGINE)
 	$(MAKE) -f assets.makefile
 	$(LD) $(LDFLAGS) -T $(PAGB_LINK) -T linker.ld -T bpre.sym --whole-archive -r -o $@ --start-group $^ --end-group
 

nbproject/configurations.xml

@@ -1,784 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="97">
-  <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
-    <df root="." name="0">
-      <df name="sots-private">
-        <df name="sound">
-          <df name="Assembler">
-            <in>musicInjector.c</in>
-          </df>
-          <df name="Jukebox">
-            <df name="graphics">
-              <in>background.c</in>
-              <in>cassette.c</in>
-            </df>
-            <in>effects.c</in>
-            <in>main.c</in>
-            <in>sots.c</in>
-          </df>
-        </df>
-      </df>
-      <df name="src">
-        <df name="agb_debug">
-          <in>agb_debug.c</in>
-        </df>
-        <df name="assets">
-          <df name="meteor">
-            <in>met_background.c</in>
-            <in>met_clouds.c</in>
-            <in>met_foreground.c</in>
-            <in>met_meteor.c</in>
-            <in>met_sky.c</in>
-          </df>
-        </df>
-        <df name="battle_engine">
-          <in>battle_abilities.c</in>
-          <in>battle_end_of_turn.c</in>
-          <in>battle_help.c</in>
-          <in>battle_initiative.c</in>
-          <in>battle_m_flee_hook.S</in>
-          <in>battle_test.c</in>
-          <in>custom_structs_malloc.c</in>
-          <in>entry_hazards.c</in>
-        </df>
-        <df name="debug">
-          <in>debug.c</in>
-        </df>
-        <df name="dns">
-          <in>dns_core.c</in>
-        </df>
-        <df name="encode">
-          <in>crc32.c</in>
-        </df>
-        <df name="evolution">
-          <in>evolution_methods.c</in>
-        </df>
-        <df name="include">
-          <df name="assets">
-            <df name="mug">
-              <in>mug_00.c</in>
-              <in>mug_01.c</in>
-              <in>mug_02.c</in>
-              <in>mug_05.c</in>
-              <in>mug_06.c</in>
-              <in>mug_07.c</in>
-              <in>mug_08.c</in>
-              <in>mug_09.c</in>
-              <in>mug_10.c</in>
-              <in>mug_11.c</in>
-            </df>
-            <in>ascii.c</in>
-          </df>
-          <in>npc.h</in>
-          <in>save_one.h</in>
-        </df>
-        <df name="interface">
-          <in>textbox_mugshots.c</in>
-        </df>
-        <df name="moves">
-          <df name="ability_changers">
-            <in>ability_change.c</in>
-          </df>
-          <df name="assurance">
-            <in>assurance.c</in>
-          </df>
-          <df name="bride">
-            <in>bride.c</in>
-          </df>
-          <df name="close_combat">
-            <in>close_combat.c</in>
-          </df>
-          <df name="crush_grip_like">
-            <in>hp_damage_mod.c</in>
-          </df>
-          <df name="defog">
-            <in>defog.c</in>
-          </df>
-          <df name="feint">
-            <in>feint.c</in>
-          </df>
-          <df name="gastro_acid">
-            <in>gastro_acid.c</in>
-          </df>
-          <df name="healing_wish">
-            <in>healing_wish.c</in>
-          </df>
-          <df name="lucky_chant">
-            <in>lucky_chant.c</in>
-          </df>
-          <df name="magnet_rise">
-            <in>magnet_rise.c</in>
-          </df>
-          <df name="metal_burst">
-            <in>metal_burst.c</in>
-          </df>
-          <df name="pay_back">
-            <in>pay_back.c</in>
-          </df>
-          <df name="power_trick">
-            <in>power_trick.c</in>
-          </df>
-          <df name="punishment">
-            <in>punishment.c</in>
-          </df>
-          <df name="rooms">
-            <in>rooms.c</in>
-          </df>
-          <df name="roost">
-            <in>roost.c</in>
-          </df>
-          <df name="split_moves">
-            <in>split_moves.c</in>
-          </df>
-          <df name="swap_moves">
-            <in>swap_moves.c</in>
-          </df>
-          <df name="tailwind">
-            <in>tailwind.c</in>
-          </df>
-          <df name="veno_shock">
-            <in>venoshock_has_multiplier.c</in>
-          </df>
-        </df>
-        <df name="music">
-          <in>music_override.c</in>
-        </df>
-        <df name="overworld">
-          <in>grass_animation.c</in>
-          <in>overworld.c</in>
-        </df>
-        <df name="specials">
-          <in>camera_move.c</in>
-          <in>custom_specials.c</in>
-          <in>cutscene_meteor.c</in>
-          <in>load_text_special.c</in>
-          <in>trainer_battle.c</in>
-        </df>
-      </df>
-    </df>
-    <logicalFolder name="ExternalFiles"
-                   displayName="Important Files"
-                   projectFiles="false"
-                   kind="IMPORTANT_FILES_FOLDER">
-      <itemPath>nbproject/private/launcher.properties</itemPath>
-      <itemPath>makefile</itemPath>
-    </logicalFolder>
-    <itemPath>string/de/move_strings.txt</itemPath>
-  </logicalFolder>
-  <sourceFolderFilter>^(nbproject)$</sourceFolderFilter>
-  <sourceRootList>
-    <Elem>.</Elem>
-  </sourceRootList>
-  <projectmakefile>makefile</projectmakefile>
-  <confs>
-    <conf name="Default" type="0">
-      <toolsSet>
-        <compilerSet>Cygwin|Cygwin</compilerSet>
-        <dependencyChecking>false</dependencyChecking>
-        <rebuildPropChanged>false</rebuildPropChanged>
-      </toolsSet>
-      <flagsDictionary>
-        <element flagsID="0" commonFlags="-g -march=armv4t -O3 -std=c99"/>
-      </flagsDictionary>
-      <codeAssistance>
-      </codeAssistance>
-      <makefileType>
-        <makeTool>
-          <buildCommandWorkingDir>.</buildCommandWorkingDir>
-          <buildCommand>make -f makefile LAN=DE -j4 all</buildCommand>
-          <cleanCommand>make -f makefile clean</cleanCommand>
-          <executablePath>object/debug.o</executablePath>
-          <cTool>
-            <incDir>
-              <pElem>src/include</pElem>
-            </incDir>
-          </cTool>
-        </makeTool>
-        <preBuild>
-          <preBuildCommandWorkingDir>.</preBuildCommandWorkingDir>
-          <preBuildCommand></preBuildCommand>
-        </preBuild>
-      </makefileType>
-      <folder path="0/sots-private/sound/Assembler">
-        <cTool>
-          <incDir>
-            <pElem>sots-private/sound/Assembler</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/sots-private/sound/Jukebox/graphics">
-        <cTool>
-          <incDir>
-            <pElem>sots-private/sound/Jukebox/graphics</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src">
-        <cTool>
-          <incDir>
-            <pElem></pElem>
-          </incDir>
-          <preprocessorList>
-            <Elem>BPRE</Elem>
-            <Elem>SOFTWARE_VERSION=0</Elem>
-          </preprocessorList>
-        </cTool>
-      </folder>
-      <folder path="0/src/agb_debug">
-        <cTool>
-          <incDir>
-            <pElem>src/agb_debug</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/assets">
-        <cTool>
-          <incDir>
-            <pElem>src/assets/meteor</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/battle_engine">
-        <cTool>
-          <incDir>
-            <pElem>src/battle_engine</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/debug">
-        <cTool>
-          <incDir>
-            <pElem>src/debug</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/dns">
-        <cTool>
-          <incDir>
-            <pElem>src/dns</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/encode">
-        <cTool>
-          <incDir>
-            <pElem>src/encode</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/evolution">
-        <cTool>
-          <incDir>
-            <pElem>src/evolution</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/include/assets/mug">
-        <cTool>
-          <incDir>
-            <pElem>src/include/assets/mug</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/interface">
-        <cTool>
-          <incDir>
-            <pElem>src/interface</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/ability_changers">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/ability_changers</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/assurance">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/assurance</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/bride">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/bride</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/close_combat">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/close_combat</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/crush_grip_like">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/crush_grip_like</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/defog">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/defog</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/feint">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/feint</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/gastro_acid">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/gastro_acid</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/healing_wish">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/healing_wish</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/lucky_chant">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/lucky_chant</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/magnet_rise">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/magnet_rise</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/metal_burst">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/metal_burst</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/pay_back">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/pay_back</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/power_trick">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/power_trick</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/punishment">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/punishment</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/rooms">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/rooms</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/roost">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/roost</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/split_moves">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/split_moves</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/swap_moves">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/swap_moves</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/tailwind">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/tailwind</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/moves/veno_shock">
-        <cTool>
-          <incDir>
-            <pElem>src/moves/veno_shock</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/music">
-        <cTool>
-          <incDir>
-            <pElem>src/music</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/overworld">
-        <cTool>
-          <incDir>
-            <pElem>src/overworld</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <folder path="0/src/specials">
-        <cTool>
-          <incDir>
-            <pElem>src/specials</pElem>
-          </incDir>
-        </cTool>
-      </folder>
-      <item path="sots-private/sound/Assembler/musicInjector.c"
-            ex="false"
-            tool="0"
-            flavor2="2">
-      </item>
-      <item path="sots-private/sound/Jukebox/effects.c"
-            ex="false"
-            tool="0"
-            flavor2="2">
-        <cTool>
-          <incDir>
-            <pElem>sots-private/sound/Jukebox</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="sots-private/sound/Jukebox/graphics/background.c"
-            ex="false"
-            tool="0"
-            flavor2="2">
-      </item>
-      <item path="sots-private/sound/Jukebox/graphics/cassette.c"
-            ex="false"
-            tool="0"
-            flavor2="2">
-      </item>
-      <item path="sots-private/sound/Jukebox/main.c" ex="false" tool="0" flavor2="2">
-        <cTool>
-          <incDir>
-            <pElem>sots-private/sound/Jukebox</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="sots-private/sound/Jukebox/sots.c" ex="false" tool="0" flavor2="2">
-        <cTool>
-          <incDir>
-            <pElem>sots-private/sound/Jukebox</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="src/agb_debug/agb_debug.c" ex="false" tool="0" flavor2="3">
-      </item>
-      <item path="src/assets/meteor/met_background.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/assets/meteor/met_clouds.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/assets/meteor/met_foreground.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/assets/meteor/met_meteor.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/assets/meteor/met_sky.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/battle_engine/battle_abilities.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/battle_engine/battle_end_of_turn.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/battle_engine/battle_help.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/battle_engine/battle_initiative.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/battle_engine/battle_m_flee_hook.S"
-            ex="false"
-            tool="4"
-            flavor2="0">
-      </item>
-      <item path="src/battle_engine/battle_test.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/battle_engine/custom_structs_malloc.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/battle_engine/entry_hazards.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/debug/debug.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/dns/dns_core.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/encode/crc32.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/evolution/evolution_methods.c" ex="false" tool="0" flavor2="3">
-      </item>
-      <item path="src/include/assets/ascii.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-          <incDir>
-            <pElem>src/include/assets</pElem>
-          </incDir>
-        </cTool>
-      </item>
-      <item path="src/include/assets/mug/mug_00.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/include/assets/mug/mug_01.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/include/assets/mug/mug_02.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/include/assets/mug/mug_05.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/include/assets/mug/mug_06.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/include/assets/mug/mug_07.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/include/assets/mug/mug_08.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/include/assets/mug/mug_09.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/include/assets/mug/mug_10.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/include/assets/mug/mug_11.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/include/npc.h" ex="false" tool="3" flavor2="0">
-      </item>
-      <item path="src/include/save_one.h" ex="false" tool="3" flavor2="0">
-      </item>
-      <item path="src/interface/textbox_mugshots.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/ability_changers/ability_change.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/assurance/assurance.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/bride/bride.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/close_combat/close_combat.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/crush_grip_like/hp_damage_mod.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/defog/defog.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/feint/feint.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/gastro_acid/gastro_acid.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/healing_wish/healing_wish.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/lucky_chant/lucky_chant.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/magnet_rise/magnet_rise.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/metal_burst/metal_burst.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/pay_back/pay_back.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/power_trick/power_trick.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/punishment/punishment.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/rooms/rooms.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/roost/roost.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/split_moves/split_moves.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/swap_moves/swap_moves.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/tailwind/tailwind.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/moves/veno_shock/venoshock_has_multiplier.c"
-            ex="false"
-            tool="0"
-            flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/music/music_override.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/overworld/grass_animation.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/overworld/overworld.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/specials/camera_move.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/specials/custom_specials.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/specials/cutscene_meteor.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/specials/load_text_special.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-      <item path="src/specials/trainer_battle.c" ex="false" tool="0" flavor2="3">
-        <cTool flags="0">
-        </cTool>
-      </item>
-    </conf>
-  </confs>
-</configurationDescriptor>

nbproject/licenseheader.txt

@@ -1,21 +0,0 @@
-/****************************************************************************
- * Copyright (C) 2015-2016 by the SotS Team                                 *
- *                                                                          *
- * This file is part of Sovereign of the Skies.                             *
- *                                                                          *
- *   Sovereign of the Skies is free software: you can redistribute it       *
- *   and/or modify it                                                       *
- *   under the terms of the GNU Lesser General Public License as published  *
- *   by the Free Software Foundation, either version 3 of the License, or   *
- *   (at your option) any later version provided you include a copy of the  *
- *   licence and this header.                                               *
- *                                                                          *
- *   Sovereign of the Skies is distributed in the hope that it will be      *
- *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
- *   GNU Lesser General Public License for more details.                    *
- *                                                                          *
- *   You should have received a copy of the GNU Lesser General Public       *
- *   License along with Sovereign of the Skies.                             *
- *   If not, see <http://www.gnu.org/licenses/>.                            *
- ****************************************************************************/

nbproject/private/CodeAssistancePathMapper.properties

@@ -1 +0,0 @@
-# Automatic path mapper. CRC = 1

nbproject/private/c_standard_headers_indexer.c

@@ -1,75 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
-
-// List of standard headers was taken in http://en.cppreference.com/w/c/header
-
-#include <assert.h> 	 // Conditionally compiled macro that compares its argument to zero
-#include <ctype.h> 	 // Functions to determine the type contained in character data
-#include <errno.h> 	 // Macros reporting error conditions
-#include <float.h> 	 // Limits of float types
-#include <limits.h> 	 // Sizes of basic types
-#include <locale.h> 	 // Localization utilities
-#include <math.h> 	 // Common mathematics functions
-#include <setjmp.h> 	 // Nonlocal jumps
-#include <signal.h> 	 // Signal handling
-#include <stdarg.h> 	 // Variable arguments
-#include <stddef.h> 	 // Common macro definitions
-#include <stdio.h> 	 // Input/output
-#include <string.h> 	 // String handling
-#include <stdlib.h> 	 // General utilities: memory management, program utilities, string conversions, random numbers
-#include <time.h> 	 // Time/date utilities
-#include <iso646.h>      // (since C95) Alternative operator spellings
-#include <wchar.h>       // (since C95) Extended multibyte and wide character utilities
-#include <wctype.h>      // (since C95) Wide character classification and mapping utilities
-#ifdef _STDC_C99
-#include <complex.h>     // (since C99) Complex number arithmetic
-#include <fenv.h>        // (since C99) Floating-point environment
-#include <inttypes.h>    // (since C99) Format conversion of integer types
-#include <stdbool.h>     // (since C99) Boolean type
-#include <stdint.h>      // (since C99) Fixed-width integer types
-#include <tgmath.h>      // (since C99) Type-generic math (macros wrapping math.h and complex.h)
-#endif
-#ifdef _STDC_C11
-#include <stdalign.h>    // (since C11) alignas and alignof convenience macros
-#include <stdatomic.h>   // (since C11) Atomic types
-#include <stdnoreturn.h> // (since C11) noreturn convenience macros
-#include <threads.h>     // (since C11) Thread library
-#include <uchar.h>       // (since C11) UTF-16 and UTF-32 character utilities
-#endif

nbproject/private/cpp_standard_headers_indexer.cpp

@@ -1,135 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- *
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
- *
- * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
- * Other names may be trademarks of their respective owners.
- *
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common
- * Development and Distribution License("CDDL") (collectively, the
- * "License"). You may not use this file except in compliance with the
- * License. You can obtain a copy of the License at
- * http://www.netbeans.org/cddl-gplv2.html
- * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
- * specific language governing permissions and limitations under the
- * License.  When distributing the software, include this License Header
- * Notice in each file and include the License file at
- * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the GPL Version 2 section of the License file that
- * accompanied this code. If applicable, add the following below the
- * License Header, with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * If you wish your version of this file to be governed by only the CDDL
- * or only the GPL Version 2, indicate your decision by adding
- * "[Contributor] elects to include this software in this distribution
- * under the [CDDL or GPL Version 2] license." If you do not indicate a
- * single choice of license, a recipient has the option to distribute
- * your version of this file under either the CDDL, the GPL Version 2 or
- * to extend the choice of license to its licensees as provided above.
- * However, if you add GPL Version 2 code and therefore, elected the GPL
- * Version 2 license, then the option applies only if the new code is
- * made subject to such option by the copyright holder.
- *
- * Contributor(s):
- */
-
-// List of standard headers was taken in http://en.cppreference.com/w/cpp/header
-
-#include <cstdlib> 	    // General purpose utilities: program control, dynamic memory allocation, random numbers, sort and search
-#include <csignal> 	    // Functions and macro constants for signal management
-#include <csetjmp> 	    // Macro (and function) that saves (and jumps) to an execution context
-#include <cstdarg> 	    // Handling of variable length argument lists
-#include <typeinfo> 	    // Runtime type information utilities
-#include <bitset> 	    // std::bitset class template
-#include <functional> 	    // Function objects, designed for use with the standard algorithms
-#include <utility> 	    // Various utility components
-#include <ctime> 	    // C-style time/date utilites
-#include <cstddef> 	    // typedefs for types such as size_t, NULL and others
-#include <new> 	            // Low-level memory management utilities
-#include <memory> 	    // Higher level memory management utilities
-#include <climits>          // limits of integral types
-#include <cfloat> 	    // limits of float types
-#include <limits> 	    // standardized way to query properties of arithmetic types
-#include <exception> 	    // Exception handling utilities
-#include <stdexcept> 	    // Standard exception objects
-#include <cassert> 	    // Conditionally compiled macro that compares its argument to zero
-#include <cerrno>           // Macro containing the last error number
-#include <cctype>           // functions to determine the type contained in character data
-#include <cwctype>          // functions for determining the type of wide character data
-#include <cstring> 	    // various narrow character string handling functions
-#include <cwchar> 	    // various wide and multibyte string handling functions
-#include <string> 	    // std::basic_string class template
-#include <vector> 	    // std::vector container
-#include <deque> 	    // std::deque container
-#include <list> 	    // std::list container
-#include <set> 	            // std::set and std::multiset associative containers
-#include <map> 	            // std::map and std::multimap associative containers
-#include <stack> 	    // std::stack container adaptor
-#include <queue> 	    // std::queue and std::priority_queue container adaptors
-#include <algorithm> 	    // Algorithms that operate on containers
-#include <iterator> 	    // Container iterators
-#include <cmath>            // Common mathematics functions
-#include <complex>          // Complex number type
-#include <valarray>         // Class for representing and manipulating arrays of values
-#include <numeric>          // Numeric operations on values in containers
-#include <iosfwd>           // forward declarations of all classes in the input/output library
-#include <ios>              // std::ios_base class, std::basic_ios class template and several typedefs
-#include <istream>          // std::basic_istream class template and several typedefs
-#include <ostream>          // std::basic_ostream, std::basic_iostream class templates and several typedefs
-#include <iostream>         // several standard stream objects
-#include <fstream>          // std::basic_fstream, std::basic_ifstream, std::basic_ofstream class templates and several typedefs
-#include <sstream>          // std::basic_stringstream, std::basic_istringstream, std::basic_ostringstream class templates and several typedefs
-#include <strstream>        // std::strstream, std::istrstream, std::ostrstream(deprecated)
-#include <iomanip>          // Helper functions to control the format or input and output
-#include <streambuf>        // std::basic_streambuf class template
-#include <cstdio>           // C-style input-output functions
-#include <locale>           // Localization utilities
-#include <clocale>          // C localization utilities
-#include <ciso646>          // empty header. The macros that appear in iso646.h in C are keywords in C++
-#if __cplusplus >= 201103L
-#include <typeindex>        // (since C++11) 	std::type_index
-#include <type_traits>      // (since C++11) 	Compile-time type information
-#include <chrono>           // (since C++11) 	C++ time utilites
-#include <initializer_list> // (since C++11) 	std::initializer_list class template
-#include <tuple>            // (since C++11) 	std::tuple class template
-#include <scoped_allocator> // (since C++11) 	Nested allocator class
-#include <cstdint>          // (since C++11) 	fixed-size types and limits of other types
-#include <cinttypes>        // (since C++11) 	formatting macros , intmax_t and uintmax_t math and conversions
-#include <system_error>     // (since C++11) 	defines std::error_code, a platform-dependent error code
-#include <cuchar>           // (since C++11) 	C-style Unicode character conversion functions
-#include <array>            // (since C++11) 	std::array container
-#include <forward_list>     // (since C++11) 	std::forward_list container
-#include <unordered_set>    // (since C++11) 	std::unordered_set and std::unordered_multiset unordered associative containers
-#include <unordered_map>    // (since C++11) 	std::unordered_map and std::unordered_multimap unordered associative containers
-#include <random>           // (since C++11) 	Random number generators and distributions
-#include <ratio>            // (since C++11) 	Compile-time rational arithmetic
-#include <cfenv>            // (since C++11) 	Floating-point environment access functions
-#include <codecvt>          // (since C++11) 	Unicode conversion facilities
-#include <regex>            // (since C++11) 	Classes, algorithms and iterators to support regular expression processing
-#include <atomic>           // (since C++11) 	Atomic operations library
-#include <ccomplex>         // (since C++11)(deprecated in C++17) 	simply includes the header <complex>
-#include <ctgmath>          // (since C++11)(deprecated in C++17) 	simply includes the headers <ccomplex> (until C++17)<complex> (since C++17) and <cmath>: the overloads equivalent to the contents of the C header tgmath.h are already provided by those headers
-#include <cstdalign>        // (since C++11)(deprecated in C++17) 	defines one compatibility macro constant
-#include <cstdbool>         // (since C++11)(deprecated in C++17) 	defines one compatibility macro constant
-#include <thread>           // (since C++11) 	std::thread class and supporting functions
-#include <mutex>            // (since C++11) 	mutual exclusion primitives
-#include <future>           // (since C++11) 	primitives for asynchronous computations
-#include <condition_variable> // (since C++11) 	thread waiting conditions
-#endif
-#if __cplusplus >= 201300L
-#include <shared_mutex>     // (since C++14) 	shared mutual exclusion primitives
-#endif
-#if __cplusplus >= 201500L
-#include <any>              // (since C++17) 	std::any class template
-#include <optional>         // (since C++17) 	std::optional class template
-#include <variant>          // (since C++17) 	std::variant class template
-#include <memory_resource>  // (since C++17) 	Polymorphic allocators and memory resources
-#include <string_view>      // (since C++17) 	std::basic_string_view class template
-#include <execution>        // (since C++17) 	Predefined execution policies for parallel versions of the algorithms
-#include <filesystem>       // (since C++17) 	std::path class and supporting functions
-#endif

nbproject/private/launcher.properties

@@ -1,40 +0,0 @@
-# Launchers File syntax:
-#
-# [Must-have property line] 
-# launcher1.runCommand=<Run Command>
-# [Optional extra properties] 
-# launcher1.displayName=<Display Name, runCommand by default>
-# launcher1.buildCommand=<Build Command, Build Command specified in project properties by default>
-# launcher1.runDir=<Run Directory, ${PROJECT_DIR} by default>
-# launcher1.symbolFiles=<Symbol Files loaded by debugger, ${OUTPUT_PATH} by default>
-# launcher1.env.<Environment variable KEY>=<Environment variable VALUE>
-# (If this value is quoted with ` it is handled as a native command which execution result will become the value)
-# [Common launcher properties]
-# common.runDir=<Run Directory>
-# (This value is overwritten by a launcher specific runDir value if the latter exists)
-# common.env.<Environment variable KEY>=<Environment variable VALUE>
-# (Environment variables from common launcher are merged with launcher specific variables)
-# common.symbolFiles=<Symbol Files loaded by debugger>
-# (This value is overwritten by a launcher specific symbolFiles value if the latter exists)
-#
-# In runDir, symbolFiles and env fields you can use these macroses:
-# ${PROJECT_DIR}    -   project directory absolute path
-# ${OUTPUT_PATH}    -   linker output path (relative to project directory path)
-# ${OUTPUT_BASENAME}-   linker output filename
-# ${TESTDIR}        -   test files directory (relative to project directory path)
-# ${OBJECTDIR}      -   object files directory (relative to project directory path)
-# ${CND_DISTDIR}    -   distribution directory (relative to project directory path)
-# ${CND_BUILDDIR}   -   build directory (relative to project directory path)
-# ${CND_PLATFORM}   -   platform name
-# ${CND_CONF}       -   configuration name
-# ${CND_DLIB_EXT}   -   dynamic library extension
-#
-# All the project launchers must be listed in the file!
-#
-# launcher1.runCommand=...
-# launcher2.runCommand=...
-# ...
-# common.runDir=...
-# common.env.KEY=VALUE
-
-# launcher1.runCommand=<type your run command here>

nbproject/private/private.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <code-assistance-data xmlns="http://www.netbeans.org/ns/make-project-private/1">
-        <code-model-enabled>true</code-model-enabled>
-    </code-assistance-data>
-    <data xmlns="http://www.netbeans.org/ns/make-project-private/1">
-        <activeConfTypeElem>0</activeConfTypeElem>
-        <activeConfIndexElem>0</activeConfIndexElem>
-    </data>
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="1">
-        <file>
-            <url>data/moves/move_data.S</url>
-            <bookmark id="1">
-                <name/>
-                <line>0</line>
-                <key/>
-            </bookmark>
-        </file>
-    </editor-bookmarks>
-    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
-        <group>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/grass_animation.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/oe_animation.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/overworld/overworld.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/data/raw_defines.s</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/game_engine.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/save_one.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/npc.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/include/types.h</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/src/specials/load_text_special.c</file>
-            <file>file:/C:/cygwin64/home/auerp/sots/source_of_the_sovereign/patches/overworlds/overworld.asm</file>
-        </group>
-    </open-files>
-</project-private>

nbproject/project.properties

@@ -1,2 +0,0 @@
-#Tue Apr 11 04:30:14 CEST 2017
-project.licensePath=./nbproject/licenseheader.txt

nbproject/project.xml

@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.cnd.makeproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>source_of_the_sovereign</name>
-            <c-extensions>c</c-extensions>
-            <cpp-extensions/>
-            <header-extensions>h</header-extensions>
-            <sourceEncoding>UTF-8</sourceEncoding>
-            <make-dep-projects/>
-            <sourceRootList>
-                <sourceRootElem>.</sourceRootElem>
-            </sourceRootList>
-            <confList>
-                <confElem>
-                    <name>Default</name>
-                    <type>0</type>
-                </confElem>
-            </confList>
-            <formatting>
-                <project-formatting-style>false</project-formatting-style>
-            </formatting>
-        </data>
-    </configuration>
-</project>

sots-private

@@ -1 +1 @@
-Subproject commit 4f1b4a1a0a474102f150ef72de752fa79b9eec82
+Subproject commit d188b0be724b2c158633aadc18c1e05e09d79583

sprites.makefile

@@ -1,6 +1,7 @@
-AS = arm-none-eabi-as
-AR = arm-none-eabi-ar
-LD = arm-none-eabi-ld
+AS = @arm-none-eabi-as
+AR = @arm-none-eabi-ar
+LD = @arm-none-eabi-ld
+GRIT = @grit
 
 GFX_BUILD_DIR = gfx_build
 TMP_LD = $(GFX_BUILD_DIR)/tmp.ld
@@ -32,12 +33,6 @@ O_HEROINE := $(GFX_BUILD_DIR)/char/heroine_backsprite.o
 O_HERO_B := $(GFX_BUILD_DIR)/char/hero_bag.o
 O_HEROINE_B := $(GFX_BUILD_DIR)/char/heroine_bag.o
 
-PNG_BOOT := $(ASSET_ROOT)/misc/boot/boot_tileset.png
-
-S_BOOT := $(GFX_BUILD_DIR)/boot/boot_tileset.S
-
-O_BOOT := $(GFX_BUILD_DIR)/boot/boot_tileset.o
-
 S_TITLE_BG := $(GFX_BUILD_DIR)/title_screen/title_tileset_background.S
 S_TITLE_AEON := $(GFX_BUILD_DIR)/title_screen/title_tileset_latias_latios_deoxys.S
 S_TITLE_LOGO := $(GFX_BUILD_DIR)/title_screen/title_tileset_logo_name.S
@@ -89,14 +84,14 @@ clean:
 	rm -f $(GFX_BUILD_DIR)/sprites/back_sprites/*
 	rm -f $(GFX_BUILD_DIR)/overworlds/*
 	rm -f $(GFX_BUILD_DIR)/item/*
-	rm -f $(GFX_BUILD_DIR)/boot/*
 	rm -f $(GFX_BUILD_DIR)/char/*
 	rm -f $(GFX_BUILD_DIR)/title_screen/*
 	rm -f $(GFX_BUILD_DIR)/trainer_sprites/*
 
 
-$(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(HERO_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ) $(TITLE_OBJ) $(O_BOOT)
-	echo "INPUT($^)" > $(TMP_LD)
+$(SPRITES_BINARY): $(NORMAL_PAL_OBJ) $(HERO_OBJ) $(SHINY_PAL_OBJ) $(SPRITE_FRONT_OBJ) $(SPRITE_BACK_OBJ) $(NORMAL_CASTFORM_PAL_OBJ) $(SHINY_CASTFORM_PAL_OBJ) $(CASTFORM_FRONT_OBJ) $(CASTFORM_BACK_OBJ) $(OW_OBJ) $(TS_OBJ) $(ITEM_OBJ) $(TITLE_OBJ)
+	@echo -e "\e[1;32mLinking $@\e[0m"
+	@echo "INPUT($^)" > $(TMP_LD)
 	$(LD) -r -o $@ -T $(TMP_LD)
 
 # Characters
@@ -104,143 +99,152 @@ $(GFX_BUILD_DIR)/char/%.o: $(GFX_BUILD_DIR)/char/%.S
 	$(AS) -o $@ $<
 
 $(S_HERO): $(PNG_HERO)
-	grit $< -fts -fh! -gt -gB4 -gz! -p -pzl -m! -pu16 -o $@
+	$(GRIT) $< -fts -fh! -gt -gB4 -gz! -p -pzl -m! -pu16 -o $@
 
 $(S_HERO_B): $(PNG_HERO_B)
-	grit $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
+	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
 
 $(S_HEROINE): $(PNG_HEROINE)
-	grit $< -fts -fh! -gt -gB4 -gz! -p -pzl -m! -pu16 -o $@
+	$(GRIT) $< -fts -fh! -gt -gB4 -gz! -p -pzl -m! -pu16 -o $@
 
 $(S_HEROINE_B): $(PNG_HEROINE_B)
-	grit $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
-
-
-# Boot Screen
-$(GFX_BUILD_DIR)/boot/%.o: $(GFX_BUILD_DIR)/boot/%.S
-	$(AS) -o $@ $<
-
-$(S_BOOT): $(PNG_BOOT)
-	grit $< -fts -fh! -gt -gB4 -gzl -p -pz! -m -mzl -mRtpf -pu16 -o $@
+	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
 
 # Special titlescreen targets
 $(GFX_BUILD_DIR)/title_screen/%.o: $(GFX_BUILD_DIR)/title_screen/%.S
 	$(AS) -o $@ $<
 
 $(S_TITLE_BG): $(PNG_TITLE_BG)
-	grit $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 4 -mRtf -pu16 -o $@
+	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 4 -mRtf -pu16 -o $@
 
 $(S_TITLE_AEON): $(PNG_TITLE_AEON)
-	grit $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 2 -mRtf -pu16 -o $@
+	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 2 -mRtf -pu16 -o $@
 
 $(S_TITLE_LOGO): $(PNG_TITLE_LOGO)
-	grit $< -fts -fh! -gt -gB8 -gzl -p! -pz! -m -mzl -mRtf -pu16 -o $@
+	$(GRIT) $< -fts -fh! -gt -gB8 -gzl -p! -pz! -m -mzl -mRtf -pu16 -o $@
 
 $(S_TITLE_START): $(PNG_TITLE_START)
-	grit $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 3 -mRtf -pu16 -o $@
+	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p! -pz! -m -mzl -mp 3 -mRtf -pu16 -o $@
 
 $(S_TITLE_CLOUD): $(PNG_TITLE_CLOUD)
-	grit $< -fts -fh! -gt -gB4 -gzl -p -pz! -m! -pu16 -o $@
+	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pz! -m! -pu16 -o $@
 
 
 
 # Item Targets
 $(GFX_BUILD_DIR)/item/%.o: $(GFX_BUILD_DIR)/item/%.s
+	@echo -e "\e[32mAssembling $<\e[0m"
 	$(AS) -o $@ $<
 
 .PRECIOUS: $(GFX_BUILD_DIR)/item/%.s
 $(GFX_BUILD_DIR)/item/%.s: $(ASSET_ROOT)/item_icons/%.png
-	grit $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
+	@echo -e "\e[34mProcessing image $<\e[0m"
+	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -pu16 -o $@
 
 # OW Targets
 $(GFX_BUILD_DIR)/overworlds/%.o: $(GFX_BUILD_DIR)/overworlds/%.s
+	@echo -e "\e[32mAssembling $<\e[0m"
 	$(AS) -o $@ $<
 
 .PRECIOUS: $(GFX_BUILD_DIR)/overworlds/%.s
 $(GFX_BUILD_DIR)/overworlds/%.s: $(ASSET_ROOT)/overworld/%.png
-	grit $< -fts -fh! -gt -gB4 -gz! -p -pz! -m! -pu16 -o $@
+	@echo -e "\e[34mProcessing image $<\e[0m"
+	$(GRIT) $< -fts -fh! -gt -gB4 -gz! -p -pz! -m! -pu16 -o $@
 
 # Trainer Sprite Targets
 $(GFX_BUILD_DIR)/trainer_sprites/%.o: $(GFX_BUILD_DIR)/trainer_sprites/%.s
+	@echo -e "\e[32mAssembling $<\e[0m"
 	$(AS) -o $@ $<
 
-.PRECIOUS: $(GFX_BUILD_DIR)/trainer_sprites/%.s
 $(GFX_BUILD_DIR)/trainer_sprites/%.s: $(ASSET_ROOT)/trainer_sprites/%.png
-	grit $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -o $@
+	@echo -e "\e[34mProcessing image $<\e[0m"
+	$(GRIT) $< -fts -fh! -gt -gB4 -gzl -p -pzl -m! -o $@
 
 # Normal Palette Targets
 $(GFX_BUILD_DIR)/sprites/normal_pal/%.o: $(GFX_BUILD_DIR)/sprites/normal_pal/%.s
+	@echo -e "\e[32mAssembling $<\e[0m"
 	$(AS) -o $@ $<
 
-.PRECIOUS: $(GFX_BUILD_DIR)/sprites/normal_pal/%.s
 $(GFX_BUILD_DIR)/sprites/normal_pal/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
-	grit $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 16 \
+	@echo -e "\e[34mProcessing palette $< (normal)\e[0m"
+	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 16 \
 		-s $(shell echo $(notdir $(basename $<)) | sed "s/normal_/n_p_/g") \
 		-o $@
 
 
 # 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 $@ $<
 
-.PRECIOUS: $(GFX_BUILD_DIR)/sprites/shiny_pal/%.s
 $(GFX_BUILD_DIR)/sprites/shiny_pal/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
-	grit $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 16 \
+	@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 $@ $<
 
-.PRECIOUS: $(GFX_BUILD_DIR)/sprites/front_sprites/%.s
 $(GFX_BUILD_DIR)/sprites/front_sprites/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
-	grit $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 64 -m! -p! \
+	@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 $@ $<
 
-.PRECIOUS: $(GFX_BUILD_DIR)/sprites/back_sprites/%.s
 $(GFX_BUILD_DIR)/sprites/back_sprites/%.s: $(ASSET_ROOT)/pkmn_sprites/%.png
-	grit $< -fts -fh! -g -gB 4 -gt -gzl -al 64 -aw 64 -m! -p! \
+	@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
 $(NORMAL_CASTFORM_PAL_OBJ): $(NORMAL_CASTFORM_PAL_OBJ:.o=.s)
+	@echo -e "\e[32mAssembling $<\e[0m"
 	$(AS) -o $@ $<
 
 $(NORMAL_CASTFORM_PAL_OBJ:.o=.s): $(CASTFORM_PNG)
-	grit $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 64 \
+	@echo -e "\e[34mProcessing palette $< (normal)\e[0m"
+	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 64 \
 		-s n_p_0385 -o $@
 
 
 $(SHINY_CASTFORM_PAL_OBJ): $(SHINY_CASTFORM_PAL_OBJ:.o=.s)
+	@echo -e "\e[32mAssembling $<\e[0m"
 	$(AS) -o $@ $<
 
 $(SHINY_CASTFORM_PAL_OBJ:.o=.s): $(CASTFORM_PNG)
-	grit $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 64 \
+	@echo -e "\e[34mProcessing palette $< (shiny)\e[0m"
+	$(GRIT) $< -fts -fh! -g! -gB 4 -gt -m! -p -pzl -pu16 -pn 64 \
 		-s s_p_0385 -o $@
 
 
 $(CASTFORM_FRONT_OBJ): $(CASTFORM_FRONT_OBJ:.o=.s)
+	@echo -e "\e[32mAssembling $<\e[0m"
 	$(AS) -o $@ $<
 
 $(CASTFORM_FRONT_OBJ:.o=.s): $(CASTFORM_PNG)
-	grit $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 256 -ah 64 -m! -p! \
+	@echo -e "\e[34mProcessing sprite $< (front)\e[0m"
+	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 256 -ah 64 -m! -p! \
 		-s front_0385 -o $@
 
 
 $(CASTFORM_BACK_OBJ): $(CASTFORM_BACK_OBJ:.o=.s)
+	@echo -e "\e[32mAssembling $<\e[0m"
 	$(AS) -o $@ $<
 
 $(CASTFORM_BACK_OBJ:.o=.s): $(CASTFORM_PNG)
-	grit $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 256 -at 64 -ah 64 -m! -p! \
+	@echo -e "\e[34mProcessing sprite $< (back)\e[0m"
+	$(GRIT) $< -fts -fh! -g -gB 4 -gt -gzl -al 0 -aw 256 -at 64 -ah 64 -m! -p! \
 		-s back_0385 -o $@