LOuroboros
8a1a561b80
Uncommented evo moves for each species
2022-10-14 11:28:15 -03:00
Eduardo Quezada
9b977486fe
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig
...
# Conflicts:
# src/data/pokemon/base_stats.h
2022-10-07 14:05:45 -03:00
ghoulslash
441586f23f
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags
...
4 new species flags
2022-10-07 10:55:43 -04:00
Eduardo Quezada
90ad11278d
Sorry Mewtwo ^^;
2022-09-28 09:17:10 -03:00
Eduardo Quezada
d24899369f
Special handling for Mew's Teachable moveset
2022-09-28 09:04:31 -03:00
Eduardo Quezada
fb9105f8ac
Added Mega Evolution flag
2022-09-27 10:21:26 -03:00
Eduardo Quezada
3d214f8204
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags
...
# Conflicts:
# src/pokemon.c
2022-09-27 10:13:32 -03:00
Eduardo Quezada D'Ottone
681ad8c7a9
Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig
...
# Conflicts:
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
# src/data/pokemon/form_species_table_pointers.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
2022-09-18 18:25:05 -03:00
Eduardo Quezada
de32940fdf
Further removed trailing whitespaces
2022-09-13 16:26:36 -03:00
LOuroboros
12fee71008
Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE
2022-09-09 15:39:48 -03:00
Eduardo Quezada
21df8c279b
Added SPECIES_FLAG_CANNOT_BE_TRADED
...
- Also corrected Cylarex's forms not having the legendary flag
2022-09-09 08:59:53 -04:00
LOuroboros
a7a1ab9aeb
Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD
...
There was never a reason not to.
2022-09-06 19:20:11 -03:00
LOuroboros
f1c153e469
Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD
...
There was never a reason not to.
2022-09-06 18:37:16 -03:00
Eduardo Quezada
7a0838a0f2
Adjusted GetFormChangeTargetSpeciesBoxMon to allow having form changes of the same method in the same table
2022-09-06 10:53:18 -03:00
LOuroboros
0b07f4a06e
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms
2022-09-06 10:53:12 -03:00
LOuroboros
bb290d5ab0
Updates
...
-Removed the pointless param1 setting in sXerneasFormChangeTable
-Updated the descriptions of Behemoth Blade and Behemoth Bash
-Added a new parameter to the struct FormChange
-Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves".
-Added missing calls to "CalculateMonStats".
-Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake
-Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.)
Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.
2022-09-06 10:45:07 -03:00
Eduardo Quezada
d699ea3334
Fixed macro alignments
2022-09-05 08:38:35 -04:00
Eduardo Quezada
2ee843c70d
Proper label for species flags
2022-09-04 22:13:28 -03:00
Eduardo Quezada
925384eedc
Generations of Pokémon can now be disabled individually
2022-08-30 12:50:59 -04:00
Eduardo Quezada
e9a5442be5
Removed unused ITEM_EXPANSION constants from base stats
2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6
Separated P_NEW_POKEMON into sections by generation.
...
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
2022-08-30 12:50:59 -04:00
LOuroboros
df88317a98
Introduced FORM_BATTLE form changes
...
For species such as Xerneas and Zacian.
2022-08-29 19:10:52 -03:00
Blackforest92
61c33f56a0
Updated to latest master branch + add PLA's data to teachable_learnsets.h
2022-08-29 21:01:31 +07:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework
...
Reworked TMHM into expandable list format
2022-08-29 04:20:45 -04:00
Blackforest92
d6998d4579
Edited PLA' pokedex_text.h
2022-08-28 19:55:45 +07:00
crater-git
f8fb4e8cf2
Renamed funcs, lists, etc. - Teach->Teachable
2022-08-26 14:48:06 -04:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy
...
Gen 8 EXP Candies
2022-08-25 23:03:24 -04:00
crater-git
ed02c4b425
Removed tutor move distinction, combined llists
2022-08-25 19:56:47 -04:00
crater-git
1ff5bdca9d
Added list endings to otherwise empty learnsets
2022-08-24 11:55:39 -04:00
Blackforest92
fb00ac977a
Adjust endif in form_species_tables.h to include Hisuian Sneasel and Qwilfish
2022-08-24 16:21:45 +07:00
Blackforest92
07a07ddc8d
Update to latest master branch + allow Reveal Glass to work with Enamorus
2022-08-24 15:00:48 +07:00
crater-git
7ac2f566fd
Re-added PP if statements for P_NEW_POKEMON
2022-08-23 23:08:38 -04:00
crater-git
45511fcc44
Reworked TMHM into expandable list format
2022-08-23 21:44:42 -04:00
Eduardo Quezada
75ac960365
Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms
2022-08-22 17:27:21 -04:00
Blackforest92
2b512a8e03
Fix Voltorb and Exeggutor' form species table
2022-08-19 18:14:11 +07:00
Blackforest92
346f3b7f4c
Fix PLA's base_stats.h (rename .item2 to .itemRare)
2022-08-19 18:01:28 +07:00
Blackforest92
a9d09bcd17
Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion
2022-08-19 17:53:01 +07:00
Blackforest92
00a827b3fb
Add PLA pokemon to Form Species Table, add Kleavor's graphics
2022-08-19 17:47:34 +07:00
ExpoSeed
49da2ee53f
Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION
2022-08-02 00:15:55 -05:00
Eduardo Quezada
231727d02b
Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge
...
# Conflicts:
# asm/macros/event.inc
# data/specials.inc
# include/constants/species.h
# src/data/pokemon/base_stats.h
2022-07-22 23:33:04 -04:00
Eduardo Quezada
f3bebcd12c
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
...
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
2022-07-22 22:57:02 -04:00
ghoulslash
0588bba193
Merge pull request #2195 from AsparagusEduardo/PE_pretmerge
...
Pokémon Expansion pret merge
2022-07-22 14:01:27 -04:00
sphericalice
65db9238e8
Give Pikachu its typing back
2022-07-18 09:41:04 +01: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
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
Blackforest92
8c88e8a9b7
Legends Arceus Pokemon 95% Finished
2022-07-03 17:15:37 +07:00
sneed
c8e08edbae
rename item1 and item2 in BaseStats
2022-05-23 19:10:24 +03: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
