Marcus Huderle e9a3cc6d51 Merge remote-tracking branch 'upstream/master' into move-tutor ...

# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c

2019-03-17 17:20:40 -05:00

..

battle_anims

Document more battle anim effects

2018-12-31 16:53:38 -06:00

battle_frontier

Document battle arena

2019-02-08 09:41:36 -06:00

battle_interface

Document battle ui

2018-11-22 01:10:50 +00:00

battle_terrain

…

battle_transitions

…

berries

…

berry_blender

…

berry_crusher

…

berry_fix

…

birch_speech

…

contest

…

credits

…

decorations

…

door_anims

…

easy_chat

Document easy chat screen types

2019-02-27 12:55:29 -06:00

event_objects

Rename OW Sprites

2018-10-14 15:49:55 -04:00

evolution_scene

…

frontier_pass

…

interface

Document battle ui

2018-11-22 01:10:50 +00:00

interface_fr

…

intro

…

items

…

link

…

link_games

…

mail

…

misc

Document easy chat screen types

2019-02-27 12:55:29 -06:00

naming_screen

…

picture_frame

…

pokeblock

…

pokedex

Decompile pokedex_cry_screen.c (#406)

2018-11-28 10:14:32 -06:00

pokemon

move pokemon graphics to mon-specific directories

2019-03-16 12:21:47 -05:00

pokemon_storage

…

pokenav

Move constants into C

2019-03-06 22:58:05 -05:00

rayquaza_scene

…

roulette

…

slot_machine

…

spinda_spots

…

text_window

…

title_screen

…

trade

…

trainer_card

…

trainers

renames the winstrate graphics names to pokefan

2018-12-02 00:47:04 -05:00

types

…

unknown

Convert battle_anim_815A0D4 data to .c

2018-12-18 19:15:59 -06:00

unused

Finish porting/decompiling field_effect.c

2018-05-10 18:36:57 -05:00

wallclock

…

weather

Change drought colors table files to .bin

2019-01-29 14:36:02 -06:00

wonder_transfers

…