320 Commits

Author SHA1 Message Date
Eduardo Quezada
792aee86ea SPECIES_SQUAWKABILLY_GREEN_PLUMAGE 2023-10-23 10:55:16 -03:00
Eduardo Quezada
ff60b7ff73 Maushold Family of Three define 2023-10-23 10:24:47 -03:00
Eduardo Quezada
e6c5077d7c Oinkologne Male define 2023-10-23 10:12:55 -03:00
Eduardo Quezada
a92a3256df Fixed Paldean Tauros Combat Breed order and data names 2023-10-23 09:33:37 -03:00
Eduardo Quezada
f570d14f2d Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration
# Conflicts:
#	include/constants/species.h
#	sound/cry_tables.inc
#	src/data/pokemon_graphics/enemy_mon_elevation.h
#	src/data/pokemon_graphics/front_pic_anims.h
2023-10-23 09:23:32 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248)
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
2023-10-23 12:59:15 +01:00
Eduardo Quezada D'Ottone
6585a62b13
Dynamax Cleanup (#3435)
* Mon animation names
* Moved indicator code so it follows the same standards as the other indicators
* Whitespace
* Fixed modern compile
* Fixed issue that caused Low Key Toxtricity learning Amped moves when Gigantamaxed
2023-10-23 11:39:22 +01:00
leo60228
ba0534386d
Address review 2023-10-18 14:37:29 -04:00
leo60228
b5be823e3b
gen 9 forms (learnsets still missing) 2023-10-18 14:36:59 -04:00
Eduardo Quezada D'Ottone
133ffc7260
Merge pull request #15 from Bassoonian/rhhspeciesreorder
Add gen 9 Pokémon data

(cherry picked from commit cd3e65f5c92b22f1ce48f4f8275796d40f2ef1c6)
2023-10-18 14:33:56 -04:00
Eduardo Quezada
f830b0725a GMAX -> GIGANTAMAX 2023-10-10 18:07:12 -03:00
Eduardo Quezada
92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/config/battle.h
#	include/constants/battle.h
#	include/constants/battle_anim.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	include/data.h
#	include/random.h
#	sound/cry_tables.inc
#	src/battle_anim_new.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/species_info.h
#	src/data/text/move_names.h
#	test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
kittenchilly
b5f7a51351
Add Teal Mask item, move, and ability data (#3349) 2023-10-08 15:56:09 -03:00
psf
75d06bb599
Generation 6 Experience Share (#3276) 2023-09-07 23:18:18 -03:00
Eduardo Quezada
3aaa89ce71 Changed all instances of gSpeciesNames so that it uses GetSpeciesName 2023-07-07 14:37:51 -04:00
AgustinGDLV
3d4789c492 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-28 11:10:50 -07:00
Eduardo Quezada D'Ottone
c3527dc01e
Fixed Throat Spray's description 2023-05-26 09:24:23 -04:00
AgustinGDLV
aec51b5b04 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-05-11 20:02:06 -07:00
CallmeEchoo
488cc410a0 update ability descriptions 2023-05-05 10:24:12 +02:00
CallmeEchoo
eb5b81684c refactored snow into damaging weather
this is necessary for ice body to properly work.
doesnt actually do any damage
2023-05-05 01:38:12 +02:00
ghoulslash
8cce130643
Add Frostbite status (#2942) 2023-05-01 09:45:47 -04:00
Salem
78c4d07b23
Add Berserk Gene Item (#2893)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-04-25 15:03:57 -04:00
Bassoonian
2885ec2411 Fix move descriptions 2023-04-25 19:48:45 +02:00
aaghaht
bd54c70020 Add PLA evo items 2023-04-10 10:47:31 +05:30
AgustinGDLV
504ec36b2b Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-03-27 16:22:11 -07:00
Bassoonian
e601719c91 Add new PLA form change items 2023-03-24 00:04:08 +01:00
AgustinGDLV
69fd63a922 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dynamax 2023-03-21 09:56:58 -07:00
Bassoonian
372c6a1afa Add new item variables and defines 2023-03-19 20:55:39 +01:00
LOuroboros
f4e8389779 Added Psyblade and Hydro Steam 2023-03-17 09:25:39 -03:00
Alex
a870ec3c22 enamorus_t cry, basculegionf sprite, new typhlosion back sprite 2023-02-23 15:20:12 +01:00
AgustinGDLV
38f462551f pulled rhh master, i hate merge conflicts 2023-02-22 18:50:54 -08:00
AgustinGDLV
d69de9fb17 added longer 'used move' messages for max moves 2023-02-22 14:18:15 -08:00
Eduardo Quezada
a044774896 Added Gen9 item data and fixed Punching Glove's effect 2023-01-24 16:47:54 -03:00
Eduardo Quezada D'Ottone
7622d84a4f
Revert "Removed Unown hack" 2023-01-07 11:39:56 -03:00
Eduardo Quezada
74d8c587fe Merge branch 'RHH/upcoming' into RHH/pr/cleanup/unown
# Conflicts:
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/front_pic_anims.h
2023-01-04 17:58:54 -03:00
LOuroboros
a56cfd1aa7 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into dev_gen9_abilities 2022-12-12 19:55:48 -03:00
Bassoonian
c14fa82f43 Fix Headlong Rush description 2022-12-04 18:14:27 +01:00
Bassoonian
051ad7bf69 Update src/data/text/move_descriptions.h
Co-Authored-By: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-12-04 00:26:05 +01:00
LOuroboros
653364fd71 Added the basic data for the Gen. 9 Abilities 2022-12-02 23:01:22 -03:00
Eduardo Quezada
4bac880042 Removed Unown hack 2022-11-25 16:55:53 -03:00
Bassoonian
4034f18c0e Update PLA descriptions 2022-11-18 22:30:40 +01:00
Bassoonian
f7d1a12d2d Data entry for gen9 moves 2022-11-18 12:15:44 +01:00
AgustinGDLV
ae7cbc2aa1 merged physical and special max moves 2022-10-27 20:38:40 -07:00
AgustinGDLV
caaec99e77 added data and graphics for gigantamax mons 2022-10-27 16:18:37 -07:00
AgustinGDLV
056048daf9 added data for max moves 2022-10-27 13:17:15 -07: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
Eduardo Quezada D'Ottone
69d3fafdcf
Merge pull request #2273 from LOuroboros/zazaForms
Introduced FORM_BATTLE form changes
2022-09-09 14:15:53 -04:00
Eduardo Quezada
7fe1e706b7 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig
# Conflicts:
#	include/constants/pokemon_config.h
2022-09-08 08:52:13 -04:00
Eduardo Quezada D'Ottone
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00