Eduardo Quezada
0a4b3a8dd7
Merge branch '_RHH/master' into _RHH/upcoming
2024-10-12 16:23:27 -03:00
kittenchilly
743dc4d765
Add text fitting tests for move, ability, item, and pokedex descriptions ( #5505 )
2024-10-12 19:37:11 +02:00
kittenchilly
19009c6d21
Add support for overworld sprite gender differences + add all the sprites ( #5394 )
2024-10-04 17:56:21 +02:00
Eduardo Quezada
0f8b2a1ba8
Merge branch '_RHH/master' into _RHH/pr/master/pretSync20240909
2024-10-04 10:23:58 -03:00
psf
2597d8a35a
Updated species defines ( #5075 )
...
* First version of new defines
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Fixed cloaks
* Removed old defines
* Removed old defines
* Removed old defines and cleaned up some macros
* Undid changes to documentation
Deleted unused defines
Updated defines
Fixed tests
fixed docs
* moved note to top per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#discussion_r1783641599
* fixed alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5075\#pullrequestreview-2341613591
2024-10-02 18:24:57 -03:00
kittenchilly
a135876dc0
Remove trailing whitespace pass 10-2-2024 (Upcoming) ( #5456 )
2024-10-02 21:20:23 +02:00
kittenchilly
d5560bbc87
Remove trailing whitespace pass 10-2-2024 (Master) ( #5455 )
2024-10-02 21:20:02 +02:00
Eduardo Quezada
5130ea9da3
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-28 11:45:49 -03:00
Liamjd14
9d483cee5d
Enable asym for followers issue #5382 ( #5385 )
...
* Applies asym code to followers
galarian slowbro
tinkaton line
scovillain
2024-09-14 20:21:34 +02:00
hedara90
9633cefd11
Custom anim table follower macro & Farfetch'd example ( #5309 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-13 10:30:01 -03:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 ( #5336 )
2024-09-12 18:55:30 +02:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers ( #5178 )
...
* Add data to SpeciesInfo entries for in-battle shadows
* Implement sized shadows in the sprite visualizer
* Implement sized shadows in game code
* Show shadows for the lead battler for opponents during their battle anim
* Feedback on shadows, round 1
* Revert removal of Goomy and Sliggoo shadows
* Fixed GEN_3 setting
* Code cleanup + remove pre-processor branches
* Fix bugs with gen-3 configuration branch
* Style corrections, final shadow coordinate adjustments
* Adjustments to Garbodor and Araquanid
2024-09-10 21:27:49 +02:00
Eduardo Quezada
2a27aad259
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-08 14:50:39 -03:00
Liamjd14
e9c0784dc0
Gen 9 Follower pokemon sprites ( #5304 )
...
* Gen 9 Follower Sprites
2024-09-05 22:31:14 +02:00
Eduardo Quezada
8533b0c045
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-03 14:39:50 -04:00
PhallenTree
ac9b40a423
Fixes Max Moves ignoring absorbing abilities, G-Max Corviknight and Centiskorch names ( #5296 )
...
* Fix Max and G-Max Moves bypassing absorbing abilities
* Fix G-Max Corviknight and Centiskorch speciesName
* Remove some outdated comments
* Missing Dynamax check
* Add Max Quake and Max Overgrowth to test
2024-08-31 12:39:37 +02:00
psf
4f39354185
Deprecate MMBN Names ( #5240 )
...
* Removed HANDLE_EXPANDED_MOVE_NAME
* Removed HANDLE_EXPANDED_TYPE_NAME
* Removed HANDLE_EXPANDED_ITEM_NAME
* Removed HANDLE_EXPANDED_SPECIES_NAME
* Removed I_EXPANDED_ITEM_NAMES
* Removed B_EXPANDED_MOVE_NAMES
* Removed B_EXPANDED_TYPE_NAMES
* Removed B_EXPANDED_ABILITY_NAMES
* Removed B_EXPANDED_ABILITY_NAMES
* Added documentation of names
* Github markdown spacing is silly
* Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339
* Removed list per https://github.com/rh-hideout/pokeemerald-expansion/pull/5240\#discussion_r1736860339
2024-08-29 16:33:25 -04:00
Cafei
8053f4ab1e
Enable female Indeedee follower and improve shiny Indeedees ( #5285 )
...
Enable Indeedee female follower sprite.
Shiny improvements.
Fix front Indeedee male shading.
2024-08-29 18:14:46 +02:00
Eduardo Quezada
aebbe448b8
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-28 12:58:14 -04:00
Cafei
213c097dc0
Paldean Wooper and Clodsire followers ( #5277 )
2024-08-28 11:47:08 +02:00
hedara90
74c309e2b0
Replaced all usages of tabs in C files with spaces ( #5261 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-08-26 16:55:54 -07:00
Eduardo Quezada
abf60e9c64
Merge branch '_RHH/master' into _RHH/upcoming
2024-08-24 19:44:35 -04:00
kittenchilly
bd38c64f29
New Garganacl and Naclstack battle sprite + various battle sprite fixes ( #5142 )
...
Garganacl, Spidops, Wattrel, Kilowattrel, Shroodle, Bombirdier, Orthworm, Veluza, Aerodactyl-Mega, Medicham-Mega, Latis-Mega, Diancie-Mega, Ponyta-Galar, Rapidash-Galar, Magearna, Landorus.
2024-08-20 20:16:32 +02:00
Bassoonian
c1ee43254e
Clean up defines lacking spaces
2024-08-15 19:34:56 +02:00
Eduardo Quezada
113f8de9b1
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_controller_player.c
2024-08-08 13:22:49 -04:00
Eduardo Quezada
182809b515
Made perfect IV count into a granular setting ( #5115 )
...
* Made perfect IV count into a granular setting
* Fixed optional parameter comment in SPECIES_NONE
2024-08-08 13:46:22 -05:00
Hedara
a9492f5b1c
Fixed Xerneas
2024-08-06 16:52:42 +02:00
Hedara
29bb658d1b
Fixed some overworld palettes
2024-08-06 13:25:26 +02:00
Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM ( #5046 )
2024-07-27 21:41:05 +02:00
Eduardo Quezada
cc00446eb8
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_9_families.h
2024-07-26 09:42:52 -04:00
kittenchilly
7f6ddcf9d9
Update all level up learnsets to Indigo Disk ( #5023 )
...
* Update all movesets to Indigo Disk
* Also update past gens for gen 9 mons
* Update gen_1.h
2024-07-24 22:53:37 +02:00
hedara90
7a4df80f89
Added Ogerpon Tera Sprites ( #4996 )
...
* Added Ogerpon Tera Sprites
* Updated references to Ogerpon Tera forms
* Fixed back sprite offsets and color indices for Hearthflame Tera
* Removed Ogerpon data duplicates
---------
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-23 11:55:07 -04:00
Eduardo Quezada
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
hedara90
7e509c440b
Added Terapagos Stellar Sprite ( #5008 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-21 08:17:31 +02:00
Eduardo Quezada
2b40e79ac3
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle_util.h
# src/battle_ai_main.c
2024-07-14 22:44:00 -04:00
Bassoonian
f85bff6e30
Fix Basculegion's gen9 level up learnset ( #4948 )
2024-07-11 15:07:39 +02:00
Eduardo Quezada
fb708b7ed3
Merge branch '_RHH/master' into _RHH/upcoming
2024-07-10 10:05:10 -04:00
Eduardo Quezada
b5160b7ec8
Fixed SPECIES_NONE's overworld data not compiling when ObjectEventGraphicsInfo gets new fields ( #4937 )
2024-07-10 01:22:25 +02:00
Eduardo Quezada
6404241c40
Fixed P_UPDATED_ABILITIES not reverting newly given abilities in Gens 4/6/7 ( #4922 )
2024-07-07 13:18:16 +02:00
Eduardo Quezada
fcdc9ed65a
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_util.c
# src/data/pokemon/species_info/gen_7_families.h
# test/battle/ability/download.c
# test/battle/ability/intimidate.c
# test/battle/ability/supreme_overlord.c
# test/battle/ability/zero_to_hero.c
# test/battle/ai/ai.c
# test/battle/move_effect/plasma_fists.c
2024-07-05 14:25:25 -04:00
Bassoonian
81bd14818e
Add day limit for forms support ( #4778 )
...
* Add day limit for forms support
* Add missing newline
* Incorporate review suggestions
2024-06-26 10:36:44 +02:00
cawtds
a8ae1a0342
added missing minior description + test for missing descriptions ( #4858 )
2024-06-24 12:19:12 +02:00
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality ( #4761 )
...
* Split Pokémon Object Events from Following Pokémon functionality
* Renamed follower pngs and palettes
* Define renames
* Reorder configs
* Renaming: SpeciesInfo fields, macros and palettes.
2024-06-13 22:46:27 +02:00
Eduardo Quezada
06153e4280
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# include/battle.h
# include/constants/battle_script_commands.h
# include/constants/pokemon.h
# src/battle_ai_util.c
# src/battle_main.c
# src/battle_util.c
# test/battle/ai.c
2024-06-13 11:44:28 -04:00
kittenchilly
251019d63d
Update wild held items to Gen 9 ( #4769 )
...
* Update wild held items to Gen 9
* Update gen_1_families.h
* Update gen_5_families.h
2024-06-12 11:33:03 +02:00
Bassoonian
76c566a0ca
Add the Let's Go evolution method ( #4758 )
...
* Add overworld step evolution method
* Increase evolutionTracker bits from 9 to 10
* Implement tracker increase
* Remove leftover NDEBUG activation
* Reset evolution tracker data upon evolution
* Revert an accidental change to unrelated code
* Add missing break in switch case, oops
2024-06-12 11:31:19 +02:00
Bassoonian
dffaaeaaa6
Add Leader's Crest evolution method ( #4768 )
...
* Add Leader's Crest evolution method
* Fix typo in in HGSS dex
* Update src/pokedex_plus_hgss.c
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
* Update src/battle_script_commands.c
---------
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-06-12 09:31:59 +02:00
Eduardo Quezada
64f82cdd5f
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_ai_util.c
# src/battle_util.c
2024-06-11 08:12:03 -04:00
Bassoonian
568ce39c5d
Adds forbidden status parameter to FORM_CHANGE_ITEM_USE ( #4738 )
2024-06-08 07:36:39 +02:00
