10963 Commits

Author SHA1 Message Date
ghoulslash
e013c44340
Merge pull request #1319 from LOuroboros/item_tweaks
Updated the type-enhancing items' boost
2021-01-12 09:24:55 -07:00
ghoulslash
a24ce5c715
Merge pull request #1341 from SBird1337/pokemon_expansion
Define missing Items for gEvolutionTable
2021-01-12 09:21:58 -07:00
ghoulslash
fba17a96a4
Merge pull request #1253 from surskitty/battle_engine
Increase readability of too-long names
2021-01-12 09:20:53 -07:00
amiosi
7e91129332 may as well do the rest 2021-01-11 20:18:23 -05:00
amiosi
eaca987879 more fixes
light ball and gen 6 evolution held items
2021-01-11 19:54:41 -05:00
amiosi
3aadd69303 fixes
pokeblock berries and evolution items
2021-01-11 19:49:03 -05:00
Evan
4912bc1d25 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-01-11 17:15:41 -07:00
ultima-soul
3cb09b6507 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into deoxys_handling_removal 2021-01-11 15:19:11 -08:00
GriffinR
92de664f79 List battle animation indexes alongside tables 2021-01-11 16:07:16 -05:00
Philipp AUER
b5fa0129d5 [pokemon-expansion] Changes as requested by code review
Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-11 21:43:00 +01:00
surskitty
29343ce1ec
Remove synonyms
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-01-11 15:00:11 -05:00
GriffinR
9ed413fe8f Remove redundant bug fix description 2021-01-11 10:39:53 -05:00
GriffinR
fa3acd79e7 Fix missing header for sub_817F77C BUGFIX 2021-01-11 10:37:22 -05:00
GriffinR
4a7a3df205 Move SeedRngWithRtc fix to BUGFIX conditional 2021-01-11 10:36:53 -05:00
GriffinR
a733b211a3
Merge pull request #1297 from SatoMew/master
Document the unused battle strings for downpour weather
2021-01-11 10:01:57 -05:00
GriffinR
a6317b7f57
Merge pull request #1299 from opakedragon/payday-string-id
rename payday string id
2021-01-11 09:51:18 -05:00
opakedragon
295ec313f5
rename string id/variable to reflect usage 2021-01-11 08:49:31 -05:00
opakedragon
cbaf9b38b2
rename string id to reflect usage 2021-01-11 08:48:00 -05:00
opakedragon
3ce4e6b24b
rename string id to reflect usage 2021-01-11 08:47:11 -05:00
ultima-soul
e804e4c4ba
Merge pull request #1242 from ghoulslash/totem
Totem Boosts
2021-01-10 18:43:46 -08:00
Evan
8bad377a2e magic room affects macho brace/power item speed drop 2021-01-10 16:57:27 -07:00
SatoMew
ead437e89b Document the unused battle strings for downpour weather 2021-01-10 22:26:00 +00:00
surskitty
f58539b602 Renaming the last two and fixing the merge conflict with PE. 2021-01-10 15:48:57 -05:00
surskitty
a0f1dcb9cf Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into battle_engine 2021-01-10 15:40:21 -05:00
amiosi
8d7d819cde beast ball cannot be sold 2021-01-10 15:08:48 -05:00
GriffinR
e6aebc16da
Merge pull request #1296 from GriffinRichards/bugfix-typo
Add missing braces to bugfix in CalculateMonStats
2021-01-10 12:34:39 -05:00
sbird
95665c24b4 [pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable 2021-01-10 18:30:15 +01:00
GriffinR
8afc28c98f Add missing braces to bugfix in CalculateMonStats 2021-01-10 12:24:59 -05:00
Evan
1e22ae4cf2 merge with be 2021-01-10 09:08:25 -07:00
Evan
d4e4405cf5 merge with be 2021-01-10 09:04:21 -07:00
Evan
c95bfae701 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_hold_effects 2021-01-10 09:02:21 -07:00
Evan
6a3266a265 fix syntax err 2021-01-10 09:02:06 -07:00
Evan
bb540b6236 fix AI_WeatherHasEffect to handle unknown abilities 2021-01-10 08:58:41 -07:00
Evan
e748db8ef4 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into ai 2021-01-10 08:58:16 -07:00
LOuroboros
3ffa7f993a Renamed some X Defend labels to reflect its new name in the IE 2021-01-10 01:58:02 -03:00
LOuroboros
f4d34f70c4 Renamed some X Defend labels to reflect its new name 2021-01-10 01:54:41 -03:00
LOuroboros
db37c4f25c Review correction to src/data/pokemon/item_effects.h 2021-01-09 21:47:58 -03:00
ultima-soul
b5b4efdaa0
Merge pull request #1314 from LOuroboros/battle_debug_constant
battle_config.h tweaks
2021-01-09 12:36:37 -08:00
ultima-soul
1caed479de
Merge pull request #1298 from ghoulslash/mummy
Fix Early Mummy Activation
2021-01-09 12:33:04 -08:00
ultima-soul
2a13e85785
Merge pull request #1340 from ultima-soul/gen_8_mon_data
Corrected Defines for Item Expansion-introduced Items in Gen 8 Species Data
2021-01-08 20:07:44 -08:00
ultima-soul
767f26b73c Corrected defines for Item Expansion-introduced items for Gen 8 species data. 2021-01-08 19:06:20 -08:00
Evan
b5128be68b eject packer invisible before openpartymenu 2021-01-08 08:02:00 -07:00
Evan
6dabff1ee3 merge with be 2021-01-07 21:24:21 -07:00
Evan
2bd5167a6c eject pack 2021-01-07 21:11:56 -07:00
Evan
0118723a9c add eject button 2021-01-07 20:31:27 -07:00
Evan
5eb49722c0 add red card effect 2021-01-07 19:33:39 -07:00
GriffinR
42a0b20e57
Merge pull request #1295 from sphericalice/pokeemerald
Use constants for IV-related values
2021-01-07 18:00:10 -05:00
SphericalIce
f02afc134b Use the correct constant for max-IV masks 2021-01-07 22:34:57 +00:00
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
ultima-soul
d2d961e447
Merge pull request #1262 from LOuroboros/gen8_abilities_BE
Implemented various Gen. 8 abilities
2021-01-07 13:31:17 -08:00