mirror of
https://github.com/pret/pokeemerald.git
synced 2026-05-06 13:28:21 -05:00
Conflicts: include/battle.h include/constants/expansion.h include/graphics.h src/battle_bg.c src/battle_util.c src/data/graphics/battle_terrain.h src/data/graphics/pokemon.h src/pokeblock_feed.c src/pokemon_sprite_visualizer.c |
||
|---|---|---|
| .. | ||
| battle_environment.h | ||
| berries.h | ||
| berry_fix.h | ||
| decorations.h | ||
| gimmicks.h | ||
| intro_scene.h | ||
| items.h | ||
| mail.h | ||
| pokeballs.h | ||
| pokemon.h | ||
| rayquaza_scene.h | ||
| slot_machine.h | ||
| trainers.h | ||