7 年前 · ce1392b623
--- a/data/overworld/wild_pokemon_data.S
+++ b/data/overworld/wild_pokemon_data.S
--- a/data/trainer/trainer_money_rate.s
+++ b/data/trainer/trainer_money_rate.s
--- a/data/trainer/trainer_pkmn_data.s
+++ b/data/trainer/trainer_pkmn_data.s
--- a/gfx_build/item/.gitignore
+++ b/gfx_build/item/.gitignore
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -201,7 +201,7 @@
 
				   <confs>

			
 
				     <conf name="Default" type="0">

			
 
				       <toolsSet>

			
 
				-        <compilerSet>Cygwin_something|Cygwin</compilerSet>

			
 
				+        <compilerSet>Cygwin|Cygwin</compilerSet>

			
 
				         <dependencyChecking>false</dependencyChecking>

			
 
				         <rebuildPropChanged>false</rebuildPropChanged>

			
 
				         <prependToolCollectionPath>false</prependToolCollectionPath>

			
--- a/nbproject/private/configurations.xml
+++ b/nbproject/private/configurations.xml
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
--- a/nbproject/private/tools/localhost/Cygwin_something/arm-none-eabi-gcc.exe
+++ b/nbproject/private/tools/localhost/Cygwin_something/arm-none-eabi-gcc.exe
--- a/patches/graphics/boot.asm
+++ b/patches/graphics/boot.asm
--- a/patches/graphics/char.asm
+++ b/patches/graphics/char.asm
--- a/patches/graphics/title.asm
+++ b/patches/graphics/title.asm
--- a/patches/overworlds/pkm_wild.asm
+++ b/patches/overworlds/pkm_wild.asm
--- a/patches/trainer_sprites/trainer_data.asm
+++ b/patches/trainer_sprites/trainer_data.asm
--- a/src/agb_debug/agb_debug.c
+++ b/src/agb_debug/agb_debug.c
--- a/src/include/applymovements.h
+++ b/src/include/applymovements.h
--- a/src/include/script_language.h
+++ b/src/include/script_language.h
--- a/string/de/item_description.txt
+++ b/string/de/item_description.txt
--- a/string/de/pkmn_data/pokedex_data.txt
+++ b/string/de/pkmn_data/pokedex_data.txt
--- a/string/de/pkmn_data/pokedex_entries.txt
+++ b/string/de/pkmn_data/pokedex_entries.txt
--- a/string/de/pkmn_data/pokemon_names.txt
+++ b/string/de/pkmn_data/pokemon_names.txt
--- a/string/de/trainers/trainer_data.txt
+++ b/string/de/trainers/trainer_data.txt
--- a/string/de/trainers/trainerclasses.txt
+++ b/string/de/trainers/trainerclasses.txt