6 years ago · 3b56f2e129
--- a/sots-private
+++ b/sots-private
@@ -1 +1 @@
 
				-Subproject commit 7e8899d8523cc20bc2721a7007051a2c2a4fa6cf
			
 
				+Subproject commit ac8b580d74d46c10ccf254a80e107c1e2c501df4
			
--- a/src/battle_bg/battle_bg_hook.s
+++ b/src/battle_bg/battle_bg_hook.s
--- a/src/battle_engine/battle_abilities.c
+++ b/src/battle_engine/battle_abilities.c
--- a/src/battle_engine/battle_end_of_turn.c
+++ b/src/battle_engine/battle_end_of_turn.c
--- a/src/battle_engine/battle_end_of_turn_hook.s
+++ b/src/battle_engine/battle_end_of_turn_hook.s
--- a/src/battle_engine/battle_help.c
+++ b/src/battle_engine/battle_help.c
--- a/src/battle_engine/battle_initiative.c
+++ b/src/battle_engine/battle_initiative.c
--- a/src/battle_engine/battle_switch_in_hook.s
+++ b/src/battle_engine/battle_switch_in_hook.s
--- a/src/battle_engine/battle_test.c
+++ b/src/battle_engine/battle_test.c
--- a/src/battle_engine/custom_structs_malloc.c
+++ b/src/battle_engine/custom_structs_malloc.c
--- a/src/battle_engine/custom_structs_malloc_hook.s
+++ b/src/battle_engine/custom_structs_malloc_hook.s
--- a/src/battle_engine/entry_hazards.c
+++ b/src/battle_engine/entry_hazards.c
--- a/src/battle_engine/entry_hazards_hook.s
+++ b/src/battle_engine/entry_hazards_hook.s
--- a/src/battle_engine/scripts/hazards.s
+++ b/src/battle_engine/scripts/hazards.s
--- a/src/battle_engine/scripts/test.s
+++ b/src/battle_engine/scripts/test.s
--- a/src/debug/debug.c
+++ b/src/debug/debug.c
--- a/src/encode/crc32.c
+++ b/src/encode/crc32.c
--- a/src/game_engine/title_screen.c
+++ b/src/game_engine/title_screen.c
--- a/src/include/assets/.gitignore
+++ b/src/include/assets/.gitignore
--- a/src/include/assets/ascii.c
+++ b/src/include/assets/ascii.c
--- a/src/include/assets/ascii.h
+++ b/src/include/assets/ascii.h
--- a/src/include/assets/interface/.gitignore
+++ b/src/include/assets/interface/.gitignore
--- a/src/include/battle_abilities.h
+++ b/src/include/battle_abilities.h
--- a/src/include/battle_common.h
+++ b/src/include/battle_common.h
--- a/src/include/battle_custom_structs.h
+++ b/src/include/battle_custom_structs.h
--- a/src/include/battle_fractions.h
+++ b/src/include/battle_fractions.h
--- a/src/include/battle_help.h
+++ b/src/include/battle_help.h
--- a/src/include/battle_initiative.h
+++ b/src/include/battle_initiative.h
--- a/src/include/battle_locations.h
+++ b/src/include/battle_locations.h
--- a/src/include/battle_script.h
+++ b/src/include/battle_script.h
--- a/src/include/battle_structs.h
+++ b/src/include/battle_structs.h
--- a/src/include/battle_test.h
+++ b/src/include/battle_test.h
--- a/src/include/bpre.h
+++ b/src/include/bpre.h
--- a/src/include/callback.h
+++ b/src/include/callback.h
--- a/src/include/config/core.h
+++ b/src/include/config/core.h
--- a/src/include/constants/abilities.h
+++ b/src/include/constants/abilities.h
--- a/src/include/constants/items.h
+++ b/src/include/constants/items.h
--- a/src/include/constants/moves.h
+++ b/src/include/constants/moves.h
--- a/src/include/constants/ptypes.h
+++ b/src/include/constants/ptypes.h
--- a/src/include/constants/pymap/banks.h
+++ b/src/include/constants/pymap/banks.h
--- a/src/include/constants/pymap/banks.s
+++ b/src/include/constants/pymap/banks.s
--- a/src/include/constants/pymap/difficulty_variables.h
+++ b/src/include/constants/pymap/difficulty_variables.h
--- a/src/include/constants/pymap/difficulty_variables.s
+++ b/src/include/constants/pymap/difficulty_variables.s
--- a/src/include/constants/pymap/engine_flags.h
+++ b/src/include/constants/pymap/engine_flags.h
--- a/src/include/constants/pymap/engine_flags.s
+++ b/src/include/constants/pymap/engine_flags.s
--- a/src/include/constants/pymap/engine_variables.h
+++ b/src/include/constants/pymap/engine_variables.h
--- a/src/include/constants/pymap/engine_variables.s
+++ b/src/include/constants/pymap/engine_variables.s
--- a/src/include/constants/pymap/items.h
+++ b/src/include/constants/pymap/items.h
--- a/src/include/constants/pymap/items.s
+++ b/src/include/constants/pymap/items.s
--- a/src/include/constants/pymap/level_types.h
+++ b/src/include/constants/pymap/level_types.h
--- a/src/include/constants/pymap/level_types.s
+++ b/src/include/constants/pymap/level_types.s
--- a/src/include/constants/pymap/main_story_variables.h
+++ b/src/include/constants/pymap/main_story_variables.h
@@ -10,4 +10,5 @@
 
				 #define VALUE_HESPERIA_BRUECKE 0x8
			
 
				 #define VALUE_MAPSCRIPT_HESPERIAGRABEN 0x9
			
 
				 #define VALUE_POKEMON_SPRING_HOEHLE 0xa
			
 
				-#define VALUE_VOR_DEM_REBERATUNNEL 0xb
			
 
				+#define VALUE_HESPERIAGRABEN_SPRITEFACEUP 0xb
			
 
				+#define VALUE_VOR_DEM_REBERATUNNEL 0xc
			
--- a/src/include/constants/pymap/main_story_variables.s
+++ b/src/include/constants/pymap/main_story_variables.s
@@ -10,4 +10,5 @@
 
				 .equ VALUE_HESPERIA_BRUECKE, 0x8
			
 
				 .equ VALUE_MAPSCRIPT_HESPERIAGRABEN, 0x9
			
 
				 .equ VALUE_POKEMON_SPRING_HOEHLE, 0xa
			
 
				-.equ VALUE_VOR_DEM_REBERATUNNEL, 0xb
			
 
				+.equ VALUE_HESPERIAGRABEN_SPRITEFACEUP, 0xb
			
 
				+.equ VALUE_VOR_DEM_REBERATUNNEL, 0xc
			
--- a/src/include/constants/pymap/map_adjacency_types.h
+++ b/src/include/constants/pymap/map_adjacency_types.h
--- a/src/include/constants/pymap/map_adjacency_types.s
+++ b/src/include/constants/pymap/map_adjacency_types.s
--- a/src/include/constants/pymap/map_battle_styles.h
+++ b/src/include/constants/pymap/map_battle_styles.h
--- a/src/include/constants/pymap/map_battle_styles.s
+++ b/src/include/constants/pymap/map_battle_styles.s
--- a/src/include/constants/pymap/map_carun_city_maps.h
+++ b/src/include/constants/pymap/map_carun_city_maps.h
--- a/src/include/constants/pymap/map_carun_city_maps.s
+++ b/src/include/constants/pymap/map_carun_city_maps.s
--- a/src/include/constants/pymap/map_connections.h
+++ b/src/include/constants/pymap/map_connections.h
--- a/src/include/constants/pymap/map_connections.s
+++ b/src/include/constants/pymap/map_connections.s
--- a/src/include/constants/pymap/map_flash_types.h
+++ b/src/include/constants/pymap/map_flash_types.h
--- a/src/include/constants/pymap/map_flash_types.s
+++ b/src/include/constants/pymap/map_flash_types.s
--- a/src/include/constants/pymap/map_heilige_orte.h
+++ b/src/include/constants/pymap/map_heilige_orte.h
--- a/src/include/constants/pymap/map_heilige_orte.s
+++ b/src/include/constants/pymap/map_heilige_orte.s
--- a/src/include/constants/pymap/map_hesperia_maps.h
+++ b/src/include/constants/pymap/map_hesperia_maps.h
--- a/src/include/constants/pymap/map_hesperia_maps.s
+++ b/src/include/constants/pymap/map_hesperia_maps.s
--- a/src/include/constants/pymap/map_hoehle_gebirge.h
+++ b/src/include/constants/pymap/map_hoehle_gebirge.h
--- a/src/include/constants/pymap/map_hoehle_gebirge.s
+++ b/src/include/constants/pymap/map_hoehle_gebirge.s
--- a/src/include/constants/pymap/map_namespaces.h
+++ b/src/include/constants/pymap/map_namespaces.h
--- a/src/include/constants/pymap/map_namespaces.s
+++ b/src/include/constants/pymap/map_namespaces.s
--- a/src/include/constants/pymap/map_outdoor.h
+++ b/src/include/constants/pymap/map_outdoor.h
--- a/src/include/constants/pymap/map_outdoor.s
+++ b/src/include/constants/pymap/map_outdoor.s
--- a/src/include/constants/pymap/map_route.h
+++ b/src/include/constants/pymap/map_route.h
--- a/src/include/constants/pymap/map_route.s
+++ b/src/include/constants/pymap/map_route.s
--- a/src/include/constants/pymap/map_show_name_types.h
+++ b/src/include/constants/pymap/map_show_name_types.h
--- a/src/include/constants/pymap/map_show_name_types.s
+++ b/src/include/constants/pymap/map_show_name_types.s
--- a/src/include/constants/pymap/map_types.h
+++ b/src/include/constants/pymap/map_types.h
--- a/src/include/constants/pymap/map_types.s
+++ b/src/include/constants/pymap/map_types.s
--- a/src/include/constants/pymap/map_urbania_city_maps.h
+++ b/src/include/constants/pymap/map_urbania_city_maps.h
--- a/src/include/constants/pymap/map_urbania_city_maps.s
+++ b/src/include/constants/pymap/map_urbania_city_maps.s
--- a/src/include/constants/pymap/map_wald_suempfe.h
+++ b/src/include/constants/pymap/map_wald_suempfe.h
--- a/src/include/constants/pymap/map_wald_suempfe.s
+++ b/src/include/constants/pymap/map_wald_suempfe.s
--- a/src/include/constants/pymap/map_weathers.h
+++ b/src/include/constants/pymap/map_weathers.h
--- a/src/include/constants/pymap/map_weathers.s
+++ b/src/include/constants/pymap/map_weathers.s
--- a/src/include/constants/pymap/npc_sprite_table1.h
+++ b/src/include/constants/pymap/npc_sprite_table1.h
--- a/src/include/constants/pymap/npc_sprite_table1.s
+++ b/src/include/constants/pymap/npc_sprite_table1.s
--- a/src/include/constants/pymap/npc_sprite_table2.h
+++ b/src/include/constants/pymap/npc_sprite_table2.h
--- a/src/include/constants/pymap/npc_sprite_table2.s
+++ b/src/include/constants/pymap/npc_sprite_table2.s
--- a/src/include/constants/pymap/npc_sprite_table3.h
+++ b/src/include/constants/pymap/npc_sprite_table3.h
--- a/src/include/constants/pymap/npc_sprite_table3.s
+++ b/src/include/constants/pymap/npc_sprite_table3.s
--- a/src/include/constants/pymap/npc_sprite_table4.h
+++ b/src/include/constants/pymap/npc_sprite_table4.h
--- a/src/include/constants/pymap/npc_sprite_table4.s
+++ b/src/include/constants/pymap/npc_sprite_table4.s
--- a/src/include/constants/pymap/person_behaviours.h
+++ b/src/include/constants/pymap/person_behaviours.h
--- a/src/include/constants/pymap/person_behaviours.s
+++ b/src/include/constants/pymap/person_behaviours.s
--- a/src/include/constants/pymap/riddle_variables.h
+++ b/src/include/constants/pymap/riddle_variables.h
--- a/src/include/constants/pymap/riddle_variables.s
+++ b/src/include/constants/pymap/riddle_variables.s
--- a/src/include/constants/pymap/rival_pokemon_variables.h
+++ b/src/include/constants/pymap/rival_pokemon_variables.h
--- a/src/include/constants/pymap/rival_pokemon_variables.s
+++ b/src/include/constants/pymap/rival_pokemon_variables.s
--- a/src/include/constants/pymap/save_variables.h
+++ b/src/include/constants/pymap/save_variables.h