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
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
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
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
kittenchilly
77db5d9d1e
Update almost all Gen 9 icon sprites + add the missing ones ( #4290 )
...
* Ogerpon form icons
* Sprigatito family
* Fuecoco family
* Quaxly family
* Lechonk family
* Tarountula family
* Nymble family
* Pawmi family
* Tandemaus family
* Fidough family
* Smoliv family
* Squawkabilly forms
* Nacli family
* Charcadet family
* Tadbulb family
* Wattrel family
* Maschiff family
* Shroodle family
* Bramblin family
* Toedscool family
* Klawf
* Capsakid family
* Rellor family
* Flittle family
* Tinkatink family
* Wiglett family
* Bombirdier
* Finizen family
* Varoom family
* Cyclizar
* Orthworm
* Glimmet family
* Greavard family
* Flamigo
* Cetoddle family
* Veluza
* Dondozo
* Tatsugiri forms
* Annihilape
* Clodsire
* Farigiraf
* Dudunsparce
* Kingambit
* Great Tusk
* Scream Tail
* Brute Bonnet
* Flutter Mane
* Slither Wing
* Sandy Shocks
* Iron Treads
* Iron Bundle
* Iron Hands
* Iron Jugulis
* Iron Moth
* Iron Thorns
* Frigibax family
* Gimmighoul family
* Treasures of Ruin
* Roaring Moon
* Iron Valiant
* Paradox duo
* Walking Wake
* Iron Leaves
* Dipplin
* Poltchageist family
* The Loyal Three
* Ursaluna Bloodmoon
* Revert "Ursaluna Bloodmoon"
This reverts commit 33486816cf19ebe4b868117824c0ac77e183e806.
* Revert "Revert "Ursaluna Bloodmoon""
This reverts commit 2d0e90e51d896517821cda42aea5bb5fabd0b61e.
* Oops, out of order :(
* Paldean Tauros breeds
* PLA New Pokemon
* PLA Hisuian Forms
* Archaludon
* Hydrapple
* Gouging Fire
* Raging Bolt
* Iron Boulder
* Iron Crown
* Terapagos forms
* Pecharunt
* Partner Pikachu
* Partner Eevee
* Address reviews
* Arboliva tweak
2024-04-06 11:26:16 +02:00
kittenchilly
e8c05debce
Add unique icons for all of Arceus's forms ( #4329 )
2024-04-03 20:40:45 +02:00
Alex
29a4444fc1
Pecharunt sprite from pokemoncommunity ( #4324 )
...
* Pecharunt sprite from pokemoncommunity
* disable icon sprite
2024-04-02 21:32:47 +02:00
Eduardo Quezada
e479fa1007
Merge with latest merrp branch + starting to move the functionality of separate palettes to gSpeciesInfo
2024-03-25 16:03:56 -03:00
Eduardo Quezada
39ed85635f
Merge remote-tracking branch '_RHH_origin/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/data.h
# 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_3_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_6_families.h
# src/data/pokemon/species_info/gen_7_families.h
# src/data/pokemon/species_info/gen_8_families.h
2024-03-17 23:41:23 -03:00
kittenchilly
b7f5ef3cd7
Add Paldean Wooper mini icon ( #4260 )
2024-03-08 23:25:59 +01:00
Jaizu
ad839d0333
Lower followers gfx
2024-03-06 19:10:51 -08:00
Eduardo Quezada
ead108d28e
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# src/data/graphics/pokemon.h
2024-02-19 13:49:10 -03:00
Eduardo Quezada
75ad61e5bf
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_ai_main.c
# src/battle_ai_util.c
# src/battle_tv.c
# src/data/battle_moves.h
# src/data/graphics/pokemon.h
2024-02-19 10:13:13 -03:00
kittenchilly
585e06e756
Move Tatsugiri and Squawkabilly base species icons to graphic root folders ( #4212 )
2024-02-18 21:30:52 +01:00
Eduardo Quezada
124c17d315
Merge remote-tracking branch 'merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# README.md
# data/field_effect_scripts.s
# data/maps/AncientTomb/scripts.inc
# data/maps/DesertRuins/scripts.inc
# data/maps/IslandCave/scripts.inc
# data/scripts/follower.inc
# graphics/object_events/pics/pokemon/wailord.png
# graphics/object_events/pics/pokemon_old/substitute.png
# include/constants/event_objects.h
# include/global.h
# remote_build.sh
# spritesheet_rules.mk
# src/bike.c
# src/data/object_events/object_event_anims.h
# src/data/object_events/object_event_graphics.h
# src/data/object_events/object_event_graphics_info_followers.h
# src/data/object_events/object_event_pic_tables.h
# src/event_object_movement.c
# src/field_effect_helpers.c
# src/field_screen_effect.c
# src/overworld.c
# src/palette.c
# src/pokemon_summary_screen.c
# src/scrcmd.c
# src/trainer_see.c
2024-02-17 23:40:08 -03:00
Eduardo Quezada
502a56efd1
Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers
...
# Conflicts:
# include/global.h
# src/data.c
# src/data/pokemon/species_info/gen_7.h
2024-02-13 20:35:05 -03:00
Ariel A
a407c72235
Cleaned up follower code.
...
Added support for asymmetrical follower pokemon.
Fixed bug with changing GraphicsInfo size.
Added follower Substitute gfx. Credit: shikashipx
2024-02-12 20:37:01 -05:00
Eduardo Quezada
1720e1b129
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_scripts_2.s
# src/data/pokemon/species_info/gen_9.h
2024-02-10 17:53:32 -03:00
MartyKen
81fdfdd90b
PLA aux item sprites ( #4160 )
...
* PLA aux item sprites
* Sprite sharing
2024-02-10 18:08:09 +01:00
Eduardo Quezada D'Ottone
0f312e3f76
Fixed Ogerpon shiny palettes ( #4165 )
2024-02-09 22:51:36 +01:00
Eduardo Quezada
f89efad082
Merge branch '_RHH/master' into _RHH/upcoming
2024-02-05 17:52:34 -03:00
ravepossum
e75169fb87
Fix HGSS Dex List Decapped Tileset ( #4126 )
...
* fix decap HGSS dex tileset scroll bar
* more tileset fixes
---------
Co-authored-by: ravepossum <ravepossum@example.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-02-03 20:07:47 +01:00
Alex
4f40c678b5
Archaludon
2024-02-02 19:06:28 +01:00
Alex
f1b6fbb800
Indigo Disk sprites
2024-02-02 18:09:04 +01:00
Eduardo Quezada
09d12fb154
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# ld_script_modern.ld
# src/battle_ai_switch_items.c
2024-02-01 12:52:31 -03:00
ravepossum
8b62828e3f
Fix HGSS Dex dark mode search palette ( #4095 )
...
Co-authored-by: ravepossum <ravepossum@example.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-29 17:51:10 -03:00
Bassoonian
4c21c85ee2
PLA Items ( #3825 )
...
* Add PLA item data
* Add most item sprites
* Incorporate review feedback
2024-01-23 18:24:58 +01:00
Eduardo Quezada
c29a33ea78
Moved follower sprites to graphics/pokemon folder
2024-01-23 14:04:16 -03:00
Eduardo Quezada
00e2ca6030
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# src/battle_ai_util.c
# src/battle_script_commands.c
# src/battle_tv.c
# src/data/battle_moves.h
# src/data/pokemon/species_info/gen_9.h
2024-01-22 15:56:10 -03:00
Eduardo Quezada
19b4731c3b
Added subfolders to follower sprites (to be moved to the general mon graphic folder
2024-01-22 13:09:26 -03:00
Alex
91f429b5e5
Fixes Glimmering Charm ( #4047 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-22 13:55:08 +01:00
Ariel A
b56158428e
Added new follower pokeballs & toggle.
...
Credit: shikashipx
2024-01-21 17:21:33 -05:00
Eduardo Quezada
89958a0dc0
Gen 4+ followers
2024-01-20 00:32:52 -03:00
Eduardo Quezada
11b97597c8
Moved old mon graphics to its own folder so it's easier for the script to run
2024-01-19 14:52:34 -03:00
