113f8de9b1
# Conflicts: # src/battle_controller_player.c |
||
---|---|---|
.. | ||
battle.h | ||
debug.h | ||
general.h | ||
item.h | ||
level_caps.h | ||
overworld.h | ||
pokemon.h | ||
save.h | ||
species_enabled.h | ||
test.h |
113f8de9b1
# Conflicts: # src/battle_controller_player.c |
||
---|---|---|
.. | ||
battle.h | ||
debug.h | ||
general.h | ||
item.h | ||
level_caps.h | ||
overworld.h | ||
pokemon.h | ||
save.h | ||
species_enabled.h | ||
test.h |