garak 2c14d6ee6c fix merge conflicts

2018-12-03 16:58:28 -05:00

..

abilities.h

…

apprentice.h

Document more of apprentice

2018-10-14 14:35:51 +02:00

battle_ai.h

…

battle_anim.h

remove extra macro and shorten names

2018-11-13 16:19:52 -05:00

battle_frontier.h

begin batle tower data

2018-12-02 23:22:42 -05:00

battle_move_effects.h

…

battle_script_commands.h

Document battle arena

2018-11-11 18:33:16 +01:00

battle_setup.h

trainerbattle_normal → trainerbattle_single

2018-12-02 15:08:19 -05:00

battle_string_ids.h

…

battle.h

Merge pull request #320 from DizzyEggg/anims

2018-10-06 08:20:41 -05:00

bg_event_constants.h

…

decorations.h

…

easy_chat.h

…

event_object_movement_constants.h

…

event_objects.h

Fix "Vigaroth" misspelling to "Vigoroth"

2018-10-16 12:06:38 -04:00

field_effects.h

Move field effects enum to defines

2018-11-13 14:19:04 +00:00

flags.h

clean flags and remove temp macro

2018-10-19 14:59:18 -04:00

game_stat.h

…

heal_locations.h

…

hold_effects.h

…

items.h

…

map_types.h

…

maps.h

…

mauville_man.h

…

metatile_behaviors.h

Move metatile behavior constants to include/constants and sync closer to pokeruby

2018-10-04 17:57:07 -05:00

moves.h

…

opponents.h

…

pokemon.h

Party Size and Num Stats

2018-11-18 20:00:36 +01:00

region_map_sections.h

…

rgb.h

…

secret_bases.h

…

songs.h

…

species.h

Make data easier to edit

2018-12-03 14:49:16 +01:00

trainers.h

tweak alignment

2018-12-03 08:04:11 -05:00

vars.h

…

weather.h

…