Eduardo Quezada 47cea526ec Merge branch 'RHH/master' into RHH/upcoming ... # Conflicts: # src/battle_util.c		2023-07-19 23:22:07 -04:00
..
battle.h
debug.h
item.h	Fix gem boost on multi hit moves and config for gem param (#3144)	2023-07-18 06:11:54 +01:00
overworld.h
pokemon.h