atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15472 commits 2 branches 40 tags 600 MiB
Commit graph

2798 commits

Author SHA1 Message Date
Bassoonian
22994c79d4
Add support for multiple roamers (#4762) 
* Replicate initial commit

* Integrate the rest of Duke's vanilla commits

* Alter Roamer struct to add frostbite support

* Fix some indentation issues

* Add option to hide substitute followers

* Revert "Add option to hide substitute followers"

This reverts commit 3fadaafae5.

* Incorporate feedback
 2024-06-15 11:17:32 +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
Eduardo Quezada
06153e4280 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	include/battle.h
#	include/constants/battle_script_commands.h
#	include/constants/pokemon.h
#	src/battle_ai_util.c
#	src/battle_main.c
#	src/battle_util.c
#	test/battle/ai.c
 2024-06-13 11:44:28 -04: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
Alex
9c72392891
Fixes Shell Side Arm (#4753) 
* Fixes Shell Side Arm

* Fixes to random call

* hardcoded the effect to the move

* minor change

* minor change 2

* applied reviews
 2024-06-12 11:21:44 +02:00
Bassoonian
dffaaeaaa6
Add Leader's Crest evolution method (#4768) 
* Add Leader's Crest evolution method

* Fix typo in in HGSS dex

* Update src/pokedex_plus_hgss.c

Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>

* Update src/battle_script_commands.c

---------

Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
 2024-06-12 09:31:59 +02:00
Bassoonian
341fa3692c
Make Tandemaus only evolve at the end of battles (#4759) 2024-06-12 08:43:51 +02:00
Eduardo Quezada
64f82cdd5f Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_ai_util.c
#	src/battle_util.c
 2024-06-11 08:12:03 -04:00
Bassoonian
bbc05234b9
Make Pokémon Sprite Visualizer name official (#4745) 
* Rename files to PSV

* Rename functions and defines

* Add missing newlines

* Integrate feedback
 2024-06-09 12:12:35 -04:00
Alex
78f1da4131
Adds 1 vs 2 macro (#4741) 2024-06-08 09:49:28 +02:00
Bassoonian
568ce39c5d
Adds forbidden status parameter to FORM_CHANGE_ITEM_USE (#4738) 2024-06-08 07:36:39 +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 67157250ef.

* 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
Eduardo Quezada
0be643a517
Set TYPE_NONE as type 0 + other type data tweaks (#4462) 
* Set TYPE_MYSTERY as type 0

* Remove redundant TYPE_NONE

* Moved Gen 1-3 type damage categories to gTypesInfo

* Set TYPE_NONE as 0 instead

* Grouped type info to a single file

* Fixed sTypeEffectivenessTable static name

* Adjusted MON_DATA_TERA_TYPE to account for shift in type IDs

* oops, missed the extern

* Moved Tera Type RGB values to gTypesInfo

* Fixed Tera Type test

* Added option test feature to set IVs

* Hidden Power type test

* Tera Type safeguard in givemon

* Removed isHiddenPowerType for a future PR that refactors Hidden Power

* Review changes
 2024-06-01 07:38:22 +02:00
Bassoonian
52d45674f0
Move Descriptions in battle (#4152) 
* Port xaman move desc to modern expansion

* Fix modern compiler error

* Fix compliling + EFFECT_PLACEHOLDER support

* Change to L-button to avoid conflict with Mega Evolution

* Reorder and change priority to category

* add sprite for move category icon, declare category icon sprite data extern

* remove static category icon sprite data from hgss dex for global data

* Change to else if

---------

Co-authored-by: Pawkkie <moog272@gmail.com>
Co-authored-by: RavePossum <ravepossum@proton.me>
 2024-05-31 12:10:03 +02:00
ghoulslash
7b1248b167
add savedBattlerAttacker and stack for saved target/attacker (#4061) 
* add saveattacker/savetarget stack

* add safety checks to savedAttackerCount/savedTargetCount

* add testing warnings for saveattacker/savetarget

* update frisk with saveattacker

* restoretarget at end of red card battle scripts, remove testing checks on SaveAttacker,SaveTarget

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
 2024-05-29 21:50:24 +02:00
Eduardo Quezada
ff480dec27 More review comments 2024-05-28 18:32:20 -04:00
Eduardo Quezada
021074cd2e Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	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_4_families.h
#	src/data/pokemon/species_info/gen_5_families.h
#	src/data/pokemon/species_info/gen_8_families.h
 2024-05-28 14:28:33 -04:00
Eduardo Quezada
8854eaa880 Removed duplicated object event tags 2024-05-28 14:16:34 -04:00
Alex
7a393a974a
Adds Dragon Darts effect (CFRU port) (#4612) 
* Adds Dragon Darts effect (CFRU port)

* fix test compile

* review
 2024-05-28 11:34:56 +02:00
Pawkkie
be2517415b
Damage roll selection in AI_CalcDamage (#4615) 
* Damage roll selection and AI_FLAG_CONSERVATIVE

* Clarify enum names

* Simplify AverageRollDmg line

* Change u8s to u32s

* Turns out Boomburst does a lot of damage lol

* Spacing
 2024-05-28 10:21:25 +02:00
hedara90
d999092689
Upgraded Dragon Darts Animation (#4620) 
* Upgraded Dragon Darts Animation

* Fixed Dragon Darts not workin in link battles

* Apply suggestions from code review

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

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
 2024-05-28 10:17:52 +02:00
Eduardo Quezada
80b193280d Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_main.c
#	src/data/item_icon_table.h
#	src/data/pokemon/species_info/gen_9_families.h
 2024-05-27 10:13:42 -04:00
Eduardo Quezada
069161b716 Untag release 2024-05-27 09:31:06 -04:00
Eduardo Quezada
767a1c7937
Version 1.8.4 (#4639) 
* Version 1.8.4

* Missing labels
 2024-05-27 09:06:34 -04:00
Eduardo Quezada
9e72271c8e Merge remote-tracking branch '_pret_origin/master' into _RHH/pr/master/pret_20240526 
# Conflicts:
#	src/battle_anim_poison.c
#	src/pokemon.c
#	src/pokemon_icon.c
 2024-05-26 18:34:26 -04:00
sneed
b592c6eae5 Add POKE_ICON_BASE_PAL_TAG to a header 2024-05-23 02:45:22 +03:00
Alex
ba07d2b3d4
Renames evolution methods the were labeled as evo level (#4607) 
* [FIX] EVO_LEVEL_MOVE_TWENTY_TIMES -> EVO_USE_MOVE_TWENTY_TIMES

* rename evo_level_recoil_damage

* change EVO_LEVEL_ITEM_COUNT_999
 2024-05-22 11:06:24 +02:00
Eduardo Quezada
14ab00cfeb Moved message counts to their own file + remove unneeded include 2024-05-21 22:04:22 -04:00
Eduardo Quezada
9fc7e37c73 Comment updates 2024-05-21 19:38:42 -04:00
Frank DeBlasio
849bd0c8bb
Consolidate natures (#4562) 
* Added NatureInfo struct

* Added back animation variants to struct

* Added PokeBlock animations to struct

* Added Battle Palace info to struct

* Added nature girl messages to struct

* Reordered gNaturesInfo to match struct order

* Refactored nature stat table

* Fixed battle dome nature calculation

* Fixed neutral nature values

* Fixed bracket layout
 2024-05-19 10:14:31 +02:00
Eduardo Quezada
73a13e5dd4 Some review changes 2024-05-18 10:40:09 -04:00
Eduardo Quezada
569749f9c2 Merge remote-tracking branch '_merrp_origin/followers-expanded-id' into _RHH/pr/upcoming/merrpFollowers 
# Conflicts:
#	Makefile
#	gflib/sprite.h
#	graphics/object_events/pics/pokemon/wailord.png
#	include/constants/event_objects.h
#	include/random.h
#	src/data/object_events/object_event_graphics.h
#	src/data/object_events/object_event_graphics_info.h
#	src/data/object_events/object_event_graphics_info_pointers.h
#	src/event_object_movement.c
#	src/random.c
#	src/scrcmd.c
 2024-05-18 10:12:17 -04:00
Ariel A
d3849f2fc6 Merge branch 'followers' into followers-expanded-id 2024-05-17 20:46:24 -04:00
Ariel A
6856bcf610 refactor: code review for expansion 2024-05-17 20:45:32 -04:00
Eduardo Quezada
dca0305ac8 FLAG_TEMP_HIDE_FOLLOWER is now an alias for FLAG_TEMP_E 2024-05-17 11:24:05 -04:00
Alex
635db6312c
AI respects partner when using spread moves in double battles (#4518) 
* Fixes Earthquake AI in double battles

* earthquake_ai_fix

* Use CompareDamagingMoves to fix spread damage issue
 2024-05-17 00:41:55 +02:00
Eduardo Quezada
6eba5bcb80 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-05-16 17:31:46 -04:00
Alex
faf61e62fb
Adds move Spicy Extract (#4211) 
* Adds move Spicy Extract

* remove uneeded line

* anim, new tests, acc change

* Clear Amulet, Contrary interaction

* ai

* correction

* simplify script a bit

* clean up

* Spicy Extract script overhaul

* merge rhh/upcoming

* alignment

* AI changes/additions

* add Foul Play check

* Remove useless ai checks

* remove wrong test

* review issues
 2024-05-16 11:03:50 +02:00
Eduardo Quezada
ab682ce900 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/data/items.h
#	src/pokemon_summary_screen.c
 2024-05-15 09:58:21 -04:00
Eduardo Quezada
ac16a52918
Revert "Guillotine: Decapitalize everything (#3949)" (#4525) 
This reverts commit e2d70d440e, reversing
changes made to 0d2b400953.

# Conflicts:
#	gflib/text.c
#	include/config/decap.h
#	src/battle_message.c
#	src/item.c
 2024-05-13 19:19:37 +02:00
Eduardo Quezada
3219a48adf Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
 2024-05-13 11:00:12 -04:00
Alex
56cee80fbf
Explosion and Mind Blown / Steel Beam refactor (CFRU port) (#4516) 
* Explosion and Mind Blown / Steel Beam refactor (CFRU port)

* forgot ndebug

* Restored EFFECT_MIND_BLOWN

* requested changes

---------

Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-05-12 11:41:18 -04:00
sneed
a8bb82778a
Remove and replace MOVE_EFFECT_SP_ATK_TWO_DOWN (#4557) 2024-05-12 15:07:43 +02:00
Eduardo Quezada
be37820bd9 Merge branch '_RHH/master' into _RHH/upcoming 
# Conflicts:
#	src/battle_script_commands.c
 2024-05-11 19:53:19 -04:00
Abbie Potter
da3d715f3b
Punchier tera animation (#4507) 
* Punchier tera animation

* Removed testing comments

* Replaced VARIOUS_APPLY_TERASTALLIZATION with callnative

* Remove redundant arg from applyterastallization
 2024-05-07 07:59:52 -04:00
BlueAnthem37510
2d7c79e860
Gulp missile not triggering on faint fix and added form change type (#4502) 
* Cramorant faint fix and add form change type

* Fixed formatting, renamed form change type, changed various to callnative

* Fix oops broke everything except gulp missile

* Improved condition order

* remove extra line

* whitespace and alignment

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

* whitespace and alignment

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

* whitespace and alignment

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

* whitespace and alignment

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

* whitespace and alignment

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

* whitespace and alignment

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

* Added requested changes

---------

Co-authored-by: BlueAnthem37510 <a@a.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
 2024-05-07 06:44:17 -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
1ceae6e100 Merge branch '_RHH/master' into _RHH/upcoming 2024-05-06 15:29:21 -04:00
Eduardo Quezada
eca47fe209 Non-tagged release 2024-05-06 14:51:48 -04:00