TheXaman
|
965bcfa29d
|
Added newest Makefile and fixed making from clean
|
2021-02-04 18:04:00 +01:00 |
|
TheXaman
|
fbbc604848
|
Added evolution screen! Improved BE compatibility
|
2021-02-04 13:48:32 +01:00 |
|
ultima-soul
|
46e853c13b
|
Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync
|
2021-02-03 16:23:23 -08:00 |
|
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 |
|
GriffinR
|
15906ca143
|
Document evolution scene
|
2021-02-03 17:55:37 -05:00 |
|
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 |
|
Evan
|
6139b12a49
|
fix hp boxes not dissapearing
|
2021-02-02 23:30:08 -07: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 |
|
ultima-soul
|
7a237595c9
|
Merge pull request #1389 from LOuroboros/syntax
Removed trailing spaces from various files
|
2021-02-02 11:04:34 -08: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 |
|
Evan
|
00cbe61e13
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_abilities
|
2021-02-02 09:00:12 -07:00 |
|
Evan
|
f4d4cf262e
|
fix screen cleaner, curious medicine, as one
|
2021-02-02 09:00:07 -07:00 |
|
GriffinR
|
64460e01ae
|
Merge pull request #1314 from GriffinRichards/doc-controllers
Document battle controllers, misc other battle
|
2021-02-02 00:24:16 -05: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 |
|
LOuroboros
|
fc04c6974b
|
Edit->Blank Operations->Trim Trailing Space for the win
|
2021-02-01 17:05:49 -03:00 |
|
GriffinR
|
90513a9d72
|
Merge pull request #1318 from GriffinRichards/bardmoves
Minor bard music clean up
|
2021-02-01 14:59:45 -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 |
|
Evan
|
1c75483f51
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ripen
|
2021-01-31 23:31:38 -07:00 |
|
Evan
|
f428e5e2dc
|
some quick claw/custap berry fixes
|
2021-01-31 23:31:27 -07: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 |
|
ExpoSeed
|
8b8d4d4a9f
|
Merge pull request #1376 from ghoulslash/fire_blast
Fix Fire Blast Power
|
2021-01-31 15:24:52 -06:00 |
|
GriffinR
|
45ee3a687d
|
Add comments for some data in crt0.s
|
2021-01-29 18:36:39 -05:00 |
|
amiosi
|
ae2b8be147
|
Update battle_moves.h
|
2021-01-29 18:07:36 -05:00 |
|