Eduardo Quezada 502a56efd1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	include/global.h
#	src/data.c
#	src/data/pokemon/species_info/gen_7.h

2024-02-13 20:35:05 -03:00

..

battle.h

Renamed VAR_TERRAIN to B_VAR_TERRAIN and added a var-based field terrain timer (#4132)

2024-02-04 13:04:55 +01:00

debug.h

ai delay timer

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

decap.h

Reformatted for code review. Moved config to include/config/decap.h.

2024-01-17 01:12:04 -05:00

item.h

Add power item config (#3961)

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

overworld.h

Allow one-mon double battles (#4007)

2024-01-16 18:24:49 +01:00

pokemon.h

Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers

2024-02-13 20:35:05 -03:00

save.h

Actually multi battles seem to work fine too

2024-02-02 16:52:39 +01:00

species_enabled.h

Add Indigo Disk Pokemon data (#3878)

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