1661 Commits

Author SHA1 Message Date
amiosi
11e6298a05 tmhm and tutor spacing 2021-02-03 15:08:53 -05:00
amiosi
762dcb8a7c cry fixes, type null 2021-02-03 14:10:39 -05:00
amiosi
b84f952f32 mistaken MrRime change 2021-02-03 13:09:09 -05:00
amiosi
663cc5b15c oricorio... 2021-02-03 13:02:13 -05:00
amiosi
418da6158b last of the cries 2021-02-03 12:57:56 -05:00
amiosi
e62f53b13e fix spacing i missed on tutors and expand to all species
plus reorder kyurem forms to match the rest of the repo
2021-02-02 15:18:45 -05:00
amiosi
0798ba22a6 fix tmhm spacing i missed, extend to all species 2021-02-02 15:10:45 -05:00
amiosi
a021204389 oricorio pau constants 2021-02-02 14:49:01 -05:00
amiosi
032f8ac834 tapus pls 2021-02-02 14:43:12 -05:00
amiosi
248e0b50d7 Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 14:24:36 -05:00
amiosi
9c2c337e6f tapu case 2021-02-02 14:24:15 -05:00
amiosi
f700004188 proper CamelCase 2021-02-02 14:21:00 -05:00
Evan
0483114a05 merge and some fixes 2021-02-02 11:45:15 -07:00
amiosi
dba1383d55 Merge remote-tracking branch 'upstream/pokemon_expansion' into dex-decap 2021-02-02 13:33:06 -05:00
amiosi
42ea6f482b more dex entry spacing 2021-02-02 13:32:55 -05:00
amiosi
2d6b80455d Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 13:25:53 -05:00
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
ExpoSeed
f93bd60c93
Merge pull request #1371 from LOuroboros/keldeo_resolute
Fixed Keldeo Resolute's animation
2021-02-02 11:18:23 -06:00
ExpoSeed
2d1384e88f
Merge pull request #1370 from LOuroboros/deoxys
Fixed Deoxys Attack Form's animation
2021-02-02 11:17:25 -06:00
ghoulslash
a00db597ba
Merge pull request #1383 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
2021-02-02 10:02:31 -07:00
ghoulslash
47f89de53b
Merge pull request #1384 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
2021-02-02 09:48:21 -07:00
GriffinR
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
2021-02-01 21:04:00 -05:00
ultima-soul
5fdb578747 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-02-01 15:58:18 -08:00
ultima-soul
2a20d50904 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-02-01 15:54:08 -08:00
amiosi
940ca8dc19 category decap and length 2021-02-01 15:25:53 -05:00
amiosi
102285d464 mons/moves 2021-02-01 14:37:48 -05:00
amiosi
35f3cdd2f2 decap POKeMON string 2021-02-01 14:19:24 -05:00
ExpoSeed
8b8d4d4a9f
Merge pull request #1376 from ghoulslash/fire_blast
Fix Fire Blast Power
2021-01-31 15:24:52 -06:00
amiosi
ae2b8be147 Update battle_moves.h 2021-01-29 18:07:36 -05:00
amiosi
fe3419fa21 Update level_up_learnsets.h 2021-01-29 15:51:53 -05:00
ghoulslash
00085d9d90
Merge pull request #1321 from amiosi/battle_engine
remove redundant minimize interactions and add move config ifs
2021-01-29 12:24:56 -07:00
ultima-soul
96232ea166 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-01-28 23:59:08 -08:00
GriffinR
12af03cd62 Label bard music pitch table 2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec Index gBardSounds_Moves and gBardSounds_Pokemon with constants 2021-01-28 15:55:33 -05:00
Evan
e11100b030 fix temp learnsets 2021-01-28 13:31:57 -07:00
Evan
c009b51ae8 add grassy glide, misty explosion, steel roller, obstruct, behemoth, decorate, snipe shot 2021-01-28 13:27:00 -07:00
Evan
a37acb8345 coaching, lash out, burning jealousy 2021-01-28 12:21:11 -07:00
ExpoSeed
857fc9ce95
Merge pull request #1320 from amiosi/item_expansion
update item effects, prices, names & descriptions
2021-01-28 12:15:11 -06:00
Evan
dd51edd881 add eerie spell, surging strikes, jungle healing 2021-01-28 10:51:00 -07:00
Evan
34908a2252 fix fire blast power 2021-01-27 19:56:11 -07:00
ExpoSeed
34c6771e94 Create form change table 2021-01-27 16:30:43 -06:00
LOuroboros
6e89f8dff2 Corrected Riolu's evo method 2021-01-27 19:02:37 -03:00
LOuroboros
cfa6fc5eb8 Fixed Keldeo Resolute's animation 2021-01-27 15:26:39 -03:00
LOuroboros
99c7797dc8 Fixed Deoxys Attack Form's animation 2021-01-27 15:06:49 -03:00
Evan
c003f1c023 check move effectiveness with status effects 2021-01-26 15:41:59 -07:00
GriffinR
92bd6400b7 Fix up berry sparkle 2021-01-26 05:40:34 -05:00
amiosi
c6ea2c28f8 fix steamroller 2021-01-24 18:22:51 -05:00
LOuroboros
267bbe2f70 Fixed Mind Blown's category
As it was pointed out by BigAngryDev on Discord, Mind Blown is supposed to be a Special move, not a Physical one.
2021-01-22 19:20:55 -03:00
amiosi
44a0983624 missed some 2021-01-22 07:43:48 -05:00
amiosi
50ce6b2374
Merge branch 'battle_engine' into battle_engine 2021-01-22 07:39:47 -05:00