Biffalo XIII 2cc26d935a Merge branch '_RHH/master' into _RHH/upcoming ...

# Conflicts:
#	data/battle_scripts_1.s
#	include/config/pokemon.h
#	src/birch_pc.c

2024-01-11 19:51:11 -03:00

..

battle.h

Apply suggestions from code review

2024-01-12 02:13:55 +09:00

debug.h

ai delay timer

2023-09-12 10:35:05 +02:00

item.h

Add power item config (#3961)

2024-01-11 09:34:19 +01:00

overworld.h

Fix extended berry stage palettes

2024-01-05 11:32:59 +01:00

pokemon.h

Merge branch '_RHH/master' into _RHH/upcoming

2024-01-11 19:51:11 -03:00

species_enabled.h

Add Indigo Disk Pokemon data (#3878)

2024-01-01 01:38:50 +01:00