Commit Graph

1337 Commits

Author SHA1 Message Date
DizzyEggg
88b788bfab Fix Charge Beam effect 2019-01-27 11:57:13 +01:00
DizzyEggg
897592a8d4 Merge branch 'master' into battle_engine_v2 2019-01-27 10:58:57 +01:00
Diegoisawesome
6b2dda422b Merge branch 'master' of github.com:pret/pokeemerald 2019-01-27 00:11:44 -06:00
Diegoisawesome
7a60f36954 Clean up variable numbers mistakenly written as decimal 2019-01-27 00:11:32 -06:00
DizzyEggg
01c3f3fc05 Document all of frontier pass 2019-01-26 20:56:06 +01:00
DizzyEggg
ebfaf3f6be Merge branch 'master' into dump 2019-01-24 21:30:19 +01:00
DizzyEggg
524db6068e Merge branch 'master' into trainer_card 2019-01-22 21:59:32 +01:00
Diegoisawesome
900f294011 Add var const prefix for some missed var numbers 2019-01-21 22:34:01 -06:00
DizzyEggg
4e396207d3 document more of trainer card 2019-01-20 18:24:35 +01:00
DizzyEggg
576d1b3474 Document and match somne trainer card 2019-01-19 23:04:33 +01:00
DizzyEggg
f84b22fca4 Dump trainer hill trainers 2019-01-19 12:57:18 +01:00
DizzyEggg
f34ab49f63
Merge pull request #56 from SBird1337/feature/battle-engine-animpack1
Add some animations (see below)
2019-01-18 23:06:19 +01:00
DizzyEggg
2c3210f4d1 merge with master 2019-01-18 22:30:34 +01:00
Diegoisawesome
6857b73ee3 Split pokenav so calcrom works properly 2019-01-14 15:25:29 -06:00
Karathan
5ad85f0d55 add bullet punch animation 2019-01-14 00:21:36 +01:00
DizzyEggg
edddd847c5 Document and clean up trainer hill 2019-01-13 20:50:08 +01:00
Karathan
200f0a09d3 add sticky web 2019-01-13 19:35:29 +01:00
Karathan
bb38edad23 add x-scissor animation 2019-01-13 19:13:37 +01:00
Karathan
cb617401a6 add air slash 2019-01-13 17:03:23 +01:00
DizzyEggg
c0bc01d301 Move some vars to C 2019-01-13 13:15:23 +01:00
SBird1337
3a5e5d04e7 add iceshard 2019-01-13 01:21:05 +01:00
Karathan
74ae0a6e83 add thunder fang and fire fang animations 2019-01-12 17:03:44 +01:00
Karathan
768af79b36 add ice fang animation 2019-01-12 17:02:24 +01:00
Karathan
e0be163978 add seed bomb animation 2019-01-12 17:02:24 +01:00
Karathan
832c0d6333 add toxic spike animation 2019-01-12 17:02:24 +01:00
Karathan
8c73045fd6 add brave bird animation 2019-01-12 17:02:24 +01:00
Slawter666
f8c2fcb9b2 Merge branch 'master' of https://github.com/pret/pokeemerald into secret-base 2019-01-05 19:54:26 +00:00
DizzyEggg
4827776a3c Merge with master 2019-01-05 10:14:20 +01:00
Tetrable
30e7ac0dca Fix merge conflicts 2019-01-03 02:28:18 +00:00
Tetrable
50aa222aff Corrected typos 2019-01-03 01:54:55 +00:00
Marcus Huderle
b471bba55e Use better names for match call texts 2019-01-02 19:46:15 -06:00
Marcus Huderle
e1092028ec Decompile match_call.c 2019-01-02 19:46:15 -06:00
Diegoisawesome
0053e61535
Merge pull request #504 from Diegoisawesome/roulette
Port/decompile roulette
2019-01-02 17:00:33 -06:00
Diegoisawesome
6202ae1df0 Extract rodata from roulette 2019-01-02 16:40:40 -06:00
Tetrable
a3ebca4d81 Fix merge conflicts 2019-01-02 21:25:14 +00:00
Tetrable
1e3da62d24 Finish off labelling flags 2019-01-02 21:12:43 +00:00
Diegoisawesome
af1e44befe Continue porting roulette 2018-12-31 18:07:29 -06:00
Marcus Huderle
fb2d1591c1 Document more battle anim effects 2018-12-31 16:53:38 -06:00
Diegoisawesome
d004ce065c Merge branch 'master' of github.com:pret/pokeemerald into trade 2018-12-31 02:30:30 -06:00
Diegoisawesome
c5c6e437ec Document, cleanup, extract data from trade 2018-12-31 01:23:27 -06:00
Marcus Huderle
58f130d007 Document some battle anims and helpers 2018-12-30 11:04:17 -06:00
Diegoisawesome
2fb9f490fb Almost done with trade 2018-12-29 12:46:15 -06:00
Melody
dc6c0ed17e add event object var references 2018-12-29 11:56:53 -06:00
Marcus Huderle
6e7bdb3ca4 Document misc field_specials things 2018-12-29 11:36:54 -06:00
Marcus Huderle
67636b7c64 Document deoxys rock 2018-12-29 11:36:54 -06:00
DizzyEggg
27b1d74dad Merge branch 'master' into battle_engine_v2 2018-12-29 15:11:54 +01:00
Melody
6d556f8cf7 improve checkplayergender calls
clean up constant definitions

make tweaks from review
2018-12-28 08:22:21 -06:00
Marcus Huderle
c3dde7353d
Add newline to Route111_NoMirageTower layout.inc
To match all other layout.inc files.
2018-12-26 17:04:24 -06:00
Marcus Huderle
a1ea3b5e39
Use map_header_flags macro (#483) 2018-12-26 12:20:15 -06:00
DizzyEggg
6411d1d693
Merge pull request #55 from huderlem/anims
Some battle anims
2018-12-26 17:48:03 +01:00