Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,703 Commits 1 Branch 0 Tags
Commit Graph

679 Commits

Author SHA1 Message Date
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
Eduardo Quezada
dce10ab705 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	test/species.c
 2024-06-04 16:47:29 -04:00
kittenchilly
7f8f480ecb
Add FORM_CHANGE_BATTLE_TERASTALLIZATION + allow species to force tera types (#4438) 
* Add FORM_CHANGE_BATTLE_TERASTALLIZATION and allow species to force tera types

* Fix form change not changing tera type

* Update form_species_tables.h

* Address reviews

* Can't change the forced Tera Type anymore

* Revert "Can't change the forced Tera Type anymore"

This reverts commit 67157250efeaf5ffefc45ac1955b09f27f09788b.

* Fix a lot of things

* Oops

* Update pokemon.h

* Update pokemon.h

* Address reviews

* Update tera_starstorm.c

* Update test/battle/gimmick/terastal.c

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-06-04 13:38:49 +02:00
kittenchilly
a5b75746ea Pawmi 2024-06-03 14:17:34 -05:00
kittenchilly
ea617ccd7a Okidogi 2024-06-03 13:56:37 -05:00
kittenchilly
33972cedf3 Pawmo 2024-06-03 13:48:36 -05:00
hedara90
5bf7f08ad2 Added Normal and Terastal Terapagos sprites (#4691) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-06-03 13:33:42 -05:00
Eduardo Quezada
ee1d14755a Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-06-02 11:06:41 -04:00
Eduardo Quezada
3202625ca5 Restored Gen 4-8 followers 
This reverts commit 24913f53392f6f1353d59a3975f1dfd5db9f2d00.

# Conflicts:
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h
 2024-06-02 10:31:01 -04:00
hedara90
240b69d032
Added Normal and Terastal Terapagos sprites (#4691) 
Co-authored-by: Hedara <hedara90@gmail.com>
 2024-06-02 08:26:43 +02:00
Eduardo Quezada
ff480dec27 More review comments 2024-05-28 18:32:20 -04:00
Eduardo Quezada
021074cd2e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon/species_info/gen_1_families.h
#	src/data/pokemon/species_info/gen_2_families.h
#	src/data/pokemon/species_info/gen_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h
 2024-05-28 14:28:33 -04:00
Eduardo Quezada
80b193280d Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_main.c
#	src/data/item_icon_table.h
#	src/data/pokemon/species_info/gen_9_families.h
 2024-05-27 10:13:42 -04:00
Rachel
94af656f17
Explicitly define Gengar's 3rd ability slot (Hidden Ability) (#4633) 2024-05-26 21:50:12 -04:00
kittenchilly
2e07dbb0ee
Add Gen 9 and PLA footprints + update some footprints (#4621) 
* PLA footprints

* Gen 9 Starters

* Gen 9 Cross Gen Evos

* Question mark

* Gen 9 regular mons

* Gen 9 Paradox mons

* Gen 9 legendaries and mythicals

* Past gen mon footprint changes
 2024-05-26 22:20:51 +02:00
Alex
ba07d2b3d4
Renames evolution methods the were labeled as evo level (#4607) 
* [FIX] EVO_LEVEL_MOVE_TWENTY_TIMES -> EVO_USE_MOVE_TWENTY_TIMES

* rename evo_level_recoil_damage

* change EVO_LEVEL_ITEM_COUNT_999
 2024-05-22 11:06:24 +02:00
Bassoonian
bc9f09744d
Egg Move Refactor (#4534) 
* Egg Move Refactor

* Update python file and fix formatting
 2024-05-19 13:47:15 +02:00
Eduardo Quezada
24913f5339 TEMPORARY: Reverted Gen 4-8 followers 2024-05-17 14:40:45 -04:00
Eduardo Quezada
6eba5bcb80 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-05-16 17:31:46 -04:00
Alex
faf61e62fb
Adds move Spicy Extract (#4211) 
* Adds move Spicy Extract

* remove uneeded line

* anim, new tests, acc change

* Clear Amulet, Contrary interaction

* ai

* correction

* simplify script a bit

* clean up

* Spicy Extract script overhaul

* merge rhh/upcoming

* alignment

* AI changes/additions

* add Foul Play check

* Remove useless ai checks

* remove wrong test

* review issues
 2024-05-16 11:03:50 +02:00
Bassoonian
d235a716fe
Add missing EOF newlines to species_info files (#4584) 2024-05-15 21:11:30 +02:00
Eduardo Quezada
ab682ce900 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/data/items.h
#	src/pokemon_summary_screen.c
 2024-05-15 09:58:21 -04:00
kittenchilly
35362fbd24
Update various sprites to ones from PokeCommunity (#4554) 
* Updated battle sprites

* Update icon sprites

* Revert appletun change
 2024-05-14 18:28:50 +02:00
TheJamesLJ
9cd3fbb232
Opponents Shaymin Sky form correctly reverts on frozen status (#4559) 
* Fixed Shaymin form change with incorrect status condition

* Fixed Shaymin receiving damage again after changing form

* PR feedback updates - fixed missing commas in battle script

* Added Shaymin form change test by @AlexOn1ine
 2024-05-14 13:28:10 +02:00
Eduardo Quezada
3219a48adf Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
 2024-05-13 11:00:12 -04:00
Cafei
eae221b9cf
A bunch of Pokemon sprite changes and fixes (#4552) 
* A bunch of sprite fixes

- New Basculin Blue and White animations to fix their entry animations
- New Xerneas Neutral entry animation derived from its Active form animation
- Recolored Iron Hands and Iron Bundle back sprites

* Requested changes
 2024-05-12 16:08:10 -04:00
TheJamesLJ
b66738ff8d
Multiple sprite updates (#4541) 
* Updated Mega Mewtwo Y sprite to fix transparent eye pixel

* Updated Keldeo Resolute sprite to a two framed animation

* Updated Keldeo Resolute sprite to increase definition to facial features

* Improved Keldeo Resolutes second frame to match BW2 original & changed front animation

* Added Meloetta Pirouette front anim

* Updated Meloetta Pirouette anim frame to a dip
 2024-05-12 15:43:49 -04:00
Eduardo Quezada
ff49551809 Hisuian Mon 2024-05-12 10:54:45 -04:00
Eduardo Quezada
be37820bd9 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
 2024-05-11 19:53:19 -04:00
Eduardo Quezada
45ee5b5c8f Multiple fixes (see commit description) 
- New Eternatus 32x32 sprite by Gerben BSc
- Fixed missing Hero Zamazenta sprite
- Fixed missing Single Strike Urshifu sprite
- Moved Alcremie Strawberry sprite to respective folder
 2024-05-11 19:09:05 -04:00