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 e2d70d440e6217ed8d16663010ea2678846c4e14, reversing
changes made to 0d2b40095377e51576dcc8931c1d87066b039c31.
# 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
Eduardo Quezada
7e43916e57
Version 1.8.3 ( #4499 )
...
* Moved changelogs to folders by minor version
* Version 1.8.3
2024-05-06 14:44:37 -04:00
Eduardo Quezada
d5a72ec685
Merge branch '_RHH/master' into _RHH/upcoming
2024-05-05 19:50:12 -04:00
PhallenTree
f07ef07855
Fixes various abilities' switch-in messages ( #4500 )
...
* Fixes Costar, Zero to Hero, Supreme Overlord and Ruin abilities' switch-in messages
* Fixed typo in Supreme Overlord's String Id
* Fixes spacing in battle_string_ids.h
2024-05-05 14:25:40 +02: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
dd098baf77
Official GF names by default ( #4241 )
2024-04-25 14:23:08 -04:00
Martin Griffin
073f12be18
Expanded type names
2024-04-25 18:40:38 +01:00
Martin Griffin
06d817bd1b
Expanded species names
2024-04-25 18:40:37 +01:00
Martin Griffin
2ec35549a5
VANILLA_POKEMON_NAME_LENGTH
2024-04-25 18:40:37 +01:00
Martin Griffin
484e288cad
Expanded item names
2024-04-25 18:40:37 +01:00
Martin Griffin
a1d2460372
Enable GF move names by default
...
In contests, even FONT_NARROWER isn't sufficient to prevent clipping in
all cases. e.g. Stomping Tantrum clips. We have decided to accept that
cost to make the rest of the user experience better, but downstream
projects that don't like that trade-off can either a) alter the contest
UI, or b) set B_EXPANDED_MOVE_NAMES to FALSE.
2024-04-25 18:40:37 +01:00
