Alex
57ec87387d
Fixes freeze on Galvanize Explosion against Volt Absorb ( #4601 )
2024-05-19 21:29:54 +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
ef03daf6d4
Fix Pokeblock script missing a releaseall
2024-05-19 12:52:04 +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
Pawkkie
35e90b896d
Adjust description of FREE_MATCH_CALL ( #4590 )
...
* Adjust description of FREE_MATCH_CALL
* Shorten comment
2024-05-19 10:13:14 +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
9dd0395852
Moved follower scripts to new folder
2024-05-18 10:47:56 -04: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
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
ddd92b9672
Removed unused garbage
2024-05-17 14:41:14 -04:00
Eduardo Quezada
24913f5339
TEMPORARY: Reverted Gen 4-8 followers
2024-05-17 14:40:45 -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
Eduardo Quezada
6b641beb83
Restore padding to ROM
2024-05-17 11:23:44 -04:00
Eduardo Quezada
3160cbb97d
Removed usages of DEBUG define
2024-05-17 11:23:31 -04:00
Eduardo Quezada
47e8851b07
Fix code style (pt 1)
2024-05-17 11:23:01 -04:00
Eduardo Quezada
f6b38ec582
Restore check_history.sh permissions
2024-05-17 11:22:33 -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
5b734d420b
End of line
2024-05-16 17:32:02 -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
Eduardo Quezada
3a1b4951c6
Added missing Move Effect TODO tests - Volume A ( #4569 )
...
* Added missing TODO tests - Volume A
* Update test/battle/move_effect/autotomize.c
---------
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-05-15 20:48:10 +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
Isaac Rivera
e5b33a0434
Add check for Magic Guard to avoid taking recoil damage ( #4578 )
...
* Add check for Magic Guard to avoid taking recoil damage
* add test to verify a mon with magic guard does not take recoil damage
followed format from "Steel Beam hp loss is prevented by Magic Guard" test
* update format of tests with magic guard and some form of recoil damage
2024-05-15 15:40:40 +02: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
Isaac Rivera
08bdc85359
Adds tests to verify Parental Bond doesn't affect EFFECT_MULTI_HIT moves ( #4573 )
...
* Adds tests to verify that Parental Bond does not affect moves with EFFECT_MULTI_HIT
* actually make kanga mega evolve in tests
* add celebrate for opponent and "not animation" on 5th hit
* update test strings
2024-05-14 17:28:14 +02:00
