Eduardo Quezada 44754f8ca7 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2 ... # Conflicts: # include/constants/pokemon_config.h # src/data/pokemon_graphics/back_pic_table.h # src/data/pokemon_graphics/palette_table.h # src/data/pokemon_graphics/shiny_palette_table.h # src/pokemon_icon.c		2022-10-07 15:27:16 -03:00
..
battle_terrain.h
berries.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
berry_fix.h
decorations.h
intro_scene.h	Standardize intro gfx names	2021-03-29 20:48:48 -04:00
items.h	Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb	2022-01-16 18:44:03 -03:00
mail.h
pokeballs.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD	2022-04-02 18:45:18 -03:00
pokemon.h	Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2	2022-10-07 15:27:16 -03:00
rayquaza_scene.h	Removed trailing spaces in the most relevant files	2021-08-24 19:59:32 -03:00
slot_machine.h	More slot machine data documentation	2020-07-28 14:29:44 -04:00
trainers.h	Generate trainer pic palettes from image	2022-09-05 16:09:45 -04:00