Commit Graph

57 Commits

Author SHA1 Message Date
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
DizzyEggg
e54dd6a02b Merge with master 2018-12-22 13:53:07 +01:00
Marcus Huderle
b7ce383a96 Document a bunch of battle anims 2018-12-19 21:19:44 -06:00
Marcus Huderle
c74468fd11 Document a bunch of battle anim stuff 2018-12-17 22:16:17 -06:00
Marcus Huderle
c04ce0ee64 Decompile battle_anim_effects_2.c 2018-12-17 22:16:17 -06:00
shinny456
60484153a5 decompile electric.s 2018-12-16 22:23:05 -05:00
Marcus Huderle
d1e6e705cc Decompile battle_anim_effects_1.c 2018-12-16 11:39:22 -06:00