Eduardo Quezada D'Ottone 773c773bac Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape ... # Conflicts: # include/constants/battle_config.h		2021-10-26 20:35:01 -03:00
..
abilities.h
apprentice.h
battle_ai.h	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-11 16:33:10 -07:00
battle_anim.h	Implemented Primal Reversion	2021-10-09 00:36:41 -03:00
battle_arena.h
battle_config.h	Merge remote-tracking branch 'RHH/battle_engine' into BE_ghostEscape	2021-10-26 20:35:01 -03:00
battle_dome.h
battle_factory.h
battle_frontier_mons.h
battle_frontier_trainers.h
battle_frontier.h
battle_move_effects.h	Implemented Plasma Fists	2021-10-19 09:50:18 -03:00
battle_palace.h
battle_pike.h
battle_pyramid.h
battle_script_commands.h	Merge branch 'battle_engine' into plasmaFists	2021-10-23 11:06:34 -03:00
battle_setup.h
battle_string_ids.h	Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE	2021-10-19 07:47:42 -03:00
battle_tent_mons.h
battle_tent_trainers.h
battle_tent.h
battle_tower.h
battle.h	Implemented Plasma Fists	2021-10-19 09:50:18 -03:00
berry.h
cable_club.h
coins.h
contest.h	Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync	2021-08-11 16:33:10 -07:00
daycare.h
decorations.h
easy_chat.h
event_bg.h
event_object_movement.h
event_objects.h	Add local id constants for C	2021-07-05 13:54:43 -04:00
expansion_branches.h	Fix redefinition error in battle_config.h	2021-07-02 14:36:55 -05:00
field_effects.h
field_poison.h
field_specials.h
field_tasks.h
field_weather.h
flags.h	Corrected inconsistent flag label spelling	2021-08-05 17:26:03 -03:00
frontier_util.h
game_stat.h
global.h
heal_locations.h
hold_effects.h	Fix Safety Googles	2021-10-09 15:05:01 +13:00
item_effects.h
item.h	Document item menu	2021-08-10 22:13:02 -04:00
items.h	Document item menu	2021-08-10 22:13:02 -04:00
layouts.h
lilycove_lady.h
map_groups.h
map_scripts.h
map_types.h
maps.h
mauville_old_man.h
metatile_behaviors.h
metatile_labels.h
mevent.h
moves.h
opponents.h
party_menu.h
pokemon.h	Implemented Primal Reversion	2021-10-09 00:36:41 -03:00
region_map_sections.h
rgb.h
roulette.h
script_menu.h
secret_bases.h
slot_machine.h
songs.h
species.h
trade.h
trainer_hill.h
trainer_types.h
trainers.h
tv.h	Document smart shopper TV show	2021-07-02 01:45:23 -04:00
union_room.h
vars.h
weather.h