ghoulslash
|
3a77b52bad
|
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge
Battle Engine pret merge
|
2022-07-22 14:00:40 -04:00 |
|
Blackforest92
|
56f4c319a4
|
Fix multiple pokemon graphics, tidying pokemon graphic folders
|
2022-07-22 22:17:29 +07:00 |
|
Eduardo Quezada D'Ottone
|
25397e5794
|
Fixed Light That Burns The Sky not using the calculated damage category
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
|
2022-07-21 15:13:00 -04:00 |
|
ghoulslash
|
462a144956
|
Merge pull request #2200 from AsparagusEduardo/BE_ZMove_power
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
|
2022-07-20 18:10:31 -04:00 |
|
AgustinGDLV
|
9c73cb322e
|
replaced bitfield with LUT
|
2022-07-20 10:48:09 -07:00 |
|
Eduardo Quezada D'Ottone
|
f00beac3f9
|
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
|
2022-07-20 11:32:16 -04:00 |
|
Eduardo Quezada D'Ottone
|
e14afd8957
|
Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5.
|
2022-07-20 10:33:18 -04:00 |
|
Eduardo Quezada D'Ottone
|
fe63dafcc1
|
Merge branch 'battle_engine' into BE_pretmerge
# Conflicts:
# src/battle_anim_fire.c
# src/battle_controller_player.c
|
2022-07-20 08:50:30 -04:00 |
|
sphericalice
|
65db9238e8
|
Give Pikachu its typing back
|
2022-07-18 09:41:04 +01:00 |
|
ghoulslash
|
6b84a9f0b3
|
merge w be
|
2022-07-17 12:40:43 -04:00 |
|
ExpoSeed
|
da4d1bc626
|
Merge pull request #2176 from LOuroboros/patch-1
Fixed Pokéblock Case's description
|
2022-07-16 03:35:26 -05:00 |
|
Eduardo Quezada D'Ottone
|
e791cf90ad
|
Merge tag 'pretmaster' into BE_pretmerge2
# Conflicts:
# data/battle_anim_scripts.s
# include/battle_anim.h
# include/battle_controllers.h
# include/battle_interface.h
# include/battle_main.h
# include/battle_setup.h
# include/constants/battle_anim.h
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_anim_fire.c
# src/battle_anim_normal.c
# src/battle_controllers.c
# src/battle_dome.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/pokemon.c
|
2022-07-15 12:58:46 -04:00 |
|
LOuroboros
|
cec7e30ef1
|
Update battle_moves.h
|
2022-07-15 01:51:36 -03:00 |
|
Eduardo Quezada D'Ottone
|
f78bb4fb84
|
Merge remote-tracking branch 'pret/master' into item_expansion
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-12 17:42:32 -04:00 |
|
Eduardo Quezada D'Ottone
|
c69275f373
|
Merge remote-tracking branch 'pret/master' into PE_pretmerge
# Conflicts:
# include/battle_anim.h
# include/pokemon.h
# src/data/pokemon/base_stats.h
|
2022-07-12 17:20:49 -04:00 |
|
Greenphx9
|
4294682d8c
|
16-letter move names
Move define, add spaces between comments, fix include
if TRUE -> if set to TRUE
Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>
|
2022-07-11 12:49:30 +10:00 |
|
LOuroboros
|
640974b164
|
Update items.h
|
2022-07-05 22:13:15 -03:00 |
|
Blackforest92
|
ff861ff963
|
Add some of Legends Arceus battle sprites
|
2022-07-04 12:28:40 +07:00 |
|
LOuroboros
|
3c9be7c3b2
|
Fixed Pokéblock Case's description
|
2022-07-03 13:36:00 -03:00 |
|
Blackforest92
|
8c88e8a9b7
|
Legends Arceus Pokemon 95% Finished
|
2022-07-03 17:15:37 +07:00 |
|
ghoulslash
|
fc2cfd8c9d
|
Merge pull request #2136 from LOuroboros/pePretMerge
Pret merge for the pokemon_expansion
|
2022-07-01 09:22:55 -04:00 |
|
ghoulslash
|
a349462b78
|
Merge pull request #2134 from LOuroboros/bePretMerge
Pret merge for the battle_engine
|
2022-07-01 09:21:51 -04:00 |
|
GriffinR
|
7143865f6f
|
Add some battle frontier constant usage
|
2022-06-09 12:57:28 -04:00 |
|
sneed
|
c8e08edbae
|
rename item1 and item2 in BaseStats
|
2022-05-23 19:10:24 +03:00 |
|
hamish
|
307d5d93c4
|
add potlergeist animation
|
2022-05-23 08:53:08 -04:00 |
|
sneed
|
248863239b
|
repair sawssuck abilities
|
2022-05-23 04:10:18 +03:00 |
|
sneed
|
b71fbec130
|
repair meteor minior stats
|
2022-05-23 03:29:01 +03:00 |
|
sneed
|
c8d78706ba
|
add dex colors to castform forms
|
2022-05-23 02:53:01 +03:00 |
|
sneed
|
ce468a0903
|
add macros for handling form base stats
|
2022-05-23 01:04:21 +03:00 |
|
Eduardo Quezada D'Ottone
|
f2c509eab7
|
Merge pull request #2151 from Sneed69/dummy_abilities
Add dummy abilities to make base stats header smaller
|
2022-05-22 13:27:27 -04:00 |
|
sneed
|
587b056ccb
|
add dummy abilities to PE
|
2022-05-22 19:55:09 +03:00 |
|
GriffinR
|
593e2c9be0
|
Fix inconsistent static s/g names
|
2022-05-17 14:00:02 -04:00 |
|
AgustinGDLV
|
01665c0213
|
reverted todo for dynamax candy
|
2022-05-16 13:52:38 -07:00 |
|
AgustinGDLV
|
0de15db564
|
clean-up
|
2022-05-16 13:26:26 -07:00 |
|
AgustinGDLV
|
793e8ef5a4
|
fixed learning moves
|
2022-05-16 13:12:41 -07:00 |
|
AgustinGDLV
|
03c21c3b71
|
implementation of EXP candies
|
2022-05-15 21:28:23 -07:00 |
|
LOuroboros
|
52d6c96e69
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge
|
2022-05-13 03:20:42 -03:00 |
|
LOuroboros
|
12d956872b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge
|
2022-05-13 03:18:37 -03:00 |
|
LOuroboros
|
2263caef7a
|
Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine
|
2022-05-13 03:17:31 -03:00 |
|
Eduardo Quezada D'Ottone
|
a896f9aed7
|
Merge pull request #2133 from Sneed69/cobaberry
Coba berry fix
|
2022-05-12 13:39:50 -04:00 |
|
sneed
|
0c0bea33c7
|
Update items.h
|
2022-05-12 18:39:10 +03:00 |
|
LOuroboros
|
5b1c31bbc9
|
Update tutor_learnsets.h
|
2022-05-10 12:39:36 -03:00 |
|
Eduardo Quezada D'Ottone
|
b6922a1dab
|
Merge branch 'pokemon_expansion' into evo_overworld
|
2022-05-09 16:36:34 -04:00 |
|
AgustinGDLV
|
54163240d8
|
implemented toggelable cancellation / multi-evo
|
2022-05-08 20:55:29 -07:00 |
|
sneed
|
eebfed20ad
|
#elif
|
2022-05-08 09:58:06 +03:00 |
|
sneed
|
d8256663e3
|
fix syntax
|
2022-05-07 22:12:10 +03:00 |
|
sneed
|
5592fa434a
|
catch < gen7 with engine
|
2022-05-07 22:01:35 +03:00 |
|
sneed
|
7008c01f25
|
Update items.h
|
2022-05-07 21:41:21 +03:00 |
|
ghoulslash
|
0172f84617
|
Merge pull request #2070 from AsparagusEduardo/PE_evoData
Updated missing evolution and form change data
|
2022-05-07 11:37:11 -04:00 |
|
Eduardo Quezada D'Ottone
|
4e7ce0b663
|
Merge branch 'battle_engine' into BE_configs
# Conflicts:
# include/constants/battle_config.h
|
2022-05-07 10:25:34 -04:00 |
|
AgustinGDLV
|
03c48b4f3f
|
compatibility with evo_battle
|
2022-05-05 15:46:53 -07:00 |
|
AgustinGDLV
|
7d42f93861
|
added special overworld evo changes
|
2022-05-05 11:55:31 -07:00 |
|
Eduardo Quezada D'Ottone
|
49905cee04
|
Ability Patch
|
2022-05-03 14:14:04 -04:00 |
|
sneed
|
60d7d8f97e
|
Initial Commit
|
2022-05-03 03:38:44 +03:00 |
|
ghoulslash
|
f0d74b60ff
|
Merge pull request #1932 from BuffelSaft/gen_8_moves_batch2
Gen 8 moves batch + Beak Blast
|
2022-05-01 07:47:11 -04:00 |
|
ghoulslash
|
166b16d22c
|
Merge pull request #2091 from AsparagusEduardo/PE_LegendaryIV
Config for Legendaries, Mythicals and Ultra Beasts to have at least 3 perfect IVs
|
2022-04-27 08:48:22 -04:00 |
|
ghoulslash
|
29d8ed9602
|
Merge pull request #2083 from AsparagusEduardo/BE_moveDesc
Adjusted description of Glacial Lance and Astral Barrage
|
2022-04-27 08:46:48 -04:00 |
|
ghoulslash
|
fccd4d14b1
|
Merge pull request #2085 from AsparagusEduardo/PE_PokemonJump
Added Pokémon Jump data.
|
2022-04-27 08:45:35 -04:00 |
|
ghoulslash
|
574be40f26
|
Merge pull request #2099 from Greenphx9/calyrex_rider_icons
Calyrex Rider Icons
|
2022-04-27 08:43:53 -04:00 |
|
BuffelSaft
|
5358cc0a00
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
|
2022-04-25 13:38:13 +12:00 |
|
Greenphx9
|
b3294c60a2
|
Calyrex Rider Icons
|
2022-04-22 16:31:17 +10:00 |
|
GriffinR
|
fc5747f0f7
|
Merge pull request #1649 from GriffinRichards/clean-trainer
Trainer hill clean up
|
2022-04-20 00:20:44 -04:00 |
|
Eduardo Quezada D'Ottone
|
84d713a50f
|
Legendary and Mythical flags
|
2022-04-14 18:44:20 -04:00 |
|
TheXaman
|
2fa812df26
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge
|
2022-04-13 20:51:35 +02:00 |
|
LOuroboros
|
446bcd3181
|
Merge branch 'master' of https://github.com/pret/pokeemerald into pePret
|
2022-04-11 01:23:18 -03:00 |
|
LOuroboros
|
eb1834ce84
|
Merge branch 'master' of https://github.com/pret/pokeemerald into iePret
|
2022-04-11 01:22:48 -03:00 |
|
LOuroboros
|
b6e2945072
|
Merge branch 'master' of https://github.com/pret/pokeemerald into bePret
|
2022-04-11 01:22:10 -03:00 |
|
Eduardo Quezada D'Ottone
|
5fc72c2bfe
|
Heights and weights in Pokédex Orders lists
|
2022-04-09 22:40:36 -04:00 |
|
Eduardo Quezada D'Ottone
|
d604d99d6e
|
Adjusted description of Glacial Lance and Astral Barrage
|
2022-04-03 16:54:07 -04:00 |
|
Eduardo Quezada D'Ottone
|
dafb5ca74d
|
Fixed trapping moves not reflecting the configured turn config
|
2022-04-03 13:03:53 -04:00 |
|
LOuroboros
|
f82c946ff3
|
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
|
2022-04-03 13:26:27 -03:00 |
|
LOuroboros
|
af2f70e000
|
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge
|
2022-04-03 13:21:40 -03:00 |
|
LOuroboros
|
fa39dc76dc
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD
|
2022-04-02 18:45:18 -03:00 |
|
GriffinR
|
328b925a08
|
Move trainer hill map data to bin files
|
2022-03-31 14:08:31 -04:00 |
|
GriffinR
|
62f3f144ab
|
Clean up some trainer hill
|
2022-03-31 12:54:07 -04:00 |
|
ExpoSeed
|
f50a406b18
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves
|
2022-03-22 12:56:23 -05:00 |
|
GriffinR
|
0a0157b62c
|
Name unknown_16.png
|
2022-03-14 15:54:47 -04:00 |
|
Eduardo Quezada D'Ottone
|
c00873cbc4
|
Merge pull request #2073 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
|
2022-03-13 18:15:45 -03:00 |
|
SubzeroEclipse
|
d3589103b3
|
Fixed some move descriptions
|
2022-03-09 15:23:08 +01:00 |
|
GriffinR
|
b1d61b9227
|
Merge pull request #1641 from GriffinRichards/subsprite-arr-count
Use ARRAY_COUNT for obj event subsprite tables
|
2022-03-03 23:08:52 -05:00 |
|
GriffinR
|
f78f46a1e2
|
Use ARRAY_COUNT for obj event subsprite tables
|
2022-03-03 14:54:05 -05:00 |
|
ultima-soul
|
2d3ba500c9
|
Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync
|
2022-03-01 15:10:19 -08:00 |
|
ultima-soul
|
84a7f960c8
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2022-02-28 23:37:41 -08:00 |
|
ultima-soul
|
86089ce935
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2022-02-28 22:13:14 -08:00 |
|
GriffinR
|
5d58cdd297
|
Fix bunny hoppy typo
|
2022-02-28 13:34:39 -05:00 |
|
Eduardo Quezada D'Ottone
|
b1227af13b
|
Reverted to separate form change tables for Forces of Nature.
It was causing form changes with holding items to break
|
2022-02-26 12:58:49 -03:00 |
|
Eduardo Quezada D'Ottone
|
755b31bee0
|
Enable form change for the Forces of Nature
|
2022-02-26 12:19:38 -03:00 |
|
Eduardo Quezada D'Ottone
|
9a31fdf7be
|
Updated Applin, Sinistea and Galarian Slowpoke evolution data
|
2022-02-26 11:38:08 -03:00 |
|
GriffinR
|
131ed1916e
|
Generalize name of party slot without HP
|
2022-02-15 16:24:19 -05:00 |
|
GriffinR
|
49eca60955
|
Convert party menu slots to bin files
|
2022-02-15 16:12:54 -05:00 |
|
BuffelSaft
|
6a119c5a30
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
|
2022-02-13 21:06:15 +13:00 |
|
SubzeroEclipse
|
5f33989c42
|
Fixed format of move descriptions' labels
|
2022-01-27 21:50:12 +01:00 |
|
BuffelSaft
|
9d1800f53e
|
Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen_8_moves_batch2
|
2022-01-27 17:18:51 +13:00 |
|
LOuroboros
|
52e3cf4f59
|
Added missing flingPower values
|
2022-01-22 05:40:29 -03:00 |
|
LOuroboros
|
367ba2d5bf
|
Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into flingIE
|
2022-01-22 05:39:48 -03:00 |
|
Eduardo Quezada D'Ottone
|
02da6cc627
|
Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb
# Conflicts:
# include/graphics.h
# src/data/graphics/items.h
# src/data/item_icon_table.h
# src/data/items.h
# src/data/text/item_descriptions.h
|
2022-01-16 18:44:03 -03:00 |
|
ghoulslash
|
a0aaad2856
|
Merge pull request #2016 from AsparagusEduardo/PE_genderDiff
Optimized SpeciesHasGenderDifference into Base Stat flag
|
2022-01-13 11:55:29 -05:00 |
|
GriffinR
|
694aa3c65d
|
Move balls, shop, link, map popups, and bag out of interface
|
2022-01-11 13:53:23 -05:00 |
|
GriffinR
|
565dd24309
|
Move party menu graphics out of interface
|
2022-01-11 11:37:13 -05:00 |
|
Eduardo Quezada D'Ottone
|
f6b32c8d17
|
Fixed Anchor Shot description.
|
2022-01-08 20:19:53 -03:00 |
|