Bläddra i källkod

resolve merge conflict

Philipp Auer 8 år sedan
förälder
incheckning
776c4ee53e
100 ändrade filer med 0 tillägg och 0 borttagningar
  1. 0
    0
      assets/render/ascii.png
  2. 0
    0
      base/.gitignore
  3. 0
    0
      build/.gitignore
  4. 0
    0
      built/.gitignore
  5. 0
    0
      data/item/item_gfx.S
  6. 0
    0
      data/item/item_scripts.S
  7. 0
    0
      data/item/tm_hm_move_table.S
  8. 0
    0
      data/moves/move_data.S
  9. 0
    0
      data/moves/move_descriptions.S
  10. 0
    0
      data/pkmn_tables/pokemon_enemy_altitude_table.s
  11. 0
    0
      data/pkmn_tables/pokemon_enemy_y_table.s
  12. 0
    0
      data/pkmn_tables/pokemon_footprints.s
  13. 0
    0
      data/pkmn_tables/pokemon_habitats.S
  14. 0
    0
      data/pkmn_tables/pokemon_move_tutor.s
  15. 0
    0
      data/pkmn_tables/pokemon_player_y_table.s
  16. 0
    0
      data/pkmn_tables/pokemon_tm_vm.s
  17. 0
    0
      gfx_build/icons/.gitignore
  18. 0
    0
      gfx_build/sprites/.gitignore
  19. 0
    0
      gfx_build/sprites/back_sprites/.gitignore
  20. 0
    0
      gfx_build/sprites/castform/.gitignore
  21. 0
    0
      gfx_build/sprites/front_sprites/.gitignore
  22. 0
    0
      gfx_build/sprites/normal_pal/.gitignore
  23. 0
    0
      gfx_build/sprites/shiny_pal/.gitignore
  24. 0
    0
      main.asm
  25. 0
    0
      nbproject/configurations.xml
  26. 0
    0
      nbproject/private/Default-build.log
  27. 0
    0
      nbproject/private/configurations.xml
  28. 0
    0
      nbproject/private/launcher.properties
  29. 0
    0
      nbproject/private/private.xml
  30. 0
    0
      nbproject/project.xml
  31. 0
    0
      patches/battle_engine/battle_engine.asm
  32. 0
    0
      patches/battle_engine/malloc.asm
  33. 0
    0
      patches/items/item_limits.asm
  34. 0
    0
      patches/items/item_routines.asm
  35. 0
    0
      patches/items/item_tables.asm
  36. 0
    0
      patches/items/items.asm
  37. 0
    0
      patches/items/tm_fixes.asm
  38. 0
    0
      patches/move_table.asm
  39. 0
    0
      patches/overworlds/overworld.asm
  40. 0
    0
      patches/overworlds/trainer.asm
  41. 0
    0
      patches/pokemon_data/pokedex_order.asm
  42. 0
    0
      patches/pokemon_data/pokemon_footprints.asm
  43. 0
    0
      patches/pokemon_data/pokemon_habitats.asm
  44. 0
    0
      sprites.makefile
  45. 0
    0
      src/battle_engine/battle_abilities.c
  46. 0
    0
      src/battle_engine/battle_end_of_turn.c
  47. 0
    0
      src/battle_engine/battle_end_of_turn_hook.S
  48. 0
    0
      src/battle_engine/battle_help.c
  49. 0
    0
      src/battle_engine/battle_initiative.c
  50. 0
    0
      src/battle_engine/battle_switch_in_hook.S
  51. 0
    0
      src/battle_engine/battle_test.c
  52. 0
    0
      src/battle_engine/custom_structs_malloc.c
  53. 0
    0
      src/battle_engine/custom_structs_malloc.h
  54. 0
    0
      src/battle_engine/custom_structs_malloc_hook.S
  55. 0
    0
      src/battle_engine/entry_hazards.c
  56. 0
    0
      src/battle_engine/entry_hazards_hook.S
  57. 0
    0
      src/battle_engine/scripts/hazards.S
  58. 0
    0
      src/battle_engine/scripts/test.S
  59. 0
    0
      src/debug/debug.c
  60. 0
    0
      src/include/abilities.h
  61. 0
    0
      src/include/assets/ascii.c
  62. 0
    0
      src/include/assets/ascii.h
  63. 0
    0
      src/include/battle.h
  64. 0
    0
      src/include/battle_abilities.h
  65. 0
    0
      src/include/battle_help.h
  66. 0
    0
      src/include/battle_initiative.h
  67. 0
    0
      src/include/battle_locations.h
  68. 0
    0
      src/include/battle_structs.h
  69. 0
    0
      src/include/battle_test.h
  70. 0
    0
      src/include/custom_structs.h
  71. 0
    0
      src/include/debug.h
  72. 0
    0
      src/include/item_effects.h
  73. 0
    0
      src/include/items.h
  74. 0
    0
      src/include/moves.h
  75. 0
    0
      src/include/pokemon.h
  76. 0
    0
      src/item/tmhm/tm_compatability.S
  77. 0
    0
      src/item/tmhm/tm_index.S
  78. 0
    0
      src/item/tmhm/tm_index_fix.S
  79. 0
    0
      src/item/tmhm/tm_number.S
  80. 0
    0
      src/item/tmhm/tm_save_block.S
  81. 0
    0
      src/moves/bride/bride.c
  82. 0
    0
      src/moves/bride/bride_scripts.S
  83. 0
    0
      src/moves/hazards/hazards_scripts.S
  84. 0
    0
      src/moves/power_trick/power_trick.c
  85. 0
    0
      src/moves/power_trick/power_trick_script.S
  86. 0
    0
      src/moves/roost/roost.c
  87. 0
    0
      src/moves/roost/roost_scripts.S
  88. 0
    0
      src/overworld/overworld.c
  89. 0
    0
      src/overworld/overworld_hooks.S
  90. 0
    0
      src/overworld/trainer_run.S
  91. 0
    0
      string/.gitignore
  92. 0
    0
      string/de/hazards.txt
  93. 0
    0
      string/de/item_data.txt
  94. 0
    0
      string/de/item_descriptions.txt
  95. 0
    0
      string/de/move_descriptions.txt
  96. 0
    0
      string/de/move_names.txt
  97. 0
    0
      string/de/move_strings.txt
  98. 0
    0
      string/en/hazards.txt
  99. 0
    0
      string/en/move_strings.txt
  100. 0
    0
      string/table.tbl

+ 0
- 0
assets/render/ascii.png Visa fil


+ 0
- 0
base/.gitignore Visa fil


+ 0
- 0
build/.gitignore Visa fil


+ 0
- 0
built/.gitignore Visa fil


+ 0
- 0
data/item/item_gfx.S Visa fil


+ 0
- 0
data/item/item_scripts.S Visa fil


+ 0
- 0
data/item/tm_hm_move_table.S Visa fil


+ 0
- 0
data/moves/move_data.S Visa fil


+ 0
- 0
data/moves/move_descriptions.S Visa fil


+ 0
- 0
data/pkmn_tables/pokemon_enemy_altitude_table.s Visa fil


+ 0
- 0
data/pkmn_tables/pokemon_enemy_y_table.s Visa fil


+ 0
- 0
data/pkmn_tables/pokemon_footprints.s Visa fil


+ 0
- 0
data/pkmn_tables/pokemon_habitats.S Visa fil


+ 0
- 0
data/pkmn_tables/pokemon_move_tutor.s Visa fil


+ 0
- 0
data/pkmn_tables/pokemon_player_y_table.s Visa fil


+ 0
- 0
data/pkmn_tables/pokemon_tm_vm.s Visa fil


+ 0
- 0
gfx_build/icons/.gitignore Visa fil


+ 0
- 0
gfx_build/sprites/.gitignore Visa fil


+ 0
- 0
gfx_build/sprites/back_sprites/.gitignore Visa fil


+ 0
- 0
gfx_build/sprites/castform/.gitignore Visa fil


+ 0
- 0
gfx_build/sprites/front_sprites/.gitignore Visa fil


+ 0
- 0
gfx_build/sprites/normal_pal/.gitignore Visa fil


+ 0
- 0
gfx_build/sprites/shiny_pal/.gitignore Visa fil


+ 0
- 0
main.asm Visa fil


+ 0
- 0
nbproject/configurations.xml Visa fil


+ 0
- 0
nbproject/private/Default-build.log Visa fil


+ 0
- 0
nbproject/private/configurations.xml Visa fil


+ 0
- 0
nbproject/private/launcher.properties Visa fil


+ 0
- 0
nbproject/private/private.xml Visa fil


+ 0
- 0
nbproject/project.xml Visa fil


+ 0
- 0
patches/battle_engine/battle_engine.asm Visa fil


+ 0
- 0
patches/battle_engine/malloc.asm Visa fil


+ 0
- 0
patches/items/item_limits.asm Visa fil


+ 0
- 0
patches/items/item_routines.asm Visa fil


+ 0
- 0
patches/items/item_tables.asm Visa fil


+ 0
- 0
patches/items/items.asm Visa fil


+ 0
- 0
patches/items/tm_fixes.asm Visa fil


+ 0
- 0
patches/move_table.asm Visa fil


+ 0
- 0
patches/overworlds/overworld.asm Visa fil


+ 0
- 0
patches/overworlds/trainer.asm Visa fil


+ 0
- 0
patches/pokemon_data/pokedex_order.asm Visa fil


+ 0
- 0
patches/pokemon_data/pokemon_footprints.asm Visa fil


+ 0
- 0
patches/pokemon_data/pokemon_habitats.asm Visa fil


+ 0
- 0
sprites.makefile Visa fil


+ 0
- 0
src/battle_engine/battle_abilities.c Visa fil


+ 0
- 0
src/battle_engine/battle_end_of_turn.c Visa fil


+ 0
- 0
src/battle_engine/battle_end_of_turn_hook.S Visa fil


+ 0
- 0
src/battle_engine/battle_help.c Visa fil


+ 0
- 0
src/battle_engine/battle_initiative.c Visa fil


+ 0
- 0
src/battle_engine/battle_switch_in_hook.S Visa fil


+ 0
- 0
src/battle_engine/battle_test.c Visa fil


+ 0
- 0
src/battle_engine/custom_structs_malloc.c Visa fil


+ 0
- 0
src/battle_engine/custom_structs_malloc.h Visa fil


+ 0
- 0
src/battle_engine/custom_structs_malloc_hook.S Visa fil


+ 0
- 0
src/battle_engine/entry_hazards.c Visa fil


+ 0
- 0
src/battle_engine/entry_hazards_hook.S Visa fil


+ 0
- 0
src/battle_engine/scripts/hazards.S Visa fil


+ 0
- 0
src/battle_engine/scripts/test.S Visa fil


+ 0
- 0
src/debug/debug.c Visa fil


+ 0
- 0
src/include/abilities.h Visa fil


+ 0
- 0
src/include/assets/ascii.c Visa fil


+ 0
- 0
src/include/assets/ascii.h Visa fil


+ 0
- 0
src/include/battle.h Visa fil


+ 0
- 0
src/include/battle_abilities.h Visa fil


+ 0
- 0
src/include/battle_help.h Visa fil


+ 0
- 0
src/include/battle_initiative.h Visa fil


+ 0
- 0
src/include/battle_locations.h Visa fil


+ 0
- 0
src/include/battle_structs.h Visa fil


+ 0
- 0
src/include/battle_test.h Visa fil


+ 0
- 0
src/include/custom_structs.h Visa fil


+ 0
- 0
src/include/debug.h Visa fil


+ 0
- 0
src/include/item_effects.h Visa fil


+ 0
- 0
src/include/items.h Visa fil


+ 0
- 0
src/include/moves.h Visa fil


+ 0
- 0
src/include/pokemon.h Visa fil


+ 0
- 0
src/item/tmhm/tm_compatability.S Visa fil


+ 0
- 0
src/item/tmhm/tm_index.S Visa fil


+ 0
- 0
src/item/tmhm/tm_index_fix.S Visa fil


+ 0
- 0
src/item/tmhm/tm_number.S Visa fil


+ 0
- 0
src/item/tmhm/tm_save_block.S Visa fil


+ 0
- 0
src/moves/bride/bride.c Visa fil


+ 0
- 0
src/moves/bride/bride_scripts.S Visa fil


+ 0
- 0
src/moves/hazards/hazards_scripts.S Visa fil


+ 0
- 0
src/moves/power_trick/power_trick.c Visa fil


+ 0
- 0
src/moves/power_trick/power_trick_script.S Visa fil


+ 0
- 0
src/moves/roost/roost.c Visa fil


+ 0
- 0
src/moves/roost/roost_scripts.S Visa fil


+ 0
- 0
src/overworld/overworld.c Visa fil


+ 0
- 0
src/overworld/overworld_hooks.S Visa fil


+ 0
- 0
src/overworld/trainer_run.S Visa fil


+ 0
- 0
string/.gitignore Visa fil


+ 0
- 0
string/de/hazards.txt Visa fil


+ 0
- 0
string/de/item_data.txt Visa fil


+ 0
- 0
string/de/item_descriptions.txt Visa fil


+ 0
- 0
string/de/move_descriptions.txt Visa fil


+ 0
- 0
string/de/move_names.txt Visa fil


+ 0
- 0
string/de/move_strings.txt Visa fil


+ 0
- 0
string/en/hazards.txt Visa fil


+ 0
- 0
string/en/move_strings.txt Visa fil


+ 0
- 0
string/table.tbl Visa fil


Vissa filer visades inte eftersom för många filer har ändrats