579 Commits

Author SHA1 Message Date
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
Alex
4f40c678b5 Archaludon 2024-02-02 19:06:28 +01:00
Alex
f1b6fbb800 Indigo Disk sprites 2024-02-02 18:09:04 +01:00
Bassoonian
ccfebe5e05
Adds missing evolution methods (#4087)
* Add evolution tracker to BoxMon struct

* Add "use move 20 times, then lv up" evolution method

* Add recoil tracker

* Reduce to 9 bits

* Fix agbcc complaint

* Put MOVEEND_CLEAR_BITS at the end

* Remove battle argument from tryupdaterecoiltrackker

* Add null checks

* Fix upcoming merge

* Add requested formatting changes

* Condense evolution check into a single function for easier customisation later

* Incorporate review requests

* Update src/pokedex_plus_hgss.c

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

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-02-01 18:35:38 -03:00
Bassoonian
c8c97edf89
Update teachable_learnsets.h (#4064) 2024-01-24 18:52:26 +01:00
Bassoonian
78708cad55
Adds universal move array (#4052)
* Add universal move list

* Exclude TM illiterates from learning universal moves

* Add config for literacy checks

* Fix config check

* Update src/pokemon.c

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

* Other review remarks

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2024-01-24 11:45:22 -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
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
Bassoonian
b99ec5d43c
Update level_up_learnsets.h (#4046) 2024-01-22 00:07:19 +01:00
Mathew Arnold
a01d442f36
Fixed Kingra's learnset gen (#4044)
In level_up_learnsets.h, Kingdra's learnset was inside a check for P_GEN_4_CROSS_EVOS. As a Gen 2 Pokemon, this has been updated to check for P_GEN_2_CROSS_EVOS instead.
2024-01-21 18:23:55 +01:00
Bassoonian
9286b80866
Remove illegal moves from teachable learnsets (#4042)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-21 13:02:45 +01:00
Bassoonian
53a46b7a29
Remove faulty teachable learnset moves (#4039) 2024-01-21 10:25:37 +01:00
Bassoonian
f3342de00b
Condense Oinkologne teachable learnsets (#4026)
* Condense Oinkologne teachable learnsets

* Fix redundant backslash
2024-01-19 17:01:14 +01:00
Bassoonian
e8a238a775
Exp yield configs (#3995)
* Gen 1 exp yield config

* I'm a dumdum

* Gen 2 configs

* Exp yield configs up to gen3

* Gen 4 configs

* Gen 5 configs

* Configs up to gen6

* Gen7 configs

* Final form exp adjustments
2024-01-15 23:49:12 +01:00
Bassoonian
4846e2a884
Add updated EV configs (#3993)
* Add updated EV configs

* Fix Misdreavus ternary
2024-01-14 15:26:34 +01:00
Eduardo Quezada D'Ottone
9445953833
Moved Item Effects to gItems (#3991)
* Moved Item Effects to gItems

* Removed redundant item effects

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-14 10:03:48 +01:00
kittenchilly
cdaf3031cb
Update EXP Yield for Indigo Disk mons + other data fixes (#3974)
* Update EXP Yield for Indigo Disk mons

* Update gen_8.h

* Also update all body colors

* Revert "Also update all body colors"

This reverts commit 530bbe7baebbebb6528e0719edf03d8042a3eb03.

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-12 12:25:08 +01:00
Biffalo XIII
2cc26d935a Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	data/battle_scripts_1.s
#	include/config/pokemon.h
#	src/birch_pc.c
2024-01-11 19:51:11 -03:00
Eduardo Quezada D'Ottone
a1071aaf42
Added missing form dex entries. (#3972)
Co-authored-by: Biffalo XIII <--global>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-01-11 14:39:51 -03:00
Eduardo Quezada D'Ottone
4acaa0cab8
Expanded Paldean Tauros macro (#3971)
* Expanded Paldean Tauros macro

* Updated colors to December 2023 HOME changes

---------

Co-authored-by: Biffalo XIII <--global>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-01-11 17:54:19 +01:00
Alex
e0f672fbad
Tauros forms stat fixes + Electrode-H evo item fix (#3970)
* Tauros forms stat fixes + Electrode-H evo item fix

* fixes misc info placement
2024-01-11 10:56:19 +01:00
Alex
96f601f9f8
Replaces some older gen9 sprites with Pokemoncommunity ones (#3969) 2024-01-11 10:23:57 +01:00
Biffalo XIII
4a3954ff34 Merge branch '_RHH/master' into _RHH/upcoming
# Conflicts:
#	src/birch_pc.c
#	src/main.c
2024-01-09 09:19:12 -03:00
BiffaloXIII
8b80a54a7a
Removed footprint field when P_FOOTPRINTS is FALSE (#3925) 2024-01-04 21:54:03 +01:00
Bassoonian
f94e65a400
Footprint config (#3902)
* Footprint config

* Don't enable by default
2024-01-03 21:24:45 +01:00
kaisermg5
ef6e8ba2ea
Added Dugtrio's footprint and formSpeciedIdTable. (#3897) 2024-01-03 16:07:39 +00:00
kittenchilly
f6f287d637
Add Indigo Disk Pokemon data (#3878)
* Archaludon?

* more archuladon stuff

* Hydrapple and Gouging Fire

* Raging Bolt

* Iron Boulder and Iron Crown

* Terapagos

* Pecharunt

* Update gen_9.h

* Pokedex orders
2024-01-01 01:38:50 +01:00
Katy
00e7038061
Pokemon GFX Upgrades/Fixes (#3805)
* Tyrantrum GFX Upgrade

* Duraludon Pal Fixes

* Zigzagoon Sprite fixes

* Linoone Sprite Fixes

* Togepi Icon Fix

missing pixel

* Gen 9 Pokemon Icons

For #3553
Did a bunch of research (looking at how old icons generally look) to help decide specific icons to choose from.
Generally icons are more 'chibi' like, with large heads (exceptions being 'scary' fully evolved pokemon) and the animations usually move up and down with some character.
Some touches as well.

* Litwick Front Fix

Missing Pixel

* Krookodile Front Fix

Stray pixel

* Switch to Shiny pal

Switch to shiny pal on Tyrantrum’s back sprite png

---------

Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-30 22:29:32 +01:00
Bassoonian
9e051aa058 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergenewyears 2023-12-30 20:49:05 +01:00
Martin Griffin
ab900e38df Merge remote-tracking branch 'rhh/master' into upcoming 2023-12-29 19:48:21 +00:00
kittenchilly
ecba468a96
Fix item effect for SV evolution items (#3858)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-29 15:03:42 +01:00
Kurausukun
7567b0a57a safeguard SQUARE and CUBE macro arguments in parentheses 2023-12-27 17:29:35 -05:00
kittenchilly
bb94d302ae
Add Meteorite form change functionality (#3770)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2023-12-20 10:33:08 +01:00
Eduardo Quezada D'Ottone
0f7fbc628d
Fixed miscelaneous mon data (#3749) 2023-12-17 09:35:55 -03:00
Katy
8a644e00a0
Gen 9 Species Sprite Fixes (#3751)
* Charcadet GFX Changes

* Capsakid Shiny Pal

* Rellor Back Sprite

* Wiglett GFX Changes

* Wugtrio Shiny Pal

* Finizen Shiny Pal

* Palafin Zero Shiny Pal

* Cyclizar Shiny Pal

* Orthworm GFX Changes

* Glimmet Shiny Pal

* Glimmora Shiny Pal

* Dondozo Shiny Pal

* Frigibax Back Sprite

I honestly think this thing needs a new backsprite
2023-12-17 12:55:13 +01:00
Eduardo Quezada D'Ottone
9ba31ac306
Separated gSpeciesInfo by Generation (#3729) 2023-12-15 12:29:00 +00:00
Bassoonian
0fd08a32ac Add status form change 2023-12-15 11:17:35 +01:00
Eduardo Quezada D'Ottone
63ff8b9f70
Fixed bad use of family defines (#3722) 2023-12-13 22:31:13 +01:00
Bassoonian
e5ac2fe0b1 Clean up pokemon/ball/dex mentions in comments 2023-12-12 19:02:36 +01:00
Bassoonian
75b45a93fb
Missing dex texts (#3708)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2023-12-12 18:43:50 +01:00
Bassoonian
1ed07f792b
Fixes H Sneasel's type (#3706) 2023-12-12 12:18:39 +01:00
Frank DeBlasio
a0fc6be3dd
Removed redundant ifdef and fixed Veluza stat spacing (#3698) 2023-12-11 17:01:32 -03:00
Bassoonian
1c6d551eeb Fix form change table pointer defines 2023-12-11 14:03:52 +01:00
Martin Griffin
ee1fb1d454
SpeciesInfo tests (#3688)
* Remove unnecessary const

* Test that species ID tables are shared between all forms

* Use P_FAMILY_MELTAN

* Test that form change tables contain only IDs in form species tables

* Fix isPrimalReversion typo

* Test form change targets have appropriate species flags

* Fix #3689
2023-12-11 13:54:20 +01:00