Marcus Huderle c17f7d73fa Merge remote-tracking branch 'origin/battle_engine_v2' into features ...

# Conflicts:
#	ld_script.txt
#	src/effects_1.c

2018-12-23 17:24:14 -06:00

..

battle_anims

Add Poison Jab animation

2018-12-20 11:58:21 -06:00

battle_frontier

Fix file permissions.

2018-01-19 15:06:49 -05:00

battle_interface

merge with master

2018-11-30 20:46:09 +01:00

battle_terrain

Fix file permissions.

2018-01-19 15:06:49 -05:00

battle_transitions

Fix more of them sneaky executables

2018-01-21 15:25:18 -05:00

berries

reorganize berry graphics files

2018-02-06 11:51:43 -06:00

berry_blender

remove some redundant .pal files

2018-02-06 11:46:34 -06:00

berry_crusher

Fix file permissions.

2018-01-19 15:06:49 -05:00

berry_fix

Fix file permissions.

2018-01-19 15:06:49 -05:00

birch_speech

remove some redundant .pal files

2018-02-06 11:46:34 -06:00

contest

Fix file permissions.

2018-01-19 15:06:49 -05:00

credits

Extract scattered baseroms and cleanup

2017-09-25 16:27:02 -05:00

decorations

remove some redundant .pal files

2018-02-06 11:46:34 -06:00

door_anims

Extract door animations

2018-01-07 01:29:26 -06:00

easy_chat

Fix file permissions.

2018-01-19 15:06:49 -05:00

event_objects

Rename OW Sprites

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

evolution_scene

Extract data from misc files

2017-12-25 00:32:01 -06:00

frontier_pass

Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms

2018-01-21 15:22:05 -05:00

interface

Document battle ui

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

interface_fr

Fix file permissions.

2018-01-19 15:06:49 -05:00

intro

remove some redundant .pal files

2018-02-06 11:46:34 -06:00

items

move item graphics

2016-09-03 11:10:34 -07:00

link

remove some redundant .pal files

2018-02-06 11:46:34 -06:00

link_games

remove some redundant .pal files

2018-02-06 11:46:34 -06:00

mail

Fix file permissions.

2018-01-19 15:06:49 -05:00

misc

merge with master

2018-08-12 22:37:28 +02:00

naming_screen

Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms

2018-01-21 15:22:05 -05:00

picture_frame

Extract contest painting

2017-12-24 01:09:18 -06:00

pokeblock

Fix file permissions.

2018-01-19 15:06:49 -05:00

pokedex

Decompile pokedex_cry_screen.c (#406)

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

pokemon

Extract data around Deoxys icon

2018-01-14 23:40:55 -06:00

pokemon_storage

Fix file permissions.

2018-01-19 15:06:49 -05:00

pokenav

remove some redundant .pal files

2018-02-06 11:46:34 -06:00

rayquaza_scene

Fix file permissions.

2018-01-19 15:06:49 -05:00

roulette

Fix file permissions.

2018-01-19 15:06:49 -05:00

slot_machine

Fix more of them sneaky executables

2018-01-21 15:25:18 -05:00

spinda_spots

move some pokemon data to c

2018-02-05 17:39:26 +01:00

text_window

Extract data from text window

2018-01-20 00:49:21 -06:00

title_screen

remove some redundant .pal files

2018-02-06 11:46:34 -06:00

trade

Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms

2018-01-21 15:22:05 -05:00

trainer_card

Merge branch 'master' of https://github.com/pret/pokeemerald into fix_perms

2018-01-21 15:22:05 -05:00

trainers

renames the winstrate graphics names to pokefan

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

types

Add Fairy Type icon

2018-09-16 10:45:22 +02:00

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

Start decompiling data

2017-11-24 19:06:01 -05:00

weather

Extract data from field_screen.s

2018-01-18 22:36:24 -06:00

wonder_transfers

remove some redundant .pal files

2018-02-06 11:46:34 -06:00