Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,045 Commits 1 Branch 0 Tags
Commit Graph

2881 Commits

Author SHA1 Message Date
ultima-soul
cf0fd961b9 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 23:56:58 -07:00
ultima-soul
00c3f060b1 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 23:53:23 -07:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
ultima-soul
75a9fdbafa Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 20:50:59 -07:00
ultima-soul
0da3f74a7e Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 18:58:38 -07:00
GriffinR
6c38837b26
Merge pull request #1420 from GriffinRichards/doc-dataanims 
Document battler affine anims, default pokeball throw
 2021-04-28 13:56:42 -04:00
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -07:00
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil 
Some Contest clean up
 2021-04-27 02:29:41 -04:00
GriffinR
c0aedf8df4
Merge pull request #1410 from GriffinRichards/doc-tradedata 
Document trade sequence animation, some trade cleanup
 2021-04-26 13:26:12 -04:00
GriffinR
e40f89b175 Move unknown data table, reference with species 2021-04-25 02:19:01 -04:00
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
GriffinR
04af378904 Document trade sequence animation, some trade cleanup 2021-04-20 05:50:39 -04:00
Ariel Antonitis
a36d6c3c2c Renamed OAM tables to match master. 
Fixed renamed functions, etc.
 2021-04-18 23:10:40 -04:00
Ariel Antonitis
221569a710 Merge branch 'master' into romhack 2021-04-18 22:17:53 -04:00
Ariel Antonitis
fbbd58a823 Added music messages. 2021-04-18 21:00:27 -04:00
Ariel Antonitis
875c4edd50 Added some conditional messages. 
Added emote graphics.
 2021-04-18 21:00:27 -04:00
Ariel Antonitis
e647e926a8 Added all unconditional HGSS messages. 2021-04-18 20:59:23 -04:00
GriffinR
52495e889f Doc storage - cleanup 2021-04-18 01:44:25 -04:00
ExpoSeed
f922d42988 Refactor hidden abilities 2021-04-16 23:38:35 -05:00
GriffinR
838a452363 Doc storage - choose box menu, move wallpaper gfx 2021-04-15 18:46:20 -04:00
GriffinR
a1ed59450e Doc storage - wallpaper and titles 2021-04-15 16:09:41 -04:00
AmbientDinosaur
232acab1a2
Remove superfluous define of LEVEL_UP_END 
LEVEL_UP_END is already defined in constants/pokemon.h
 2021-04-10 22:55:07 +02:00
ghoulslash
98bccaa35d Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-04-10 14:28:07 -06:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field 
Document field
 2021-04-10 13:05:51 -04:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04:00
AmbientDinosaur
ad19b262eb
Corrected the move data for Gen 4 Overheat 
The contact flag was removed in Gen 4, and the base power was lowered in Gen 6. Currently, the changes are flipped around.
 2021-04-08 03:21:51 +02:00
ExpoSeed
8494306d1d Rename flags 2021-04-07 16:07:30 -05:00
LOuroboros
75b6d2837e Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into the_potion_seller 2021-04-07 17:10:52 -03:00
GriffinR
d717a635c8 event_object_movement cleanup 2021-04-06 17:55:29 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
LOuroboros
bd802ce976 Update species_names.h 2021-04-06 09:53:21 -03:00
GriffinR
802d2b2f0f Label Kyogre/Groudon anims 2021-04-06 03:46:19 -04:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
ExpoSeed
5eed23b5d8 Razor claw effect 2021-04-05 23:19:03 -05:00
GriffinR
806abe2999 Document some objev anims, make objevgfx info static 2021-04-05 19:52:35 -04:00
ExpoSeed
afb97abba0
Merge pull request #1425 from LOuroboros/nature_names 
Decapped nature names
 2021-04-04 15:11:12 -05:00
ExpoSeed
3517baae2d Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into IE/item-use-form-change 2021-04-04 01:21:18 -05:00
ExpoSeed
cf9d5f8563 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-04-04 01:11:32 -05:00
ultima-soul
be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
LOuroboros
9f83c9b574 Implemented Stench's battle effect 
And updated its description.
 2021-04-03 23:47:10 -03:00
LOuroboros
f04f35f5c3 Added a config for the amount of HP recovered by healing items 2021-04-02 20:34:57 -03:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00
ghoulslash
5e948e746b add dexnav 2021-04-02 12:28:00 -06:00
ghoulslash
5636706386 fix battle move data 2021-04-02 09:08:08 -06:00
Evan
d3d29d7cb5 cherry pick 0cccbfd0ba608287d5f2b642ea613d9674cd919d 2021-04-01 20:12:43 -06:00
Evan
228b76e136 finish conditional slow stairs movement, clean up code a bit 2021-04-01 20:10:41 -06:00
Evan
31e9f97d52 cherry pick 4eb7fcc261934c0f9f10985761cd3e7b7abf0dab 2021-04-01 20:10:21 -06:00