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

2541 Commits

Author SHA1 Message Date
Alex
7a393a974a
Adds Dragon Darts effect (CFRU port) (#4612) 
* Adds Dragon Darts effect (CFRU port)

* fix test compile

* review
 2024-05-28 11:34:56 +02:00
Alex
df6fab7284
Missing ignoreSubstitute flags (#4623) 
* Missing ignoreSubstitute flags

* update defog flag
 2024-05-28 10:29:37 +02:00
hedara90
d999092689
Upgraded Dragon Darts Animation (#4620) 
* Upgraded Dragon Darts Animation

* Fixed Dragon Darts not workin in link battles

* Apply suggestions from code review

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-05-28 10:17:52 +02: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
Rachel
c129423a69
Fix move descriptions for Feint and Feint Attack (#4617) 2024-05-24 11:19:55 +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
kittenchilly
b7fc2b447a
Add Stellar Tera Shard sprite (#4595) 
* Add Stellar Tera Shard sprite

* Update items.h
 2024-05-18 22:20:47 +02:00
Cafei
a28ee83b06
sawsbuck sprites (#4592) 2024-05-18 17:07:27 +02:00
Alex
1d83ce430c
Follow up to #4579: wrong naming (#4591) 2024-05-18 17:05:25 +02:00
Eduardo Quezada
569749f9c2 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	Makefile
#	gflib/sprite.h
#	graphics/object_events/pics/pokemon/wailord.png
#	include/constants/event_objects.h
#	include/random.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info.h
#	src/data/object_events/object_event_graphics_info_pointers.h
#	src/event_object_movement.c
#	src/random.c
#	src/scrcmd.c
 2024-05-18 10:12:17 -04:00
kittenchilly
4b221b5802
Get rid of gItemIconTable (#4579) 
* Get rid of gItemIconTable

* Move the script to the folder
 2024-05-18 10:22:26 +02:00
Ariel A
d3849f2fc6 Merge branch 'followers' into followers-expanded-id 2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610 refactor: code review for expansion 2024-05-17 20:45:32 -04:00
Eduardo Quezada
24913f5339 TEMPORARY: Reverted Gen 4-8 followers 2024-05-17 14:40:45 -04:00
Alex
635db6312c
AI respects partner when using spread moves in double battles (#4518) 
* Fixes Earthquake AI in double battles

* earthquake_ai_fix

* Use CompareDamagingMoves to fix spread damage issue
 2024-05-17 00:41:55 +02:00
Eduardo Quezada
d5268b9f01 Final cleanup 2024-05-16 18:08:10 -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
TheLastMudkip
d591f25829
Update Avalanche to be Single Target (#4581) 
Avalanche is a single target move in doubles.
Currently it is bugged to be a spread move this change corrects that.

Source:
https://bulbapedia.bulbagarden.net/wiki/Avalanche_(move)
 2024-05-15 08:51:59 +02: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
Bassoonian
2e7c32019f
Update items.h (#4574) 2024-05-14 17:36:12 +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
Alex
56cee80fbf
Explosion and Mind Blown / Steel Beam refactor (CFRU port) (#4516) 
* Explosion and Mind Blown / Steel Beam refactor (CFRU port)

* forgot ndebug

* Restored EFFECT_MIND_BLOWN

* requested changes

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-05-12 11:41:18 -04:00
Eduardo Quezada
ff49551809 Hisuian Mon 2024-05-12 10:54:45 -04:00
sneed
a8bb82778a
Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN (#4557) 2024-05-12 15:07:43 +02: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
Cafei
1ef7e11ef2
Unown entry animation fix (#4546) 
- Changed all anim_front.png into front.png
- Set PLACEHOLDER_ANIM_SINGLE_FRAME in front_pic_anims.h
 2024-05-10 18:20:25 -04:00
PhallenTree
833decb0df
Fix Mr. Mime's typing (#4547) 2024-05-10 18:12:09 -04:00
WillKolada
4c5260c82e
Changed item descriptions to prevent text overflowing into scroll menus (#4540) 
* Changed Dubious Disc description to prevent overflow

The first line of the Dubious Disc description was too long. A few letters would escape the box in the Bag and in Marts. This brings them in line.

* Changed Ice Beam and Blizzard Frostbite descriptions

These descriptions also overflowed, even more so than the Dubious Disc.
 2024-05-10 23:01:37 +02:00
Eduardo Quezada
aa81f30742 Less #if/#endifs in graphics file 2024-05-07 21:42:55 -04:00
Eduardo Quezada
0ef8a795de Adjusted format of Follower Macro 2024-05-07 10:53:31 -04:00
Eduardo Quezada
85885d82c1 Gen 8 palettes (except Enamorus) 2024-05-07 08:47:54 -04:00
Abbie Potter
da3d715f3b
Punchier tera animation (#4507) 
* Punchier tera animation

* Removed testing comments

* Replaced VARIOUS_APPLY_TERASTALLIZATION with callnative

* Remove redundant arg from applyterastallization
 2024-05-07 07:59:52 -04:00
BlueAnthem37510
2d7c79e860
Gulp missile not triggering on faint fix and added form change type (#4502) 
* Cramorant faint fix and add form change type

* Fixed formatting, renamed form change type, changed various to callnative

* Fix oops broke everything except gulp missile

* Improved condition order

* remove extra line

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* whitespace and alignment

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>

* Added requested changes

---------

Co-authored-by: BlueAnthem37510 <a@a.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-05-07 06:44:17 -04:00
Eduardo Quezada
58e3bb0cbb Fixed Furfrou follower palettes 2024-05-06 18:57:59 -04:00
Eduardo Quezada
248980ae19 Fixed Flabébé family follower palettes 2024-05-06 18:24:36 -04:00
Eduardo Quezada
48ce61715d Fixed Vivillon palettes 2024-05-06 18:16:12 -04:00
Eduardo Quezada
d5111ad76e Fixed Arceus' Palettes 2024-05-06 18:01:02 -04:00
Eduardo Quezada
35a76248d1 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	src/data/pokemon/species_info/gen_4_families.h
 2024-05-06 16:03:29 -04:00
Eduardo Quezada
d5a72ec685 Merge branch '_RHH/master' into _RHH/upcoming 2024-05-05 19:50:12 -04:00
Ariel A
f3b637c115 fix: castform OW sprite & palette 
fixed #34
 2024-05-04 18:47:25 -04:00