Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,662 Commits 1 Branch 0 Tags
Commit Graph

485 Commits

Author SHA1 Message Date
hedara90
d1aa49cca3
Remove compressed palettes (#6455) 2025-04-26 22:58:40 +02:00
PCG
f661f3b3ac
Pokedex Plus HGSS move configs (#6687) 2025-04-24 19:34:37 +02:00
khbsd
971a595e4a
Evolution Refactor (#6556) 
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2025-04-23 16:01:33 +02:00
grintoul1
ec2aef2eff
Battle Transition: mugshots for multibattles (#6567) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-04-17 16:18:20 +02:00
Bassoonian
1c3d346d4f
Make form change methods into enum + type checking (#6631) 2025-04-16 23:45:41 +02:00
psf
e146940f25
Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups (#4901) 
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2025-04-12 10:23:48 +02:00
Hedara
c8f227903f Merge branch 'upcoming' into upcoming-master 2025-04-09 11:25:01 +02:00
Alex
f364cf9e71
Alcremie Evolution clean up follow up (#6557) 2025-04-09 11:18:07 +02:00
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +02:00
Eduardo Quezada
2b417bfeed
Implemented Alcremie Evolution Method (#6530) 
Co-authored-by: khbsd <khb.dev@gmail.com>
 2025-04-08 19:50:21 +02:00
AlexOn1ine
d767211c4a helper function to get the species type based on personality 2025-03-31 14:49:40 +02:00
Eduardo Quezada
2b3589b44f
Moved Pokémon Jump types to gSpeciesInfo (#5602) 2025-02-27 07:46:14 -08:00
Hedara
27da389d1e Merge branch 'master' into master-to-upcoming 2025-02-06 13:05:02 +01:00
Eduardo Quezada
fe41f9eaf5
Fixed non-regional forms breeding incorrectly (#4985) 2025-02-03 17:03:29 +01:00
Bassoonian
a1c47a931f
Revert "Converts a bunch of defines to enums" (#6082) 2025-01-22 21:50:39 +01:00
Bassoonian
a3ce3a569d
Converts a bunch of defines to enums (#6071) 2025-01-21 21:19:41 +01:00
Eduardo Quezada
ce40c3356c Merge branch '_RHH/master' into _RHH/upcoming 2025-01-12 08:42:57 -03:00
Eduardo Quezada
15a034a1d9
Fixed multiple transform/form change graphical issues (#6005) 2025-01-12 09:49:19 +01:00
Eduardo Quezada
8821779815 Merge branch '_RHH/master' into _RHH/upcoming 2025-01-11 08:07:15 -03:00
Eduardo Quezada
c33c38e020
Remove form change function footguns (#5995) 2025-01-11 09:57:39 +01:00
PhallenTree
c10287b4c1
Fixes various Dynamax HP conversions/calculations (#5933) 2025-01-07 20:08:31 +01:00
Eduardo Quezada
9669a0554d
Encapsulate move data (#5852) 2025-01-01 20:34:33 +01:00
Eduardo Quezada
3bc4126558 Merge branch '_RHH/master' into _RHH/upcoming 2024-12-28 15:28:07 -03:00
Eduardo Quezada
91c7bd9e53
Fixed givemon not respecting perfect IVs for species (#5873) 2024-12-26 21:22:45 +01:00
Alex
8edf14423a
Refactors argument into a union (#5853) 
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-12-23 15:51:35 -03:00
Alex
f61a0f6a30
Sheer Force fix and move effect cleanup (#5812) 2024-12-21 19:45:50 +01:00
GhoulMage
5df6f0b753
AI_FLAG_ACE_POKEMON takes into account separate trainers (#5608) 2024-10-29 15:18:29 -04:00
Eduardo Quezada
dfa3690d74
Added config to disable gender differences (#5595) 2024-10-29 15:38:26 +01:00
Eduardo Quezada
3205f377d5 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-21 08:18:44 -03:00
ghoulslash
d487bd0548
Revival Blessing fixes + Using Lunar Blessing's animation (#5490) 
* revival blessing fixes, add anim

* fix lunar blessing anim

* Added support for Revival Blessing in tests

* Added test to confirm absent flag fix

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-10-19 11:34:58 -03:00
kittenchilly
19009c6d21
Add support for overworld sprite gender differences + add all the sprites (#5394) 2024-10-04 17:56:21 +02:00
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers (#5178) 
* Add data to SpeciesInfo entries for in-battle shadows

* Implement sized shadows in the sprite visualizer

* Implement sized shadows in game code

* Show shadows for the lead battler for opponents during their battle anim

* Feedback on shadows, round 1

* Revert removal of Goomy and Sliggoo shadows

* Fixed GEN_3 setting

* Code cleanup + remove pre-processor branches

* Fix bugs with gen-3 configuration branch

* Style corrections, final shadow coordinate adjustments

* Adjustments to Garbodor and Araquanid
 2024-09-10 21:27:49 +02:00
Eduardo Quezada
abb1fd20f3 Merge branch '_RHH/master' into _RHH/upcoming 2024-08-12 16:24:04 -04:00
Alex
805bb2888c
Fixes wrong padding in struct SpeciesInfo (#5139) 
Fixes wrong padding in struct SpeciesInfo that is if I counted correctly.

After I opened #5138 I realized it might be an issue on master as well.
 2024-08-11 18:27:22 +02:00
Alex
97fa0be36e
Dynamic move type clean up (#5132) 
* Minor clean up of the new function DynamicMoveType

* wrongly removed func

* Overworld Weather Bug

* wrong comparison
 2024-08-11 14:18:56 +02:00
Eduardo Quezada
113f8de9b1 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_controller_player.c
 2024-08-08 13:22:49 -04:00
Eduardo Quezada
182809b515
Made perfect IV count into a granular setting (#5115) 
* Made perfect IV count into a granular setting

* Fixed optional parameter comment in SPECIES_NONE
 2024-08-08 13:46:22 -05:00
Galaxeeh
355739db63
Dynamic Move Types in Summary Screen/Battle (#5084) 
* Dynamic Hidden Power Types

* Dynamic Ivy Cudgel is summary screens

* Dynamic Move types

* missed unnecessary comment that got left in

* format cleanup, return cleanup, added Tera Blast and Tera Starstorm, Revelation dance fix-> now displays live type update when tera is selected during battle before move selection

* forgot to revert config defaults

* Update src/pokemon.c

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

* if block spaces/ raging bull fix/ more condensing on checks/ reallocating config check/ tera blast fix (was displaying tera blast type on non tera'd mons in party when battler was tera'd)

* revert configs

* added Hail check to Weather Ball

* Fixed agbcc compile/brackets/u32 changes

* Quick fix to ensure Judgment/Techno Blast/Natural Gift are not affected by -ate abilities

* Update src/pokemon_summary_screen.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-08-08 11:08:50 +02:00
pkmnsnfrn
5635f94036 More changes from typeX to types[X] 2024-08-07 11:35:45 -07:00
Bassoonian
cb4e687917 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmergeforpsf 2024-08-07 19:05:46 +02:00
psf
312749dd31
Changed type1 and type2 to be consistent (#2021) 
* Changed type1 and type2 in gBattleMons to match gSpeciesInfo
* Changed monType1 and monType2 to monTypes to match gSpeciesInfo
 2024-08-07 06:44:03 +01:00
Alex
12351d520d
Changes Evolution methods to Enums (#4977) 
* Changes Evolution methods to Enums

* make U8_ENUM to include/constants/global.h

* revert previous commit

* Update include/constants/pokemon.h

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-08-05 15:54:37 -04:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable (#5047) 
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable

* Fixed PC swapping not resetting the follower steps
 2024-07-27 20:48:59 +02:00
Bassoonian
81bd14818e
Add day limit for forms support (#4778) 
* Add day limit for forms support

* Add missing newline

* Incorporate review suggestions
 2024-06-26 10:36:44 +02:00
Alex
3ec8691590
Fixing my mess [correct hex in speciesInfo] (#4800) 2024-06-14 11:15:18 +02:00
Alex
9f7222e48b
Species info hex (#4798) 
* Adds missing hex in speciesInfo

* fix

* review

* fix compiling

* dumb mistakes
 2024-06-14 10:20:27 +02:00
Eduardo Quezada
88028c0c37
Split Pokémon Object Events from Following Pokémon functionality (#4761) 
* Split Pokémon Object Events from Following Pokémon functionality

* Renamed follower pngs and palettes

* Define renames

* Reorder configs

* Renaming: SpeciesInfo fields, macros and palettes.
 2024-06-13 22:46:27 +02:00
Bassoonian
76c566a0ca
Add the Let's Go evolution method (#4758) 
* Add overworld step evolution method

* Increase evolutionTracker bits from 9 to 10

* Implement tracker increase

* Remove leftover NDEBUG activation

* Reset evolution tracker data upon evolution

* Revert an accidental change to unrelated code

* Add missing break in switch case, oops
 2024-06-12 11:31:19 +02:00
kittenchilly
7f8f480ecb
Add FORM_CHANGE_BATTLE_TERASTALLIZATION + allow species to force tera types (#4438) 
* Add FORM_CHANGE_BATTLE_TERASTALLIZATION and allow species to force tera types

* Fix form change not changing tera type

* Update form_species_tables.h

* Address reviews

* Can't change the forced Tera Type anymore

* Revert "Can't change the forced Tera Type anymore"

This reverts commit 67157250efeaf5ffefc45ac1955b09f27f09788b.

* Fix a lot of things

* Oops

* Update pokemon.h

* Update pokemon.h

* Address reviews

* Update tera_starstorm.c

* Update test/battle/gimmick/terastal.c

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-06-04 13:38:49 +02:00
Eduardo Quezada
ee1d14755a Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-06-02 11:06:41 -04:00