ultima-soul
|
daf5e0167e
|
Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-02-03 16:06:48 -08:00 |
|
MandL27
|
b2a541a33b
|
Merge pull request #1390 from amiosi/mime_jr
Edited Constants to match one another in regards to CamelCase and underscores
|
2021-02-03 17:16:26 -05:00 |
|
amiosi
|
11e6298a05
|
tmhm and tutor spacing
|
2021-02-03 15:08:53 -05:00 |
|
amiosi
|
7714650fef
|
fix build error
|
2021-02-03 14:55:55 -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
|
2cba017699
|
cry renames
|
2021-02-03 12:50:54 -05:00 |
|
amiosi
|
86da6d04ff
|
Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr
|
2021-02-03 12:45:19 -05:00 |
|
ExpoSeed
|
4a8e18cea2
|
Merge pull request #1336 from LOuroboros/cries_PE_redux
Various tweaks related to Pokémon cries
|
2021-02-03 11:26:44 -06: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
|
f46f21bb38
|
tapus again
|
2021-02-02 14:40:04 -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 |
|
ghoulslash
|
2f00169623
|
Merge pull request #1387 from amiosi/dex-decap
decap dex entries
|
2021-02-02 12:17:11 -07:00 |
|
ultima-soul
|
7a237595c9
|
Merge pull request #1389 from LOuroboros/syntax
Removed trailing spaces from various files
|
2021-02-02 11:04:34 -08:00 |
|
LOuroboros
|
e5801d83bc
|
Removed unnecessary copy of Crustle's cry
|
2021-02-02 15:38:49 -03: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 |
|
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 |
|
LOuroboros
|
fc04c6974b
|
Edit->Blank Operations->Trim Trailing Space for the win
|
2021-02-01 17:05:49 -03: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 |
|
ultima-soul
|
a41300a6dc
|
Merge pull request #1386 from Lukien/battle_engine
Added weather check for ability sand force
|
2021-01-31 22:01:21 -08:00 |
|
Lukien
|
9704049818
|
Merge remote-tracking branch 'upstream/battle_engine' into battle_engine
|
2021-01-31 22:46:27 -05:00 |
|
Lukien
|
f69bff6605
|
Update battle_util.c
Added weather check for the ability Sand Force.
|
2021-01-31 22:43:16 -05:00 |
|
ultima-soul
|
eb78b5434c
|
Merge pull request #1377 from ghoulslash/thaw
Update Thawing Moves
|
2021-01-31 13:57:44 -08:00 |
|
Evan
|
be0326301d
|
erge branch 'thaw' of https://github.com/ghoulslash/pokeemerald into thaw
|
2021-01-31 14:55:56 -07:00 |
|
Evan
|
552f548700
|
fix IsThawingMove
|
2021-01-31 14:55:44 -07:00 |
|
ghoulslash
|
9499469337
|
Update src/battle_util.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-01-31 14:43:24 -07:00 |
|
ultima-soul
|
76851eb672
|
Merge pull request #1380 from amiosi/kyurem
Kyurem form moveset swap
|
2021-01-31 13:32:31 -08:00 |
|
ExpoSeed
|
8b8d4d4a9f
|
Merge pull request #1376 from ghoulslash/fire_blast
Fix Fire Blast Power
|
2021-01-31 15:24:52 -06:00 |
|
ExpoSeed
|
0f8e47547a
|
Merge pull request #1382 from amiosi/kings_rock
Kings rock build fix
|
2021-01-29 17:52:49 -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 |
|
Evan
|
a104c156cc
|
thaw move list function
|
2021-01-28 09:00:46 -07:00 |
|