Commit graph

544 commits

Author SHA1 Message Date
Bassoonian
4c21c85ee2
PLA Items (#3825)
* Add PLA item data

* Add most item sprites

* Incorporate review feedback
2024-01-23 18:24:58 +01:00
Bassoonian
9e051aa058 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears 2023-12-30 20:49:05 +01:00
kittenchilly
1e958ada8c
Add Indigo Disk item data (#3854) 2023-12-28 23:00:34 +01:00
Frank DeBlasio
5cdee87489
Refactor Trainer sprites (#3597)
* Added TrainerSprite struct with coordinates

* Added .frontPic to struct

* Added .palette to TrainerSprite struct

* Added .animation to the struct

* Added define for sprite size

* Condensed animations since they were all the same

* Improved TRAINER_SPRITE/PAL defines

* Simplified seemingly unused .y_offset and TRAINER_PIC_SIZE values

* Condensed TRAINER_SPRITE and TRAINER_PAL into TRAINER_PIC

* Renamed .size to .y_offset since that what it appears to actually be

* Moved y_offset into TRAINER_PIC

* Moved animation inside of TRAINER_PIC

* Added array number to preproc

* Removed trailing spaces

* Added sprite/palette files to preproc

* Revert adding sprites to preproc as it fails agbcc

This reverts commit dce57f8d1bfab70b4c6630a9c4e5b43495891459.

* Added backsprite struct

* Added animations to backsprite struct

* Changed TRAINER_PIC to TRAINER_SPRITE

* Added animation to backsprite preproc

* Added .backPic to struct

* Moved array number into backsprite preproc

* Removed definitions for trainer sprites

* Hardcoded sAnims_Trainer into struct since every sprite uses it

* Fixed TRAINER_SPRITE arguments
2023-12-20 23:14:33 +01:00
Bassoonian
6365431122 Add PokéNav too 2023-12-12 23:20:22 +01:00
Bassoonian
e5ac2fe0b1 Clean up pokemon/ball/dex mentions in comments 2023-12-12 19:02:36 +01:00
Eduardo Quezada D'Ottone
4adc2dcb16
Species Simplifier™ - Part 3 (#3562)
* Added SpeciesInfo fields

# Conflicts:
#	include/pokemon.h

* Added missing comments

* Renamed gigantamax to isGigantamax

* Converted species flags to agbcc bit flags

* Added padding after flags

* Pikachu form config

* Dex text

* Reordered Paradox flag

* Missing Pikachu ifdef comments

* Moved P_GEN_x_POKEMON settings to the species_families file

* Gen 1 Dex entries

* Renamed file to species_enabled.h

* Prevent Pokémon from evolving if their evolution is disabled

* Prevent Pokémon from being affected by Eviolite if their evolution is disabled

* Prevent Pokémon offspring if they're disabled

* Corrected imprementation of evolution prevention

It could potentially overwrite items by accident

* Cross-evo configs

* Gen 2 dex entries

* Changed cry table to use assignable IDs

# Conflicts:
#	include/pokemon.h

* Form table pointers

* Beginning support for moving data to gSpeciesInfo

* Pokédexes reads text from gSpeciesInfo

* Reading species names from gSpeciesInfo

* Fixed erroneous copy-paste

* Moved Bulbasaur to Raichu Family data do gSpeciesinfo

* Added female pic sizes

* Macros for Front, Back, Palette and Learnsets

* Sandshrew to Dugtrio Families

* Obtains Height/Weight from gSpeciesInfo

* Read category from gSpeciesInfo

* Removed unused data from pokedex_entries.h

* Moved Gen 1 data to gSpeciesInfo

* Moved Gen 2 data to gSpeciesInfo + fixed Ursaluna Bloodmoon not producing Teddiursa eggs

* Moved Gen 3 data to gSpeciesInfo

* Moved Gen 4 data to gSpeciesInfo

* HGSS dex properly shows form sprites

* Fixed data type for GetSpeciesHeight/Weight

* Reading Pokédex Size data from gSpeciesInfo

* Cleaned up mon graphic decompression function

* Reading Front Pics gSpeciesInfo

* Reading Back Pics gSpeciesInfo

* Updated uses of GetMonSpritePalStruct to allow loading the data directly instead of reading the struct

* Reading palettes from gSpeciesInfo

* Reading animation delay from gSpeciesInfo

* Fixed Pokémon Debug Menu not reading animation delay

* Reading front anim Id from gSpeciesInfo

* Reading back anim Id from gSpeciesInfo

* Reading Animation Frames from gSpeciesInfo

* Reading Icon Sprites from gSpeciesInfo

* Reading Icon Palette IDs from gSpeciesInfo

* Reading Footprints from gSpeciesInfo

* Reading Mon Pic sizes from gSpeciesInfo

* Separate mon pic sizes for female mon

* Reading Level Up Learnsets from gSpeciesInfo

* Reading Teachable Learnsets from gSpeciesInfo

* Reading National Dex Number from gSpeciesInfo

* Reading Enemy Mon Elevation from gSpeciesInfo

* Reading Evolutions from gSpeciesInfo

* Reading form table from gSpeciesInfo

* Fixed button label inconsistency in pokémon debug menu

* Reading form change table from gSpeciesInfo

* Removed need to define mon graphics in include/graphics.h

* Reordered mon graphics by family

* Fixed National dex number offset

* gFrontierBannedSpecies now checks IsSpeciesEnabled

* Added 3 more toggles for Fusions, Primal Reversions and Ultra Burst

* Gen 3 & 4 family toggles for dex entries

* Fixed missing Mr. Rime data

* Gen 1 dex descriptions as compound strings

* Gen 2 dex descriptions as compound strings

* Gen 3 dex descriptions as compound strings

* Gen 4 dex descriptions as compound strings

* Fixed compile in agbcc

* Moved Gen 5 data to gSpeciesInfo

* Using PLACEHOLDER_ANIM_SINGLE_FRAME when needed (same hash)

* Renamed PLACEHOLDER_TWO_FRAME_ANIMATION to PLACEHOLDER_ANIM_TWO_FRAMES

* Fixed capitalization for front pic anims

* Fixed `CanEvolve`

* Moved Gen 6 data to gSpeciesInfo

* Gen 7 without macros

* Gen 8 without macros

* Gen 9 without macros

* Fixed Gen 9 sound data

* Finished moving Gen 7 data in macros (by Alex)

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

* Ultra Necrozma is now included in the fusion forms define

* Cries are now properly excluded from the rom when disabling species

* Removed P_GEN_x_POKEMON from form_change_tables.h

* Fixed Yanmega's cry ignoring the P_GEN_4_CROSS_EVOS setting

* Added P_NEW_EVOS_IN_REGIONAL_DEX setting

* Automatic ASSUMPTION_FAIL when used species are disabled

* Finished moving Gen 8 data in macros (by Alex)

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

* Expanded Alcremie macro

* Finished moving Gen 9 data in macros (by Alex)

* Fixed missing data for Komala and Marshadow

* Form species id tables use family toggles + added missing Ursaluna form species id table

* Fixed Genesect palettes

* Fixed Flabébé family graphics

* Fixed Minior Graphics

* Fixed missing Calyrex data

* Family toggles in mon graphcis (By Jasper/Bassoonian)

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

* Fixed missing Ogerpon data

* Ordered Level Up Learnsets (missing toggles)

Also added White Basculin learnset

* Added more Minior synonyms

* Fixed enamorus order

* Reordered teachable learnsets

* Removed sSpeciesXXX level up learnsets + reordered

* Removed unneeded assumes

* Removed unused extra animations

* Family toggles in mon level up learnsets (By Jasper/Bassoonian)

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

* Fixed Phione graphics inclusion

* Family toggles for Teachable Learnsets

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

* Ordered Front Pic Anims

* Family toggles for front pic animations

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

* Fixed HGSS dex incorrectly showing the wrong mon when catching it

* Family toggles for Egg Moves + reodered

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

* Fixed HGSS not checking for null footprints

* Review changes

* Fixed Female difference mon not using their macros

* Fixed Alcremie Macro

* Fixed compile error when disabling the Bulbasaur family

* Fixed Turtwig and Chimchar family + Houndour and Mareep cries not being excluded properly

* Re-added missing Egg graphical data

* Fixed crash during the Birch Intro when Lotad is disabled

* Renamed PALLETE to PALETTES

* Removed extra spacing for YOffsets

* Fixed compile when only disabling cross-gen evolutions

* Added Tera Forms define (Ogerpon and Terapagos)

* Fixed Necrozma macro

* Removed .noFlip = FALSE

* Fixed dex number in summary screen for forms when nat dex is disabled

* Fixed Paldean form paths

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-08 15:05:10 +01:00
Alex
b9edbb429b
Adds combined pledge move effects (#3336)
* Adds combined pledge move effects

* added pledge status and various other fixes

* leftover

* fix triple arrow test tag

* pledge moves can not be redirected by absorbing abilities

* more pledge changes

* remove duplicate test

* Stab boost, Rainbow anim and new SeaOfFire anim

* leftover

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-11-21 16:23:22 +01:00
Bassoonian
cb245a00c6
Includes older item and move names as variants (#3580)
* Item name variants

* Updated move names

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-11-20 18:35:00 +01:00
hedara90
7ccdd4b5b3
Added Teal Mask item graphics + updated install instructions (#3527)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-09 21:57:04 -03:00
Eduardo Quezada D'Ottone
4aa14355d7
Merge branch 'upcoming' into gen9-species-nomigration 2023-11-06 13:49:02 -03:00
kittenchilly
90471741e9
Add Fairy Feather sprite (#3520) 2023-11-03 16:32:12 -03:00
Eduardo Quezada D'Ottone
eccd2c4a65
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration 2023-11-02 21:28:53 -04:00
kittenchilly
244ca0be95
Add custom female icon sprites for Pikachu and Wobbuffet (#3506)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-11-01 18:49:44 -03:00
Eduardo Quezada D'Ottone
1467ffa3d8
Added missing Alcremie forms (#3469)
* Alcremie form sprites

Co-authored-by: Blackforest92 <rico.anjaya@gmail.com>

# Conflicts:
#	graphics/pokemon/alcremie/lemon_cream/front.png
#	graphics/pokemon/alcremie/matcha_cream/back.png
#	graphics/pokemon/alcremie/matcha_cream/front.png
#	graphics/pokemon/alcremie/mint_cream/front.png
#	graphics/pokemon/alcremie/ruby_cream/front.png
#	graphics/pokemon/alcremie/salted_cream/front.png
#	include/graphics.h
#	src/data/graphics/pokemon.h
#	src/data/pokemon/species_info.h
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/footprint_table.h
#	src/data/pokemon_graphics/front_pic_anims.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon.c

* Fixed cries

* Removed Todos

* Temp: all forms use the same icon

* Grouped form data + Fixed missing Level up and Teachable learnsets

* Added missing data for form changes and back animations

* Grouped defines together

* Fixed compile

---------

Co-authored-by: Alex <alexthenotes@gmail.com>
2023-10-29 20:30:56 +01:00
Alex
f2fddf4ee1
Syrup Bomb move and special speed drop anim, Credits to Dat.H A (#3474) 2023-10-27 19:14:45 -03:00
leo60228
a505afac1d
address review 2023-10-26 18:57:06 -04:00
kittenchilly
d9ccc80b31
Sprites 2023-10-26 17:34:21 -04:00
leo60228
f6e5076dc0
add new sprites 2023-10-24 23:20:59 -04:00
Eduardo Quezada
ed3e2f8e09 Gen 9 form order 2023-10-23 13:30:32 -03:00
Eduardo Quezada
174ad11535 SPECIES_GIMMIGHOUL_CHEST 2023-10-23 12:09:44 -03:00
Eduardo Quezada
2e9e157cf8 SPECIES_DUDUNSPARCE_TWO_SEGMENT 2023-10-23 11:45:15 -03:00
Eduardo Quezada
82bb758d19 SPECIES_PALAFIN_ZERO 2023-10-23 11:08:06 -03:00
Eduardo Quezada
792aee86ea SPECIES_SQUAWKABILLY_GREEN_PLUMAGE 2023-10-23 10:55:16 -03:00
Eduardo Quezada
ff60b7ff73 Maushold Family of Three define 2023-10-23 10:24:47 -03:00
Eduardo Quezada
e6c5077d7c Oinkologne Male define 2023-10-23 10:12:55 -03:00
Eduardo Quezada
a92a3256df Fixed Paldean Tauros Combat Breed order and data names 2023-10-23 09:33:37 -03:00
Eduardo Quezada
f570d14f2d Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration
# Conflicts:
#	include/constants/species.h
#	sound/cry_tables.inc
#	src/data/pokemon_graphics/enemy_mon_elevation.h
#	src/data/pokemon_graphics/front_pic_anims.h
2023-10-23 09:23:32 -03:00
Eduardo Quezada D'Ottone
26971fc3ac
Add species defines for base forms with names (#3248)
* Fixed Aegislash test not being properly made.
* Added conditions to BattleSetup_StartLegendaryBattle switch
2023-10-23 12:59:15 +01:00
kittenchilly
d495e177b9
Add Snow weather animation (#3440)
* Snow weather animation

* Update battle_anim_scripts.s

* Apply changes from review
2023-10-22 21:15:07 +02:00
sbird
196038eaee [pokedex_plus] refactor #if to C if 2023-10-22 03:26:24 +02:00
leo60228
ba0534386d
Address review 2023-10-18 14:37:29 -04:00
Eduardo Quezada D'Ottone
a502427a7f
Merge pull request #18 from AlexOn1ine/speciesReorderItems
(cherry picked from commit 6dc58dcc17)
2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
c221c67202
Merge pull request #16 from AlexOn1ine/speciesReorder
(cherry picked from commit e081d2b773)
2023-10-18 14:34:00 -04:00
Eduardo Quezada D'Ottone
133ffc7260
Merge pull request #15 from Bassoonian/rhhspeciesreorder
Add gen 9 Pokémon data

(cherry picked from commit cd3e65f5c9)
2023-10-18 14:33:56 -04:00
Eduardo Quezada
c0540a3559 Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
#	include/battle.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
2023-10-15 00:30:00 -03:00
kittenchilly
a795148068
Add Pikachu World Cap mini icon (#3401) 2023-10-11 11:02:28 +02:00
Eduardo Quezada
f830b0725a GMAX -> GIGANTAMAX 2023-10-10 18:07:12 -03:00
Eduardo Quezada
92301398bc Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
#	asm/macros/battle_script.inc
#	data/battle_anim_scripts.s
#	data/battle_scripts_1.s
#	include/battle.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/config/battle.h
#	include/constants/battle.h
#	include/constants/battle_anim.h
#	include/constants/battle_move_effects.h
#	include/constants/battle_string_ids.h
#	include/data.h
#	include/random.h
#	sound/cry_tables.inc
#	src/battle_anim_new.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_interface.c
#	src/battle_main.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/pokemon/form_change_table_pointers.h
#	src/data/pokemon/species_info.h
#	src/data/text/move_names.h
#	test/test_runner_battle.c
2023-10-09 16:51:41 -03:00
Eduardo Quezada D'Ottone
20e3b43f7c
HGSS Style Pokedex (#3288) 2023-10-02 17:28:37 -03:00
Alex
db039ee4e2
Tera Shards Icons (#3307) 2023-09-14 07:38:45 -03:00
Eduardo Quezada
b89722500f Fixed Mr. Mime capitalization 2023-09-12 13:09:56 -03:00
Aaghat
6ac16c8c2e More clean up 2023-09-09 10:16:14 +05:30
Aaghat
c4231ba860 Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss 2023-09-08 18:47:26 +05:30
kittenchilly
2fa4206bf1
Add new Substitute doll sprites (#3263) 2023-09-04 19:48:43 -03:00
Eduardo Quezada
0d5b00aaf2 Merge remote-tracking branch 'pret/master' into RHH/pr/upcoming/pret_20230829
# Conflicts:
#	README.md
#	data/battle_ai_scripts.s
#	data/battle_scripts_1.s
#	data/maps/BattleFrontier_Lounge7/scripts.inc
#	include/battle_anim.h
#	include/battle_message.h
#	include/constants/items.h
#	src/battle_ai_script_commands.c
#	src/battle_ai_switch_items.c
#	src/battle_anim_throw.c
#	src/battle_anim_utility_funcs.c
#	src/battle_controller_link_opponent.c
#	src/battle_controller_link_partner.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_controller_player_partner.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controller_recorded_player.c
#	src/battle_controller_wally.c
#	src/battle_gfx_sfx_util.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/data/party_menu.h
#	src/data/pokemon/tmhm_learnsets.h
#	src/daycare.c
#	src/field_specials.c
#	src/hall_of_fame.c
#	src/party_menu.c
#	src/pokemon.c
#	src/tv.c
2023-08-31 14:28:01 -04:00
GriffinR
4941e2602a
Merge pull request #1909 from GriffinRichards/stat-anim
Document stat change animation
2023-08-20 14:29:11 -04:00
GriffinR
60a6c9d160
Merge pull request #1903 from GriffinRichards/frontier-gfx
Fix some frontier gfx, adjacent cleanup
2023-08-10 14:49:44 -04:00
GriffinR
6eaaa50ad5
Correct berry fix graphics colors, more PLTT constant use (#1892) 2023-08-09 12:49:21 -04:00
GriffinR
6598cb30bc Document stat change animation 2023-08-08 23:56:16 -04:00