Commit graph

15474 commits

Author SHA1 Message Date
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
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
sneed
d71d5f7f1e
fix incorrect usage of ANIM_PLAYER_LEFT and _RIGHT (#4560) 2024-05-14 13:44:46 +02:00
PhallenTree
5cc7330f33
Fixes cries in move animations ignoring Illusion (#4564)
* Fixes cries in move animations not taking into account the ability Illusion

* Fixes cry for Link Battles
2024-05-14 13:34:36 +02:00
Isaac Rivera
dd6e91eaf7
Add check for MULTI_HIT moves in IsMoveAffectedByParentalBond (#4570) 2024-05-14 13:32:44 +02:00
TheJamesLJ
9cd3fbb232
Opponents Shaymin Sky form correctly reverts on frozen status (#4559)
* Fixed Shaymin form change with incorrect status condition

* Fixed Shaymin receiving damage again after changing form

* PR feedback updates - fixed missing commas in battle script

* Added Shaymin form change test by @AlexOn1ine
2024-05-14 13:28:10 +02:00
sneed
23b8804790
Various AI switching logic fixes (#4571) 2024-05-14 13:09:26 +02:00
Jaizu
411d7e6177 Make AdjustFriendship more readable 2024-05-14 12:48:20 +02:00
Bassoonian
cd1f4a8e94
Fixed C0ntest (#4563) 2024-05-13 14:04:41 -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
0f5297423f Fixed Knock Off upcoming test 2024-05-13 11:25:49 -04:00
Eduardo Quezada
d4eb94db92 Fixed master test move name 2024-05-13 11:25:23 -04: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
hedara90
ebdc9ffc39
Fixed some moves' on-hit effects bypassing Substitutes where they shouldn't and some other things discovered along the way (#4558)
* Fixed some moves' on-hit effects bypassing Substitutes where they shouldn't.
Fixed Sparkling Aria interaction with Shield Dust in Singles vs Doubles.
Fixed Wake-Up Slap and Smelling Salts getting boosted damage where they shouldn't vs Substitutes.

* Cleaned up check for Sparkling Aria+Shield Dust interaction and fixed for agbcc.
Fixed logic for checking if moves should do extra damage on statused targets.
Wrote tests for Wake-Up Slap and Smelling Salts receicing extra damage on statused targets.
Wrote tests to check Thousand Arrows type effectiveness vs ungrounded Flying types.

* Update src/battle_util.c

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

* Update src/battle_script_commands.c

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

* Update src/battle_script_commands.c

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

* Update test/battle/ability/shield_dust.c

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

* Update test/battle/item_effect/covert_cloak.c

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

* Update test/battle/item_effect/covert_cloak.c

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

* Update test/battle/item_effect/covert_cloak.c

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

* Update test/battle/move_effect/smelling_salts.c

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

* Update test/battle/move_effect/thousand_arrows.c

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

* Update test/battle/move_effect/wake_up_slap.c

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

* Update test/battle/move_effect/wake_up_slap.c

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

* Update test/battle/move_effect/wake_up_slap.c

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

---------

Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-05-13 13:33:04 +02:00