624 Commits

Author SHA1 Message Date
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
kittenchilly
0aad2a9ba7
Change Battle Frontier validation to species flag (#4341)
* Split isLegendary into isRestrictedLegendary and isSubLegendary

* Address reviews and fix build

* Update frontier_util.c

* Remove gFrontierBannedSpecies , fast edition

* Sped up name generation

* More speed up

* Split Frontier restriction into its own flag

* Mythicals shouldn't be banned always anymore

* u32

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-05-03 13:32:06 -04:00
Eduardo Quezada
0c74fd31c3 Merge branch '_RHH/master' into _RHH/upcoming 2024-05-02 14:24:17 -04:00
kittenchilly
d58e6517f8
Add abilities Tera Shift, Tera Shell, and Teraform Zero (#4418)
* Add abilities Tera Shift, Tera Shell, and Teraform Zero

* Address reviews

* Tests and misc cleanup

* Fix alignments

* Update battle_script_commands.c

* New tests and fix behavior

* Address more reviews

* Update battle_util.c
2024-04-27 19:52:31 +02:00
kittenchilly
fc9d5c289a
Embody Aspect fixes (#4439)
* Embody Aspect fixes

* Fix tests

* Update battle_util.c
2024-04-27 19:35:42 +02:00
kittenchilly
64b28124fb
Add Tera Starstorm move + make Tera Blast displayed type reflect current type due to tera state (#4447)
* Add Tera Starstorm move + make Tera Blast/Tera Starstorm displayed type reflect tera type

* Ooops

* Curse tests
2024-04-27 19:35:29 +02:00
Eduardo Quezada
b006e2d213 Shiny Gen 7 sprites (gotta fix regular palettes) 2024-04-26 11:43:34 -04:00
Eduardo Quezada
dd098baf77
Official GF names by default (#4241) 2024-04-25 14:23:08 -04:00
Martin Griffin
06d817bd1b Expanded species names 2024-04-25 18:40:37 +01:00
Eduardo Quezada
d42de03ddc Merge branch '_RHH/master' into _RHH/upcoming 2024-04-25 12:37:31 -04:00
Eduardo Quezada
89a1abd7b4 Added separate palettes for Gen4-6 mon 2024-04-25 08:30:59 -04:00
Eemeliri
dbbe397095
Fix Lycanroc dusk and midnight form backsprites and adjust back offset (#4430) 2024-04-23 14:16:32 +02:00
Eduardo Quezada
a200fe1590 Read separate palettes and apply it to Gen 1-3 2024-04-21 10:20:23 -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
5a276dcbbf Merge branch '_RHH/master' into _RHH/upcoming 2024-04-15 18:29:06 -04:00
sneed
634dcf5e26
Actually disable forms when disabling forms (#4395)
* Remove form table data when forms are disabled

* Remove erroreous edit

* Add missing G-Max checks

* Update form_species_tables.h
2024-04-15 16:01:52 -04:00
Eduardo Quezada
65bee290ea
Fixed Gengar's missing cries (#4385) 2024-04-13 20:56:03 +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
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
Alex
db42d2b5a4
Adds Booster Energy (#4337)
* Adds Booster Energy

* fix string

* fixes strings in tests

* Apply suggestions from code review

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-04-05 19:38:50 +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
920289641a
Add evolution method for Gimmighoul, EVO_LEVEL_ITEM_COUNT_999 (#4261)
* Add evolution method for Gimmighoul, EVO_LEVEL_COLLECT_999

* Change to EVO_LEVEL_ITEM_COUNT_999

* Make logic use less duplicate code

* Update gen_9_families.h

* Update party_menu.c

* Address reviews
2024-03-17 22:03:40 +01:00
Eduardo Quezada
7c25db5200
Fill data for placeholder species (#4281)
* Absolute IDs

* Mothim internal forms

* Scatterbug/Spewpa internal forms

* Fixed Mothim not having form tables

* Totem Alolan Raticate

* Moved shared dex text to its own folder

* Totem Mimikyu

* Added missing empty third-ability fields

* Totem Gumshoos + missing totem flags

* Renamed files to better match their contents

* Fixed Disguise on Totem Mimikyu

* Totem Vikavolt/Alolan Marowak + missing Gumshoos form table

* Totem Ribombee/Araquanid/Lurantis/Salazzle

* Totem Togedemaru/Kommo-O

* Partner Pikachu/Eevee

* Reintroduced shinyLocked species flag for convenience

* Revert "Reintroduced shinyLocked species flag for convenience"

This reverts commit 3e07bd378ba6a249effe0aed83a424d0c775f236.
2024-03-16 18:38:43 +01:00
Eduardo Quezada
6804e82c0a
Revert gSpeciesInfo "INFO" macros (#4230)
* Venusaur, Charizard, Blastoise

* Butterfree, Beedrill, Pidgeot

* Rattata, Raticate

* Expanded the rest of Gen 1 macros

* Expanded Gen 2 macros

* Expanded Gen 3 macros

* Expanded Gen 4 macros

* Expanded Gen 5 macros

* Expanded Gen 6 macros

* Expanded Gen 7 macros

* Expanded Gen 8&9 macros

* Removed trailing macro slashes

* Expanded macros for sprites, pals, icons and learnsets (using shasum)

* AMEND ME

* Gen 1 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 2 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 3 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 4 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 5 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 6 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 7 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 8 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

* Gen 9 fully reordered (thanks Alex!)

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-03-14 17:47:38 -03:00
MartyKen
ec73e28507
Gen 6 level up learnset update (#4267)
* Lvl up learnsets by generation

I think the title sums it up pretty nicely

* Update level_up_learnsets.h

forgot some newer pokemon

* divided the learnset file into generations

* Separated learnsets by generation

Separated the learnsets by generation, added a bit more documentation in the config file

* Update src/pokemon.c

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

* Update include/config/pokemon.h

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

* PLA aux item sprites

* Gen 6 lvl up Learnset update

Updates gen 6's level up learnsets to ORAS (previously XY)

* Revert "Merge branch 'upcoming' of https://github.com/MartyKen/pokeemerald-expansion into upcoming"

This reverts commit 53462c4088926a813f216a7917b1dfeb5ef2ca25, reversing
changes made to 051a93058c83c691f8476fbb97035e64fcee38aa.

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-03-11 07:46:16 -03:00
kittenchilly
b7f5ef3cd7
Add Paldean Wooper mini icon (#4260) 2024-03-08 23:25:59 +01:00
Eduardo Quezada
c91af31a26
Fixed P_FOOTPRINTS not compiling (#4251) 2024-03-06 16:54:44 +01: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
70924c64b4 Better handling of disabling followers 2024-02-19 13:11:53 -03:00
Eduardo Quezada
1a4bc69c5a Moved follower settings to overworld config 2024-02-18 00:16:59 -03: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
ebe13ffc3c Merge branch '_RHH/master' into _RHH/upcoming 2024-02-16 11:30:01 -03:00
MelonSpeedruns
20a3d91de7
Fixed Basculegion Back Sprite Offset & Greninja forms animations (#4198) 2024-02-15 15:56:32 -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
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
Eduardo Quezada D'Ottone
0f312e3f76
Fixed Ogerpon shiny palettes (#4165) 2024-02-09 22:51:36 +01:00
Eduardo Quezada D'Ottone
6da1be01a9
Added Indigo Disk cries (#4164) 2024-02-09 19:46:09 +01:00
Bassoonian
15f30d646e
Add MON_TYPES and MON_EGG_GROUPS (#4154)
* Add MON_TYPE macro

* Add MON_EGG_GROUP macro

* Rename as requested by Edu

* Fix alignment after rename
2024-02-08 17:20:15 -03:00
Eduardo Quezada D'Ottone
ce97984d80
Updated teacheable learnests to Indigo Disk data (#4155)
* Updated teacheable learnests to Indigo Disk data

* Adjusted titles to indicate where to modify the moves
2024-02-08 17:27:26 +01:00
MartyKen
51cbf92ed0
Lvl up learnsets by generation (#4049)
* Lvl up learnsets by generation

I think the title sums it up pretty nicely

* Update level_up_learnsets.h

forgot some newer pokemon

* divided the learnset file into generations

* Separated learnsets by generation

Separated the learnsets by generation, added a bit more documentation in the config file

* Update src/pokemon.c

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

* Update include/config/pokemon.h

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

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-02-08 09:02:02 -03:00
Eduardo Quezada D'Ottone
3a45f0de0a
Apply suggestions from code review 2024-02-02 16:12:39 -03:00