Eduardo Quezada 1137d54b61 Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # asm/macros/battle_script.inc # src/battle_script_commands.c		2023-10-23 17:36:42 -03:00
..
battle.h	Merge branch 'RHH/master' into RHH/upcoming	2023-10-23 17:36:42 -03:00
debug.h	ai delay timer	2023-09-12 10:35:05 +02:00
item.h	Merge branch 'RHH/master' into RHH/upcoming	2023-10-09 22:08:32 -03:00
overworld.h	Add config for pressing B in the PC	2023-09-21 16:26:00 +02:00
pokemon.h	Update friendship evo threshold to gen 8+ with config (#3376)	2023-10-22 18:05:54 -03:00