Eduardo Quezada 3d9c7732f6 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers ...

# Conflicts:
#	include/event_object_movement.h
#	src/data.c
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info/gen_4_families.h

2024-04-20 13:23:14 -04:00

..

level_up_learnsets

Gen 6 level up learnset update (#4267)

2024-03-11 07:46:16 -03:00

species_info

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

2024-04-20 13:23:14 -04:00

egg_moves.h

Species Simplifier™ - Part 3 (#3562)

2023-12-08 15:05:10 +01:00

experience_tables.h

safeguard SQUARE and CUBE macro arguments in parentheses

2023-12-27 17:29:35 -05:00

form_change_table_pointers.h

Actually disable forms when disabling forms (#4395)

2024-04-15 16:01:52 -04:00

form_change_tables.h

Actually disable forms when disabling forms (#4395)

2024-04-15 16:01:52 -04:00

form_species_tables.h

Actually disable forms when disabling forms (#4395)

2024-04-15 16:01:52 -04:00

item_effects.h

PLA Items (#3825)

2024-01-23 18:24:58 +01:00

pokedex_orders.h

Add Indigo Disk Pokemon data (#3878)

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

species_info.h

Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo

2024-03-25 16:03:56 -03:00

teachable_learnsets.h

Updated teacheable learnests to Indigo Disk data (#4155)

2024-02-08 17:27:26 +01:00

trainer_class_lookups.h

Document remaining symbols in pokemon.c

2021-10-02 23:48:12 -04:00