8 лет назад · 6661dc7322
--- a/assets/interface/arrows.png
+++ b/assets/interface/arrows.png
--- a/assets/interface/emoticons.png
+++ b/assets/interface/emoticons.png
--- a/assets/interface/menu_box.png
+++ b/assets/interface/menu_box.png
--- a/assets/interface/text_box.png
+++ b/assets/interface/text_box.png
--- a/assets/mug/mug_00.png
+++ b/assets/mug/mug_00.png
--- a/assets/mug/mug_01.png
+++ b/assets/mug/mug_01.png
--- a/assets/mug/mug_02.png
+++ b/assets/mug/mug_02.png
--- a/assets/mug/mug_05.png
+++ b/assets/mug/mug_05.png
--- a/assets/mug/mug_06.png
+++ b/assets/mug/mug_06.png
--- a/assets/mug/mug_07.png
+++ b/assets/mug/mug_07.png
--- a/assets/mug/mug_08.png
+++ b/assets/mug/mug_08.png
--- a/assets/mug/mug_09.png
+++ b/assets/mug/mug_09.png
--- a/assets/mug/mug_10.png
+++ b/assets/mug/mug_10.png
--- a/assets/mug/mug_11.png
+++ b/assets/mug/mug_11.png
--- a/data/raw_defines.s
+++ b/data/raw_defines.s
--- a/data/text_lookup/text_lookup_array.s
+++ b/data/text_lookup/text_lookup_array.s
--- a/data/text_lookup/text_multichoice.s
+++ b/data/text_lookup/text_multichoice.s
--- a/nbproject/licenseheader.txt
+++ b/nbproject/licenseheader.txt
--- a/nbproject/private/CodeAssistancePathMapper.properties
+++ b/nbproject/private/CodeAssistancePathMapper.properties
--- a/nbproject/private/Default.properties
+++ b/nbproject/private/Default.properties
--- a/nbproject/private/c_standard_headers_indexer.c
+++ b/nbproject/private/c_standard_headers_indexer.c
--- a/nbproject/private/cpp_standard_headers_indexer.cpp
+++ b/nbproject/private/cpp_standard_headers_indexer.cpp
--- a/nbproject/private/tools/localhost/Cygwin/g++.exe
+++ b/nbproject/private/tools/localhost/Cygwin/g++.exe
--- a/nbproject/private/tools/localhost/Cygwin/gcc.exe
+++ b/nbproject/private/tools/localhost/Cygwin/gcc.exe
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
--- a/patches/interface.asm
+++ b/patches/interface.asm
--- a/patches/text_system.asm
+++ b/patches/text_system.asm
--- a/src/debug/debug.c
+++ b/src/debug/debug.c
--- a/src/include/assets/interface/arrows.img.bin
+++ b/src/include/assets/interface/arrows.img.bin
--- a/src/include/assets/interface/arrows.img.h
+++ b/src/include/assets/interface/arrows.img.h
--- a/src/include/assets/interface/emoticons.img.bin
+++ b/src/include/assets/interface/emoticons.img.bin
--- a/src/include/assets/interface/emoticons.img.h
+++ b/src/include/assets/interface/emoticons.img.h
--- a/src/include/assets/interface/menu_box.img.bin
+++ b/src/include/assets/interface/menu_box.img.bin
--- a/src/include/assets/interface/menu_box.img.h
+++ b/src/include/assets/interface/menu_box.img.h
@@ -7,7 +7,7 @@
 
				 //	+ 111 tiles not compressed

			
 
				 //	Total size: 3552 = 3552

			
 
				 //

			
 
				-//	Time-stamp: 2017-01-01, 16:49:47

			
 
				+//	Time-stamp: 2017-01-01, 17:52:58

			
 
				 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6

			
 
				 //	( http://www.coranac.com/projects/#grit )

			
 
				 //

			
--- a/src/include/assets/interface/text_box.img.bin
+++ b/src/include/assets/interface/text_box.img.bin
--- a/src/include/assets/interface/text_box.img.h
+++ b/src/include/assets/interface/text_box.img.h
@@ -7,7 +7,7 @@
 
				 //	+ 38 tiles not compressed

			
 
				 //	Total size: 1216 = 1216

			
 
				 //

			
 
				-//	Time-stamp: 2017-01-01, 16:49:47

			
 
				+//	Time-stamp: 2017-01-01, 17:52:58

			
 
				 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6

			
 
				 //	( http://www.coranac.com/projects/#grit )

			
 
				 //

			
--- a/src/include/assets/mug/mug_00.c
+++ b/src/include/assets/mug/mug_00.c
--- a/src/include/assets/mug/mug_00.h
+++ b/src/include/assets/mug/mug_00.h
--- a/src/include/assets/mug/mug_01.c
+++ b/src/include/assets/mug/mug_01.c
--- a/src/include/assets/mug/mug_01.h
+++ b/src/include/assets/mug/mug_01.h
--- a/src/include/assets/mug/mug_02.c
+++ b/src/include/assets/mug/mug_02.c
--- a/src/include/assets/mug/mug_02.h
+++ b/src/include/assets/mug/mug_02.h
--- a/src/include/assets/mug/mug_05.c
+++ b/src/include/assets/mug/mug_05.c
--- a/src/include/assets/mug/mug_05.h
+++ b/src/include/assets/mug/mug_05.h
--- a/src/include/assets/mug/mug_06.c
+++ b/src/include/assets/mug/mug_06.c
--- a/src/include/assets/mug/mug_06.h
+++ b/src/include/assets/mug/mug_06.h
--- a/src/include/assets/mug/mug_07.c
+++ b/src/include/assets/mug/mug_07.c
--- a/src/include/assets/mug/mug_07.h
+++ b/src/include/assets/mug/mug_07.h
--- a/src/include/assets/mug/mug_08.c
+++ b/src/include/assets/mug/mug_08.c
--- a/src/include/assets/mug/mug_08.h
+++ b/src/include/assets/mug/mug_08.h
--- a/src/include/assets/mug/mug_09.c
+++ b/src/include/assets/mug/mug_09.c
--- a/src/include/assets/mug/mug_09.h
+++ b/src/include/assets/mug/mug_09.h
--- a/src/include/assets/mug/mug_10.c
+++ b/src/include/assets/mug/mug_10.c
--- a/src/include/assets/mug/mug_10.h
+++ b/src/include/assets/mug/mug_10.h
--- a/src/include/assets/mug/mug_11.c
+++ b/src/include/assets/mug/mug_11.c
--- a/src/include/assets/mug/mug_11.h
+++ b/src/include/assets/mug/mug_11.h
--- a/src/include/battle_fractions.h
+++ b/src/include/battle_fractions.h
--- a/src/interface/lcd_io_test.S
+++ b/src/interface/lcd_io_test.S
@@ -148,6 +148,7 @@ flag_decrypt:
 
				 

			
 
				 .align 2

			
 
				 

			
 
				+.global palette_override

			
 
				 palette_override:

			
 
				 .hword 0

			
 
				 .hword 0

			
@@ -164,4 +165,4 @@ palette_override:
 
				 .hword 0

			
 
				 .hword 0

			
 
				 .hword 0

			
 
				-.hword 0

			
 
				+.hword 0x0
			
--- a/src/interface/mugshot_table.s
+++ b/src/interface/mugshot_table.s
--- a/src/specials/load_text_special.c
+++ b/src/specials/load_text_special.c
--- a/src/specials/script_overrides.c
+++ b/src/specials/script_overrides.c
--- a/string/de/story_text/tundra_hq/globals.txt
+++ b/string/de/story_text/tundra_hq/globals.txt
--- a/string/de/text.txt
+++ b/string/de/text.txt
--- a/string/de/text_multichoices.txt
+++ b/string/de/text_multichoices.txt