Commit graph

9137 commits

Author SHA1 Message Date
Eduardo Quezada
ca1d9f5393 Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
#	include/battle_util.h
2023-06-21 15:01:14 -04:00
ghoulslash
7371a9e401
Add many gen 8 move animations (#2861)
* port many gen8 and 9 move anims from cfru

* fix thunder cage, shell smash, shelter anims. update anim credits

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-06-21 13:19:54 -04:00
voloved
c911d4bf57
Made window's starting location track with ball; made window show if it's showing on startup (#3042) 2023-06-21 13:19:08 -04:00
Pawkkie
62ae3b1df1
Fix bug due to variable overflow when AI chooses new Pokemon to send out (#3068) 2023-06-21 12:59:30 -04:00
Alex
43821d606f
Fix Baton Pass for when Ace mon is the last alive (#3067)
* Updated preproc config for Diamond Storm

* Fix baton pass bug with IsAceMon

remove not needed check

---------

Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
2023-06-21 11:11:06 -04:00
Eduardo Quezada
6342da3b58 Merge remote-tracking branch 'RHH_origin/master' into RHH/upcoming 2023-06-20 15:41:30 -04:00
Eduardo Quezada D'Ottone
186d8763ea
Fixed selling TMs set as reusable (#3049) 2023-06-19 16:19:29 -04:00
Eduardo Quezada D'Ottone
b01f7927cf
Fixed Sylveon's evolution method (#3048) 2023-06-19 16:17:51 -04:00
Eduardo Quezada D'Ottone
5128520291
Fixes Hisuian mon not evolving + Fixed regional mon not breeding correctly (#3047) 2023-06-19 16:16:55 -04:00
Eduardo Quezada D'Ottone
0d86ab0945
Gen. 9 Move Effects, 2nd batch (#2870) 2023-06-19 14:00:03 -04:00
LOuroboros
2bf88502a7 More corrections 2023-06-19 04:18:53 -03:00
LOuroboros
48c04f936a Split Refresh's and Take Heart's effects in AI_CheckViability 2023-06-19 00:08:59 -03:00
Eduardo Quezada
1c829c0dcd Merge branch 'RHH/master' into RHH/upcoming 2023-06-17 17:49:15 -04:00
LOuroboros
9984a9e096
Update src/data/battle_moves.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2023-06-15 09:59:25 -03:00
LOuroboros
9896f20eb8 Applied fixes and corrections (Jun 2023) 2023-06-15 09:22:26 -03:00
LOuroboros
eb26039f33 Adjusted Triple Arrows' checks 2023-06-13 06:03:37 -03:00
LOuroboros
313f522622 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into gen_9_move_effects_batch2 2023-06-13 05:44:37 -03:00
LOuroboros
8efbe825db Updated preproc config for Diamond Storm 2023-06-09 14:32:10 -07:00
Eduardo Quezada
601a96f34a Fixes Hisuian mon not evolving + fixed regional mon not breeding correctly 2023-06-06 08:01:29 -04:00
AgustinGDLV
1ea23daefe fixed bug with zeroing out abilities on switch-in 2023-06-03 11:58:57 -07:00
AgustinGDLV
53fa7e524c allow for illegal abilities within tests 2023-06-03 11:32:54 -07:00
Eduardo Quezada
43da48f992 CpuFastFill for initializing, thanks SBird 2023-06-02 12:22:05 -04:00
Eduardo Quezada
271bca6a3d Fixed Staraptor using Staravia's footprint 2023-06-02 11:56:36 -04:00
Eduardo Quezada
5bf040f38d Missing pret improvement that was causing unmatching 2023-06-02 11:56:12 -04:00
Eduardo Quezada
4c57b84cd9 Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20230602
# Conflicts:
#	graphics/pokemon/mawile/footprint.png
#	src/battle_gfx_sfx_util.c
#	src/fldeff_sweetscent.c
#	src/pokedex.c
2023-06-02 11:45:28 -04:00
GriffinR
23b57050c2 Fix some compressed tilemaps 2023-06-01 15:31:12 -04:00
Martin Griffin
412f6f5352
Separate build directory for tests and TESTING define (#3002)
* Separate build directory for tests and TESTING define

* fixup! Separate build directory for tests and TESTING define

* fixup! Separate build directory for tests and TESTING define

* fixup! Separate build directory for tests and TESTING define
2023-05-31 09:38:37 -04:00
BuffelSaft
2e08277a4e
Fixes Triple Kick effect and Z move damage calc (#2983) 2023-05-31 22:25:16 +12:00
Alex
5a384f9090 Fixes Triple Kick effect and Z move damage calc
minor correction to the z-move fix

Add comment to EFFECT_TRIPLE_KICK
2023-05-29 15:28:40 +02:00
GriffinR
5100eef017
Merge pull request #1890 from GriffinRichards/pal-macro
Add some missing palette macro use
2023-05-28 18:28:50 -04:00
ghoulslash
4cef99101b
restore items in wild battles (#3031) 2023-05-28 08:52:58 -04:00
ghoulslash
c38b51c570
Fixed Throat Spray's description (#3027) 2023-05-28 08:52:32 -04:00
Alex
7edd1a45a4 restore items in wild battles 2023-05-28 11:31:22 +02:00
GriffinR
890d00471a
Merge pull request #1886 from GriffinRichards/1bpp
Index footprint images, convert Spinda spots to .png files
2023-05-27 21:58:45 -04:00
Eduardo Quezada D'Ottone
d0e6ea7612
Optimized battle gender checks (#3020)
* Optimized battle gender checks

* Apply suggestions from code review

Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>

---------

Co-authored-by: AgustinGDLV <103095241+AgustinGDLV@users.noreply.github.com>
2023-05-27 17:23:02 -04:00
Eduardo Quezada D'Ottone
c3527dc01e
Fixed Throat Spray's description 2023-05-26 09:24:23 -04:00
Eduardo Quezada
05895c5308 Fixed Frostbite icon appearing in AI Pary menu for mon without ailment 2023-05-25 19:02:13 -07:00
GriffinR
14f7e49099 Add some missing palette macro use 2023-05-25 15:09:16 -04:00
Eduardo Quezada
de2d86408f Fixed Mimikyu's Disguise not breaking 2023-05-24 13:20:22 -07:00
Eduardo Quezada D'Ottone
b972199141
Battle Item Refactor Fixes (#3022) 2023-05-23 21:32:57 -04:00
AgustinGDLV
5a8715e608 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into castform_fix 2023-05-23 16:10:44 -07:00
AgustinGDLV
6a92caa9fb removed old B_WEATHER_FORMS use, tests now have assumptions for config 2023-05-23 16:10:26 -07:00
AgustinGDLV
bb10b0d1b0 fixed GetBattlerSide, removed debug script 2023-05-23 15:50:51 -07:00
AgustinGDLV
a9a32651ac fixed player not being able to cancel partner action after item 2023-05-23 15:41:25 -07:00
AgustinGDLV
34382fcece fixed revive in 1v2 battles 2023-05-23 14:19:24 -07:00
AgustinGDLV
d4c7e5e559 changed B_WEATHER_FORM preproc to affect tables instead of function 2023-05-23 14:03:38 -07:00
ghoulslash
0ac203f2e5
Use AI_PARTY->mons in SetBattlerData (#2986) 2023-05-22 12:05:39 -04:00
Alex
2abf1c56f9 Use AI_PARTY->mons in SetBattlerData
Use gBattlerPartyIndexes
2023-05-22 13:49:15 +02:00
SonikkuA-DatH
12022fa0f6
Gen 4-6 Pokemon Back anims (#2954) 2023-05-20 18:56:23 -04:00
Alex
109b4c4f6c
Small clean up: EndTurnTerrain, BattleScript_GrassyTerrainHeals (#3018)
remove leftover
2023-05-20 15:58:55 -04:00