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 24913f5339
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
0be643a517
Set TYPE_NONE as type 0 + other type data tweaks ( #4462 )
...
* Set TYPE_MYSTERY as type 0
* Remove redundant TYPE_NONE
* Moved Gen 1-3 type damage categories to gTypesInfo
* Set TYPE_NONE as 0 instead
* Grouped type info to a single file
* Fixed sTypeEffectivenessTable static name
* Adjusted MON_DATA_TERA_TYPE to account for shift in type IDs
* oops, missed the extern
* Moved Tera Type RGB values to gTypesInfo
* Fixed Tera Type test
* Added option test feature to set IVs
* Hidden Power type test
* Tera Type safeguard in givemon
* Removed isHiddenPowerType for a future PR that refactors Hidden Power
* Review changes
2024-06-01 07:38:22 +02: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
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
Eduardo Quezada
9e72271c8e
Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526
...
# Conflicts:
# src/battle_anim_poison.c
# src/pokemon.c
# src/pokemon_icon.c
2024-05-26 18:34:26 -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
BlueAnthem37510
a507af300e
Sceptilite & Salandit sprite fixes ( #4614 )
...
Co-authored-by: BlueAnthem37510 <a@a.com>
2024-05-24 11:28:35 +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
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
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
ddd92b9672
Removed unused garbage
2024-05-17 14:41:14 -04: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
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
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
5ada0f838a
Fixed Dusk Mane Necrozma
2024-05-12 15:18:10 -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
2e8f6c64f1
Fixed Galar follower palettes + some Gen 5 (by Gerben BSc)
2024-05-11 19:35:55 -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
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
Eduardo Quezada
dda9c79a88
Fixed Cyndaquil Shiny Palettes
2024-05-06 17:27:38 -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
0c74fd31c3
Merge branch '_RHH/master' into _RHH/upcoming
2024-05-02 14:24:17 -04:00
Ariel A
ee0d7a467a
fix: reverted Wailord OW gfx back to 32x32
2024-04-28 20:37:08 -04:00
Eduardo Quezada
bd2c6836cc
Fixed several follower palettes
2024-04-28 14:40:54 -04:00
Cafei
3ac67acc63
Fix Tatsugiri Droopy back sprite ( #4455 )
2024-04-28 11:05:23 -04:00
Eduardo Quezada
5b223cfc3e
Fixed Decidueye normal follower palette
2024-04-26 12:19:03 -04:00
Eduardo Quezada
5e2ffef002
Fixed (most) normal Gen 7 palettes
2024-04-26 12:10:36 -04:00
Eduardo Quezada
b006e2d213
Shiny Gen 7 sprites (gotta fix regular palettes)
2024-04-26 11:43:34 -04:00
Martin Griffin
e42a0a6dbe
Narrower fonts
2024-04-25 18:40:37 +01:00
AgustinGDLV
536e4a8fb9
fixed psychic type tera icon ( #4435 )
2024-04-24 18:08:20 +02:00
AgustinGDLV
84a9d4ffcf
Terastallization ( #4110 )
...
* wrote foundational terastal tests
* implemented baseline test-only Tera functionality; modified GetBattlerType + STAB calculations, misc. changes to some moves
* added tests and func. for Stellar type, more tests for Tera Blast
* more tests for Stellar type, Conversion fixes, Color Change + Conversion2 future proof
* implemented tera blast, expanded stellar type func., fixed tests
* last set of Tera/Tera Blast tests for checklist, protean fix
* implemented in-battle Terastallization, WIP stellar indicator and tera animation
* fixed bad merge
* expanded NUMBER_OF_MON_TYPES, cut down on TYPE_STELLAR hackiness, added Stellar type to summary
* fixed type indicators
* added tera logic to AI
* implemented code review changes, added B_TERA_ORB_NO_COST
* updated AI to calc damage with Tera when applicable; minor rework to AI gimmick handling
* fixed Tera Blast split choice occuring when not Terastallized
* fixed Tera Blast using Last Respects BP calcs
* added tera type to TrainerMon, code review tweaks
2024-04-24 11:17:46 +02:00
Eduardo Quezada
6061400073
Added separate palette data for followers
2024-04-20 18:35:55 -04:00
Eduardo Quezada
3d9c7732f6
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/event_object_movement.h
# src/data.c
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_4_families.h
2024-04-20 13:23:14 -04:00
Eduardo Quezada
c4c371824f
Merge branch '_RHH/master' into _RHH/upcoming
2024-04-20 08:22:49 -04:00
Alex
4b048c327b
Pokemoncommunity sprites (new batch) ( #4414 )
2024-04-20 07:58:21 -04:00
kittenchilly
88ce33c864
Add further icon sprite changes and fixes ( #4413 )
2024-04-20 09:41:01 +02:00
NT_x86
2b78a85828
Fix hoenn pokedex palette being split in two
2024-04-13 13:09:24 +03:00
Eduardo Quezada
5bf379720f
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/moves_info.h
2024-04-12 21:30:52 -04:00
kittenchilly
3fb52b6b0e
Change Frostbite abbreviation from FSB to FRB ( #4355 )
...
* Change Frostbite abbreviation from FSB to FRB
* Melted the ice is actually the one used
* Update moves_info.h
* Update moves_info.h
* Update items.h
2024-04-10 09:16:32 +02:00
