1570 Commits

Author SHA1 Message Date
GriffinR
8d3b7bd0b1 Use metatile labels for decor gfx 2020-04-13 14:43:50 -04:00
GriffinR
96958ba5e9 Drop unnecessary decor prefix 2020-04-13 13:04:22 -04:00
MandL27
2c9ee80004
Gen 4+ moves get contest effects (#319)
* Add contest move effects

* Fix constants and also fix some laughable combo coding

* comment usum moves for cleaner merge

* clean up gitignore

* revert gitignore

* also revert moves.h because I'm bad at reading messages

* add some missing effects because the spreadsheet I sourced is bad
2020-04-13 15:05:10 +02:00
DizzyEggg
cb5b673f8a Big Root and STRENGTH Sap 2020-04-13 15:00:17 +02:00
DizzyEggg
060b795d8e Merge with master 2020-04-11 19:48:24 +02:00
DizzyEggg
1435cd4692 Change inner structure of semi invulerable moves 2020-04-11 11:47:13 +02:00
GriffinR
2615a6838e Label unknown anims 2020-04-09 19:24:47 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap
Document some pokenav and region map
2020-03-17 10:38:20 -04:00
DizzyEggg
6968124529 Merge battle anim documentation 2020-02-29 13:59:41 +01:00
DizzyEggg
f95a335c0d Merge with master 2020-02-29 10:35:01 +01:00
DizzyEggg
f2760e3083 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-02-29 09:47:14 +01:00
ultima-soul
1b048c0ecf
Fix grass and Pokemon Center monitor palette issues. (#296) 2020-02-29 09:22:37 +01:00
GriffinR
172cb7bae9 Sync Unown and qmark mon folders with pokefirered 2020-02-25 14:18:28 -06:00
GriffinR
b1d131ace2 Convert base_stats.h to UTF-8 2020-02-25 12:46:03 -06:00
DizzyEggg
3c938d1809 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-02-23 12:42:21 +01:00
DizzyEggg
13c0c64d70 Merge with master 2020-02-23 12:41:36 +01:00
DizzyEggg
108f6b711f Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into battle_engine_v2 2020-02-23 10:58:26 +01:00
Eduardo Alvaro Quezada D'Ottone
0c0af89024
Ordered unordered item graphics and palettes. (#269) 2020-02-22 23:44:30 +01:00
Eduardo Alvaro Quezada D'Ottone
70ebc6b55b
Lycanroc forms (#268)
* Midnight Lycanroc

* Dusk Lycanroc
2020-02-22 23:42:16 +01:00
Eduardo Alvaro Quezada D'Ottone
2c172a3636
Shiny charm (#276)
* Shiny Charm Item

* Shiny Charm Rerolls
2020-02-17 11:08:06 +01:00
Marcus Huderle
49421a41b2 Move field effects data and graphics into own directory, and cleanup naming for object events 2020-02-12 17:32:51 -06:00
GriffinR
956090b05f Merge branch 'master' of https://github.com/pret/pokeemerald into fix-eventobj 2020-02-12 13:05:57 -05:00
GriffinR
689acd3613 Move slot machine data to src 2020-02-09 14:11:50 -06:00
Eduardo Alvaro Quezada D'Ottone
bb10a69f81
Busted Mimikyu (#254)
* Busted Mimikyu

* Fixed back sprite coords.
2020-02-08 19:32:01 +01:00
Eduardo Alvaro Quezada D'Ottone
98867f0cb3
Dex Text Fixes (#253)
- Fixed decap error in Eevee's Pokédex text.
- Fixed missing decap in Mew's Pokédex text.
2020-02-08 15:52:25 +01:00
Eduardo Alvaro Quezada D'Ottone
bd8d304c01
Spark is now Physical (#261) 2020-02-08 09:40:51 +01:00
GriffinR
86354f1d50 Document some pokenav and region map 2020-02-05 21:04:43 -05:00
DizzyEggg
bf6aa6a176 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-01-31 22:02:10 +01:00
DizzyEggg
e1a428a25d Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-31 21:17:19 +01:00
DizzyEggg
8889039a57 Merge with master 2020-01-31 21:15:08 +01:00
GriffinR
9c934c9664 Merge master into fix-eventobj, add explicit size to gObjectEventGraphicsInfoPointers 2020-01-26 12:23:08 -05:00
GriffinR
7232bfecc2 Name null palettes 2020-01-26 09:40:35 -06:00
GriffinR
4c12ad00d2 Merge branch 'master' into fix-eventobj 2020-01-19 21:57:29 -05:00
DizzyEggg
62755e2501 Fix Eevee evolutions no ability 2020-01-18 20:42:04 +01:00
Eduardo Alvaro Quezada D'Ottone
b87dac459b Implemented missing Neuroforce. (#242)
* Added ID, name and description.

* Added damage multiplier.
2020-01-18 18:34:04 +01:00
DizzyEggg
d8aab3d112 Merge with master 2020-01-18 18:17:25 +01:00
DizzyEggg
26e109d788 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into pokemon_expansion 2020-01-18 15:06:43 +01:00
DizzyEggg
044f070020 Merge with master 2020-01-18 15:04:56 +01:00
GriffinR
655910a16f
Merge branch 'master' into fix-eventobj 2020-01-12 22:42:43 -05:00
DizzyEggg
f1d1557a39 Merge with master 2020-01-12 15:06:52 +01:00
DizzyEggg
1141e733eb Merge with master 2020-01-12 14:29:43 +01:00
GriffinR
635267ce32
Merge branch 'master' into fix-eventobj 2020-01-08 05:51:49 -05:00
GriffinR
ef67f2d33b Merge master into ObjEvent rename and prune accidental inclusions 2020-01-08 05:43:06 -05:00
GriffinR
e5df61e362
Merge branch 'master' into doc-dome 2020-01-08 01:15:36 -05:00
GriffinR
017fa294b5 Add battle tent mon/trainer constants 2020-01-08 01:07:53 -05:00
GriffinR
fb5bea98ce More battle_dome.c doc 2020-01-07 22:30:37 -05:00
GriffinR
c85ca4b860 Standardize farfetchd spelling 2020-01-06 15:17:11 -06:00
GriffinR
379f7f5149 Add braces to trainer party moves 2020-01-06 15:16:49 -06:00
GriffinR
bb692a03eb Add frontier mon constants 2020-01-03 23:20:11 -05:00
DizzyEggg
f9cfc29f8f
Merge pull request #227 from SBird1337/pokemon_expansion
update gMonBackPicCoords, fix Xerneas PNG checksum
2020-01-01 15:15:18 +01:00