DizzyEggg 6fa5f33519 Merge branch 'master' into battle_engine_v2

2018-12-24 09:07:18 +01:00

..

bard_music

Move data from include to src

2018-08-23 02:32:34 -05:00

battle_frontier

Finish porting battle frontier data

2018-12-05 22:21:26 +01:00

decoration

Get rid of headers in src/data

2018-12-03 16:10:41 +01:00

field_event_obj

Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs

2018-12-06 10:38:28 +08:00

graphics

Merge branch 'master' into fldeff

2018-12-16 20:05:31 -05:00

pokemon

Merge branch 'master' into battle_engine_v2

2018-12-24 09:07:18 +01:00

pokemon_graphics

Add macros to simplify defining front animations and still pics.

2018-12-17 12:29:35 -05:00

region_map

Use normal apostrophes like adults

2018-12-07 10:41:08 -05:00

text

Fix conflicts

2018-12-09 13:12:02 +01:00

trainer_graphics

index trainer front anims ptr table

2018-12-03 08:36:10 -05:00

battle_moves.h

Fix Quick Guard

2018-12-22 15:10:24 +01:00

contest_moves.h

Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs

2018-12-06 10:38:28 +08:00

heal_locations.h

port larger heal location changes from poke ruby pr

2018-08-10 10:45:15 -04:00

item_icon_table.h

Fix conflicts

2018-12-09 13:12:02 +01:00

items.h

Added new battle items.

2018-12-13 09:31:47 -08:00

trainer_parties.h

Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs

2018-12-06 10:38:28 +08:00

trainers.h

add more consistent names

2018-12-02 22:36:09 -05:00

wild_encounters.h

Move data out of wild_encounter.c

2018-12-19 22:50:54 -05:00