13536 Commits

Author SHA1 Message Date
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
Ariel A
ed98b0b8ba fix: added shadows on direct corner map
Fixed #18
2024-05-21 22:12:03 -04: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
Alex
973146c725
BS_SetGlaiveRush formatting (#4610)
Please merge my OCD induced change.
2024-05-22 00:55:20 +02:00
sneed
7b8348773b
Triple kick calcs use strikeCount (#4608) 2024-05-21 16:45:32 -04:00
Eduardo Quezada
05e58c70e6 Improved GetTypeEffectiveness check 2024-05-21 15:19:39 -04:00
Jaizu
689f41803d fix uppercase typo 2024-05-21 09:46:27 +02:00
moostoet
85ca0645a9
Add configuration to prevent permanent item theft (Covet / Thief) from NPCs (#4605)
* feat: implement logic for gen5+ covet/thief

* refactor: add define, misc. changes

* fix: define parenthesises

* fix: revert to bool32

* fix: formatting
2024-05-20 22:52:12 +02:00
cawtds
b73e33618d
Fix status curing of full restore when used on party member (#4603)
* fix getboxmondata for evolutiontracker if compiled with agbcc

* fixed full restore curing status condition when used in battle on party member with missing hp
added more full restore tests

* formatting, removed unused
2024-05-20 00:25:03 +02:00
Bassoonian
bc9f09744d
Egg Move Refactor (#4534)
* Egg Move Refactor

* Update python file and fix formatting
2024-05-19 13:47:15 +02:00
Jaizu
2358ee88e3 Fix virtual object events 2024-05-19 12:41:51 +02:00
sneed
334668be26
Restore sassy nature effect (#4598) 2024-05-19 11:43:28 +02: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
kittenchilly
b7fc2b447a
Add Stellar Tera Shard sprite (#4595)
* Add Stellar Tera Shard sprite

* Update items.h
2024-05-18 22:20:47 +02:00
Bassoonian
d811cd1c4c
Add egg cycle length config (#4596) 2024-05-18 14:59:32 -04:00
Eduardo Quezada
9dab5d5377 Add more type immunities for followers 2024-05-18 14:55:57 -04:00
Eduardo Quezada
a6bfcc1194 More style fixes 2024-05-18 14:36:06 -04:00
hedara90
4ccfd5355d
Fixed Elixir only being useable if the first move was missing PP (#4594)
* Fixed Elixir only being useable is the first move was missing PP

* Update restore_pp.c

Commented out the test that doesn't actually test what it's supposed to due to current test system.

---------

Co-authored-by: Hedara <hedara90@gmail.com>
2024-05-18 19:55:31 +02:00
Eduardo Quezada
06094a2137 More style fixes. 2024-05-18 11:39:46 -04:00
Cafei
a28ee83b06
sawsbuck sprites (#4592) 2024-05-18 17:07:27 +02:00
Alex
1d83ce430c
Follow up to #4579: wrong naming (#4591) 2024-05-18 17:05:25 +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
sneed
982934c4aa
Pokedex Plus fixes (#4514)
* Pokedex plus no longer allows browsing unseen evos

* Restore "has no evolutions" printing

* only print "has no evolution" text at 0 depth

* Revert config changes

* fix duplicate icons and removed eevee hardcodes

* add new scope and indentation fixes

* actually introduce new scope
2024-05-18 10:53:01 +02:00
kittenchilly
4b221b5802
Get rid of gItemIconTable (#4579)
* Get rid of gItemIconTable

* Move the script to the folder
2024-05-18 10:22:26 +02:00
Ariel A
73978b7015 Merge branch 'lighting' into lighting-expanded-id 2024-05-17 21:45:50 -04:00
Ariel A
991b104d52 Merge branch 'followers-expanded-id' into lighting-expanded-id 2024-05-17 21:45:44 -04:00
Ariel A
05bf03975a Merge branch 'followers' into lighting 2024-05-17 21:40:20 -04:00
Ariel A
d785fad8cf refactor: code review for expansion 2024-05-17 21:37:18 -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
24913f5339 TEMPORARY: Reverted Gen 4-8 followers 2024-05-17 14:40:45 -04:00
kittenchilly
b4ece97d42
Fix held items in the PC sometimes using the shorter font when unneccesary (#4588) 2024-05-17 00:42:48 +02: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
ghoulslash
dd3de40f4d
AI_CalcPartyMonDamage set saved flag for SetBattlerData (#4586)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-05-17 00:40:38 +02:00
Eduardo Quezada
d5268b9f01 Final cleanup 2024-05-16 18:08:10 -04:00
Eduardo Quezada
6eba5bcb80 Merge branch '_RHH/upcoming' into _RHH/pr/upcoming/merrpFollowers 2024-05-16 17:31:46 -04:00
cawtds
6f12da0a67
Fix special evolution triggering twice in certain situations (#4553) 2024-05-16 13:45:08 -07: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
Bassoonian
7d84cd62ef
Add on release item config (#4577) 2024-05-15 23:46:25 +02:00
Bassoonian
d235a716fe
Add missing EOF newlines to species_info files (#4584) 2024-05-15 21:11:30 +02:00
ghoulslash
9c6dfb7c0c
Move RestoreBattlerData out of Ai_CalcDmg and add SaveBattlerData Protections (#4156)
* move restorebattlerdata out of Ai_CalcDmg

* fix SetBattlerdata calls

* add saved field to struct AI_SavedBattleMon to prevent overwriting saved mon info

* AI_CalcPartyMonDamage set opposing battler known data

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-05-15 20:39:03 +02:00
sneed
00fc5b94f2
Various AI switching logic fixes Part 2 (#4572)
* AI can calc hail and sandstorm damage again

* reverse weatherImpact hp calculation sign

* add missing toxic damage calculation
2024-05-15 17:51:47 +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
Bassoonian
bbb6ade9e8
Fix debug ability u8 (#4576) 2024-05-15 11:56:58 +02:00
TheLastMudkip
d591f25829
Update Avalanche to be Single Target (#4581)
Avalanche is a single target move in doubles.
Currently it is bugged to be a spread move this change corrects that.

Source:
https://bulbapedia.bulbagarden.net/wiki/Avalanche_(move)
2024-05-15 08:51:59 +02:00
kittenchilly
35362fbd24
Update various sprites to ones from PokeCommunity (#4554)
* Updated battle sprites

* Update icon sprites

* Revert appletun change
2024-05-14 18:28:50 +02:00
Bassoonian
2e7c32019f
Update items.h (#4574) 2024-05-14 17:36:12 +02:00
Alex
7fefe757b8
Adds AI_GetBattlerAbility (#4555)
* Adds AI_GetBattlerAbility

* Update src/battle_ai_util.c

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

---------

Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
2024-05-14 16:16:20 +02:00