7 年前 · 776c4ee53e
--- a/assets/render/ascii.png
+++ b/assets/render/ascii.png
--- a/base/.gitignore
+++ b/base/.gitignore
--- a/build/.gitignore
+++ b/build/.gitignore
--- a/built/.gitignore
+++ b/built/.gitignore
--- a/data/item/item_gfx.S
+++ b/data/item/item_gfx.S
--- a/data/item/item_scripts.S
+++ b/data/item/item_scripts.S
--- a/data/item/tm_hm_move_table.S
+++ b/data/item/tm_hm_move_table.S
--- a/data/moves/move_data.S
+++ b/data/moves/move_data.S
--- a/data/moves/move_descriptions.S
+++ b/data/moves/move_descriptions.S
--- a/data/pkmn_tables/pokemon_enemy_altitude_table.s
+++ b/data/pkmn_tables/pokemon_enemy_altitude_table.s
--- a/data/pkmn_tables/pokemon_enemy_y_table.s
+++ b/data/pkmn_tables/pokemon_enemy_y_table.s
--- a/data/pkmn_tables/pokemon_footprints.s
+++ b/data/pkmn_tables/pokemon_footprints.s
--- a/data/pkmn_tables/pokemon_habitats.S
+++ b/data/pkmn_tables/pokemon_habitats.S
--- a/data/pkmn_tables/pokemon_move_tutor.s
+++ b/data/pkmn_tables/pokemon_move_tutor.s
--- a/data/pkmn_tables/pokemon_player_y_table.s
+++ b/data/pkmn_tables/pokemon_player_y_table.s
--- a/data/pkmn_tables/pokemon_tm_vm.s
+++ b/data/pkmn_tables/pokemon_tm_vm.s
--- a/gfx_build/icons/.gitignore
+++ b/gfx_build/icons/.gitignore
--- a/gfx_build/sprites/.gitignore
+++ b/gfx_build/sprites/.gitignore
--- a/gfx_build/sprites/back_sprites/.gitignore
+++ b/gfx_build/sprites/back_sprites/.gitignore
--- a/gfx_build/sprites/castform/.gitignore
+++ b/gfx_build/sprites/castform/.gitignore
--- a/gfx_build/sprites/front_sprites/.gitignore
+++ b/gfx_build/sprites/front_sprites/.gitignore
--- a/gfx_build/sprites/normal_pal/.gitignore
+++ b/gfx_build/sprites/normal_pal/.gitignore
--- a/gfx_build/sprites/shiny_pal/.gitignore
+++ b/gfx_build/sprites/shiny_pal/.gitignore
--- a/main.asm
+++ b/main.asm
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
--- a/nbproject/private/Default-build.log
+++ b/nbproject/private/Default-build.log
--- a/nbproject/private/configurations.xml
+++ b/nbproject/private/configurations.xml
--- a/nbproject/private/launcher.properties
+++ b/nbproject/private/launcher.properties
--- a/nbproject/private/private.xml
+++ b/nbproject/private/private.xml
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
--- a/patches/battle_engine/battle_engine.asm
+++ b/patches/battle_engine/battle_engine.asm
--- a/patches/battle_engine/malloc.asm
+++ b/patches/battle_engine/malloc.asm
--- a/patches/items/item_limits.asm
+++ b/patches/items/item_limits.asm
--- a/patches/items/item_routines.asm
+++ b/patches/items/item_routines.asm
--- a/patches/items/item_tables.asm
+++ b/patches/items/item_tables.asm
--- a/patches/items/items.asm
+++ b/patches/items/items.asm
--- a/patches/items/tm_fixes.asm
+++ b/patches/items/tm_fixes.asm
--- a/patches/move_table.asm
+++ b/patches/move_table.asm
--- a/patches/overworlds/overworld.asm
+++ b/patches/overworlds/overworld.asm
--- a/patches/overworlds/trainer.asm
+++ b/patches/overworlds/trainer.asm
--- a/patches/pokemon_data/pokedex_order.asm
+++ b/patches/pokemon_data/pokedex_order.asm
--- a/patches/pokemon_data/pokemon_footprints.asm
+++ b/patches/pokemon_data/pokemon_footprints.asm
--- a/patches/pokemon_data/pokemon_habitats.asm
+++ b/patches/pokemon_data/pokemon_habitats.asm
--- a/sprites.makefile
+++ b/sprites.makefile
--- 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.h
+++ b/src/battle_engine/custom_structs_malloc.h
--- 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/include/abilities.h
+++ b/src/include/abilities.h
--- 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/battle.h
+++ b/src/include/battle.h
--- a/src/include/battle_abilities.h
+++ b/src/include/battle_abilities.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_structs.h
+++ b/src/include/battle_structs.h
--- a/src/include/battle_test.h
+++ b/src/include/battle_test.h
--- a/src/include/custom_structs.h
+++ b/src/include/custom_structs.h
--- a/src/include/debug.h
+++ b/src/include/debug.h
--- a/src/include/item_effects.h
+++ b/src/include/item_effects.h
--- a/src/include/items.h
+++ b/src/include/items.h
--- a/src/include/moves.h
+++ b/src/include/moves.h
--- a/src/include/pokemon.h
+++ b/src/include/pokemon.h
--- a/src/item/tmhm/tm_compatability.S
+++ b/src/item/tmhm/tm_compatability.S
--- a/src/item/tmhm/tm_index.S
+++ b/src/item/tmhm/tm_index.S
--- a/src/item/tmhm/tm_index_fix.S
+++ b/src/item/tmhm/tm_index_fix.S
--- a/src/item/tmhm/tm_number.S
+++ b/src/item/tmhm/tm_number.S
--- a/src/item/tmhm/tm_save_block.S
+++ b/src/item/tmhm/tm_save_block.S
--- a/src/moves/bride/bride.c
+++ b/src/moves/bride/bride.c
--- a/src/moves/bride/bride_scripts.S
+++ b/src/moves/bride/bride_scripts.S
--- a/src/moves/hazards/hazards_scripts.S
+++ b/src/moves/hazards/hazards_scripts.S
--- a/src/moves/power_trick/power_trick.c
+++ b/src/moves/power_trick/power_trick.c
--- a/src/moves/power_trick/power_trick_script.S
+++ b/src/moves/power_trick/power_trick_script.S
--- a/src/moves/roost/roost.c
+++ b/src/moves/roost/roost.c
--- a/src/moves/roost/roost_scripts.S
+++ b/src/moves/roost/roost_scripts.S
--- a/src/overworld/overworld.c
+++ b/src/overworld/overworld.c
--- a/src/overworld/overworld_hooks.S
+++ b/src/overworld/overworld_hooks.S
--- a/src/overworld/trainer_run.S
+++ b/src/overworld/trainer_run.S
--- a/string/.gitignore
+++ b/string/.gitignore
--- a/string/de/hazards.txt
+++ b/string/de/hazards.txt
--- a/string/de/item_data.txt
+++ b/string/de/item_data.txt
--- a/string/de/item_descriptions.txt
+++ b/string/de/item_descriptions.txt
--- a/string/de/move_descriptions.txt
+++ b/string/de/move_descriptions.txt
--- a/string/de/move_names.txt
+++ b/string/de/move_names.txt
--- a/string/de/move_strings.txt
+++ b/string/de/move_strings.txt
--- a/string/en/hazards.txt
+++ b/string/en/hazards.txt
--- a/string/en/move_strings.txt
+++ b/string/en/move_strings.txt
--- a/string/table.tbl
+++ b/string/table.tbl