Pawkkie
79776bf6bb
ShouldSwitchIfWonderGuard tests and cleanup ( #5383 )
2024-09-14 10:45:26 +02:00
Alex
fbea1e7e7e
Fixes Defog used by the wrong side when there is a Substitue and Screen ( #5381 )
2024-09-14 08:16:20 +02:00
GriffinR
302193a814
Have scaninc ignore non-existing files
2024-09-14 00:28:57 -04:00
GriffinR
b8c71fa84d
Fix .d files not updating if .o fails, fix clean rule, remove some unnecessary warnings
2024-09-13 23:38:50 -04:00
Eduardo Quezada
5954d662a5
Rebuild of makefile 7: Test Runner
2024-09-13 15:26:42 -03:00
Eduardo Quezada
bee1452c8e
Rebuild of makefile 6: File-specific stuff
2024-09-13 14:38:43 -03:00
Eduardo Quezada
5ea1f39a9d
Rebuild of makefile 5: trainerproc
2024-09-13 14:27:40 -03:00
PhallenTree
c7e1e857f3
Fix After You/Shell Trap not updating battlers' actions correctly ( #5384 )
2024-09-13 18:17:59 +02:00
PhallenTree
100c7dd8ad
Fixes Powder (status) interactions + tests ( #5370 )
...
* Simplified fix from #4638
* Fixes interactions with Z-Moves, Magic Guard, Heavy Rain, Pledge
* Powder Tests
* Remove duplicate
* Assume Powder is a powder move
* Add config for Powder Rain interaction
* Only primal rain
* Z-Moves fix handled in Canceller_Z_Moves
* Fix BattleScript name
* Make sure Z-Move + Powder still damages user
2024-09-13 18:08:23 +02:00
hedara90
9633cefd11
Custom anim table follower macro & Farfetch'd example ( #5309 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-13 10:30:01 -03:00
Eduardo Quezada
8c0580828f
Apply suggestions from code review
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2024-09-13 09:27:16 -03:00
pkmnsnfrn
510af1bee6
Restored original functions and made script versions
2024-09-12 20:55:37 -07:00
pkmnsnfrn
ecd435cd84
Changed CheckChosenMOnMatchDesiredSpecies and CheckPartyHasSpecies to callnative
2024-09-12 20:45:14 -07:00
pkmnsnfrn
c2db77c4f6
Changed Script_GetSetPokedexFlag to callnative
2024-09-12 20:15:55 -07:00
pkmnsnfrn
be7938f322
Changed CheckObjectAtXY to callnative
2024-09-12 18:55:11 -07:00
pkmnsnfrn
10bb349b8c
Changed GetObjectPosition to callnative
2024-09-12 18:41:42 -07:00
pkmnsnfrn
22b0fdf5c3
Removed checkspecies_auto and made that the default behavior
2024-09-12 18:18:41 -07:00
Alex
3d8b73300a
Fixes Multi Hit moves removing destiny bond flag in the middle of attack ( #5377 )
2024-09-12 17:46:59 -04:00
psf
1ba8e7d300
Merge branch 'upcoming' into signpost
2024-09-12 14:45:37 -07:00
psf
51a69b6a9d
Merge branch 'upcoming' into stairWarps
2024-09-12 14:43:46 -07:00
GriffinR
7007439be8
Remove old ld_script processing
2024-09-12 13:50:47 -04:00
Pawkkie
9bdc9e5dab
Disguise KO prevention consideration ( #5375 )
2024-09-12 19:49:29 +02:00
Liamjd14
5d8c61d813
Pokemon follower changes for issue #5135 ( #5336 )
2024-09-12 18:55:30 +02:00
GriffinR
d9b824db3f
Sync missing alignment from pokefirered
2024-09-12 12:27:31 -04:00
Alex
c804e605d8
Adds CanEndureHit AI function ( #5373 )
...
* Adds CanEndureHit AI function
* use ai data
* missed a function
2024-09-12 11:40:17 -04:00
GriffinR
9e22bf1af4
Merge pull request #1957 from Icedude907/build-music-config
...
[Build System Rewrite] Improved audio rules
2024-09-12 10:46:30 -04:00
GriffinR
51131e2582
Merge pull request #1954 from Icedude907/build-scaninc-speed
...
[Build System Rewrite] Massive build speed improvement via scaninc changes
2024-09-12 10:45:41 -04:00
Alex
2f4dc1996c
Some Strings were switched ( #5374 )
2024-09-12 15:05:29 +02:00
pkmnsnfrn
979c9994f7
Set VAR_RESULT to the number of removed items from removeallitem per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531
2024-09-12 05:47:12 -07:00
pkmnsnfrn
f87440a25a
Removed setmonball per https://github.com/rh-hideout/pokeemerald-expansion/pull/5177\#issuecomment-2294980531
2024-09-12 05:43:55 -07:00
pkmnsnfrn
a0e914b749
Merge branch 'upcoming' into scriptCommands
2024-09-12 05:39:24 -07:00
Pawkkie
e13f399a67
Switch AI hitsToKO considers one shot prevention ( #5371 )
...
* One shot prevention effects
* I'm bad at brackets
2024-09-12 10:13:08 +02:00
Eduardo Quezada
5790200e2d
Rebuild of makefile 4: Teachable learnset helper
2024-09-11 20:05:18 -03:00
Eduardo Quezada
5f8c915826
Rebuild of makefile 3: ANALYZE
2024-09-11 19:40:52 -03:00
Eduardo Quezada
83872ab89f
Rebuild of makefile 2: -Wall and UNUSED_ERROR
2024-09-11 19:31:40 -03:00
Eduardo Quezada
20e937a724
Rebuild of makefile 1: Modern as default
2024-09-11 16:33:11 -03:00
Eduardo Quezada
831b394ca1
Merge branch '_pret/master' into _RHH/pr/master/pretSync20240909
...
# Conflicts:
# Makefile
# include/battle.h
# include/battle_main.h
# include/battle_util.h
# include/data.h
# make_tools.mk
# map_data_rules.mk
# src/battle_setup.c
# src/fieldmap.c
2024-09-11 15:26:14 -03:00
Eduardo Quezada
551c558186
Merge branch '_RHH/master' into _RHH/upcoming
2024-09-11 07:28:02 -03:00
Eduardo Quezada
cdf781f726
Fixed Toxic Thread stat increase ( #5369 )
2024-09-11 11:18:58 +02:00
Skye Chappelle
a75be4124d
Update pull_request_template.md to include Discord username update
2024-09-10 23:39:41 -04:00
Skye Chappelle
28786b42a6
Update INSTALL.md to state that Windows 8 is no longer supported by Microsoft
2024-09-10 23:36:13 -04:00
Pawkkie
047289a639
Improve AI's Skill Swap handling in double battles ( #5360 )
...
* Improve AI contrary
* Update src/battle_ai_util.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
* Fix additionalEffects loop
* moves[i] to aiMove
* Update src/battle_ai_util.c
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
---------
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-09-11 00:00:29 +02:00
hedara90
c57d149003
Fixes with Pledge combos and absorption abilities ( #5364 )
...
* Fixes with Pledge combos and absorption moves
* Fixed incorrect merge
* Removed superflous if statement
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-10 23:53:55 +02:00
Pawkkie
3aa46c3ca0
Fix stat id check ( #5366 )
2024-09-10 23:52:49 +02:00
Rachel
b478881fc6
Add in-battle shadows underneath all enemy battlers ( #5178 )
...
* Add data to SpeciesInfo entries for in-battle shadows
* Implement sized shadows in the sprite visualizer
* Implement sized shadows in game code
* Show shadows for the lead battler for opponents during their battle anim
* Feedback on shadows, round 1
* Revert removal of Goomy and Sliggoo shadows
* Fixed GEN_3 setting
* Code cleanup + remove pre-processor branches
* Fix bugs with gen-3 configuration branch
* Style corrections, final shadow coordinate adjustments
* Adjustments to Garbodor and Araquanid
2024-09-10 21:27:49 +02:00
psf
2477f1d5ca
Made BuildColorMaps redundant by using static tables ( #5289 )
...
* Added config for ColorMaps
* Fixed delclartion of static maps
* First commit complete
* Removed config
* Removed config
* fixed overworld config per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#discussion_r1747583812
* Fixed pointer alignment per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289\#pullrequestreview-2286973040
* Update overworld.h
Removed new lines per https://github.com/rh-hideout/pokeemerald-expansion/pull/5289/files#r1749325673
2024-09-10 14:44:08 +02:00
Pawkkie
6f922df7ef
Frostbite score fixes ( #5362 )
2024-09-10 12:58:30 +02:00
ghoulslash
2b20e6cae1
reset item flags on new game ( #5363 )
...
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-09-10 08:33:59 +02:00
hedara90
36ff435ab6
Liam follower fixes ( #5334 )
...
* Fix Blinking on Meganium South Sprite
* Fixes Lediba and Ledian Blinking
* Fixes two blinking spots on spinerak
* Crobat Eye and Igglibuff butt vlinking fix
* More blinking follower fixes
flaaffy
xatu
hoppip line
* Blinking Gen 2 Fixes
Mantine
Miltank
Raikou
yanma
wooper
skarmory
* Gen 4 Fixes + donphan and espeon
prinplup
starraptor
shieldon
roserade
ambipom
mamoswine
Stunky
Donphan - gen 2 fix
Espion - noticed a flickering pixel on south walk
* Synchronization with Cafeei
* Messed up the merge, fixing now
* Added mantine
---------
Co-authored-by: Liamjd14 <Liamjdgaming@gmail.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2024-09-09 21:03:52 +02:00
Pawkkie
4c49dfdd1d
AI burn score fixes and improvements ( #5356 )
...
* Burn score fixes
* Remove CanTargetFaintAi check
2024-09-09 21:03:24 +02:00