Commit Graph

4169 Commits

Author SHA1 Message Date
Marcus Huderle
6add3e1794 Document some battle dome stuff 2019-02-08 11:08:25 -06:00
Marcus Huderle
4570e3b6a5 Document battle arena 2019-02-08 09:41:36 -06:00
PALPATlNE
e7f8186ccc Mud bomb and Shadow Sneak Animations 2019-02-08 03:13:36 +01:00
Marcus Huderle
3a40f5203b Remove old rom_818CFC8.h header 2019-02-07 17:41:44 -06:00
Marcus Huderle
85040e26fd Document battle pike 2019-02-07 17:37:41 -06:00
DizzyEggg
6a186b5d5a Fix Sap Sipper 2019-02-07 21:33:03 +01:00
DizzyEggg
40e1dcb1d9 Fix Psycho Shift copying toxic counter 2019-02-07 21:26:42 +01:00
DizzyEggg
aa33a61e58 Merge branch 'master' into battle_engine_v2 2019-02-07 21:17:30 +01:00
Marcus Huderle
4785a07acd Document battle factory functions 2019-02-07 12:58:09 -06:00
Marcus Huderle
b52871433a Fix typo 2019-02-07 11:54:51 -06:00
Marcus Huderle
3a88ab831d Document more battle pyramid 2019-02-07 11:51:03 -06:00
Marcus Huderle
a1ad1bad3a Document a bunch of battle pyramid 2019-02-06 21:14:28 -06:00
Marcus Huderle
1253cbf5f6 Document some battle anim things 2019-02-06 21:14:28 -06:00
Papa Cancer
62fd90caa0 Parting Shot
Effect plus animation (looks like Snarl)
2019-02-05 21:47:50 +00:00
huderlem
e9149b8608
Merge pull request #544 from Diegoisawesome/master
Add json to list of LF line-end files
2019-02-05 15:45:51 -06:00
Diegoisawesome
bc4cc9f78a Merge branch 'master' of github.com:pret/pokeemerald 2019-02-05 14:35:42 -06:00
Diegoisawesome
37e86d7578 Add json to list of LF line-end files 2019-02-05 14:35:31 -06:00
huderlem
b0ee100975
Merge pull request #543 from pret/mapdata
Convert map data to JSON
2019-02-04 21:36:18 -06:00
Marcus Huderle
d4125fef9b Cleanup and add game version flag to mapjson tool 2019-02-04 17:28:45 -06:00
AJ Fontaine
b10c2ecf04
Use Swagger on allies with Own Tempo 2019-02-04 11:55:26 -05:00
Diegoisawesome
646533cfa3
Merge pull request #542 from Slawter666/pss
Label some summary screen functions
2019-02-04 09:46:39 -06:00
Slawter666
fa352cfda3 Some more labelling 2019-02-04 14:35:49 +00:00
Slawter666
3d79aeb9da More documentation 2019-02-04 12:44:09 +00:00
DizzyEggg
c436cdf384 Fix Magnet Rise 2019-02-04 13:40:13 +01:00
DizzyEggg
ed030e5b62 Fix Aurora Veil description 2019-02-04 12:46:04 +01:00
DizzyEggg
a8edf08ee4 Fix Protean ability pop-up 2019-02-04 12:43:20 +01:00
Slawter666
804e955c8d Label some more functions 2019-02-04 11:38:44 +00:00
garak
82abc164dc convert mapjson.py to mapjson.cpp 2019-02-03 09:38:29 -06:00
DizzyEggg
f415871369 Merge with master 2019-02-03 10:44:05 +01:00
Slawter666
031fd66393 Label some summary screen functions 2019-02-02 22:14:04 +00:00
Diegoisawesome
ff48e5ada0
Merge pull request #541 from Diegoisawesome/master
Misc documentation
2019-02-02 16:00:56 -06:00
Diegoisawesome
d64a905d65 Document trainer backsprites 2019-02-02 15:56:22 -06:00
Diegoisawesome
59807c0f2c
Merge pull request #536 from DizzyEggg/menu
Use Menu and List Menu input defines
2019-02-02 12:45:35 -06:00
DizzyEggg
ea79f1c8f6 tabs 2019-02-02 19:41:34 +01:00
Diegoisawesome
e8952c2374
Merge pull request #539 from DizzyEggg/ram_vars
Move ram vars in sym files to C
2019-02-02 11:17:50 -06:00
Diegoisawesome
47c105bef6
Merge pull request #538 from DizzyEggg/data
Dump last battle anim file
2019-02-02 11:12:29 -06:00
Diegoisawesome
f7cb3719e2
Merge pull request #537 from DizzyEggg/bttle
Name battle's action 11
2019-02-02 11:11:55 -06:00
DizzyEggg
363fa9bed2 Clean up ram vars 2019-02-02 12:44:00 +01:00
DizzyEggg
a7f94bbeea Dump last battle anim file 2019-02-02 11:55:11 +01:00
DizzyEggg
a740bc7190 Name action 11 2019-02-02 11:32:00 +01:00
DizzyEggg
23b240ab65 Fix Menu and List Menu input defines 2019-02-02 11:04:38 +01:00
Diegoisawesome
46a3969f69 Add constants for flags and vars 2019-02-02 00:25:43 -06:00
Diegoisawesome
9d8a43a1fb
Merge pull request #534 from DizzyEggg/patch-1
Get rid of an unnecessary extern
2019-02-01 14:51:04 -06:00
Diegoisawesome
437457c0c6
Merge pull request #533 from DizzyEggg/item
Match GetItemEffectType
2019-02-01 14:50:51 -06:00
DizzyEggg
b3d48c0ed6
Get rid of an unnecessary extern 2019-02-01 19:45:06 +01:00
DizzyEggg
d02a788d2e Match GetItemEffectType 2019-02-01 19:25:10 +01:00
Diegoisawesome
b26c24ffee
Merge pull request #532 from DizzyEggg/bored
Fix some fakematches
2019-02-01 10:04:42 -06:00
Diegoisawesome
b4f83b4f0f
Merge pull request #531 from DizzyEggg/lol
CgbSound
2019-02-01 10:00:55 -06:00
DizzyEggg
a42bba755b Add Crafty Shield effect 2019-02-01 14:34:16 +01:00
DizzyEggg
a3460c9e45 Code Belch effect 2019-02-01 14:17:24 +01:00