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

Convert move flags and bans into GCC bitfields (#2952)

2023-07-03 10:01:59 +02:00

debug.h

Updated the debug menu

2023-03-08 15:27:22 -03:00

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

OW Poison configs

2023-04-06 00:26:52 +02:00

pokemon.h

Add Ability inheritance

2023-04-30 12:58:18 +02:00