13536 Commits

Author SHA1 Message Date
Eclipse
5b5ecaa6ee
Fixed some gba sprites (#5607) 2024-10-28 09:22:07 -03:00
Alex
e9ab070e7d
Fix damage calc modifiers (#5604)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-27 18:47:02 -03:00
Eduardo Quezada
3442b09852
Renamed folders and symbols to match species defines (#5581) 2024-10-27 20:15:11 +01:00
GhoulMage
6819dd3c37
New AI flag for marking the two last Pokémon as Ace Pokémon. (#5587) 2024-10-27 11:32:45 -04:00
hedara90
c6ccc29c93
Fixed 64px uncompressed followers (#5601)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-27 11:24:40 -03:00
Eduardo Quezada
5d4ab8cc7e Merge branch '_RHH/master' into _RHH/upcoming 2024-10-27 08:02:45 -03:00
kittenchilly
9ec9a9a4f9
More post-#3240 cleanup (#5593) 2024-10-26 19:50:20 -03:00
Alex
ad16fa76f2
Fixes Magic Guard not preventing Salt Cure (#5583) 2024-10-26 10:11:45 +02:00
hedara90
5dcf3e7664
Fixed Shiny Pokemon not being shiny after transforming with a gimmick (#5573)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-25 07:42:06 -05:00
Pawkkie
7413d107ae
Should switch refactor to facilitate switch prediction (#5466)
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
2024-10-25 13:04:42 +02:00
GriffinR
da791cde94 Add TRY_DRAW_SPOT_PIXEL 2024-10-24 12:45:47 -04:00
Eduardo Quezada
afa7ab9b2e Merge branch '_RHH/master' into _RHH/upcoming 2024-10-24 07:47:52 -03:00
Pawkkie
b892ad4da6
Shed Skin chance fix (#5558) 2024-10-24 11:59:49 +02:00
Martin Griffin
2a610443ab
Missing string_util.h include in mini_printf.c 2024-10-23 20:09:29 +01:00
Eduardo Quezada
83439a7f3e
Removed remaining line breaks from #3240 + Prefix wrap fix (#5556) 2024-10-23 10:50:36 +02:00
Pawkkie
03eda5749d
Healer ability tests (#5559) 2024-10-22 19:02:28 +02:00
hedara90
bcfdf41078
Follower female fix (#5475)
Co-authored-by: Hedara <hedara90@gmail.com>
2024-10-22 12:38:06 -03:00
RavePossum
0ad77db4b4
Fix HGSS dex search printing wrong mon after selecting evos (#5552) 2024-10-22 16:28:11 +02:00
RavePossum
afc89f53b0
Fix weather genie move anims and springtide storm targets (#5553) 2024-10-22 16:27:10 +02:00
Martin Griffin
1421ed1b24
Tests: detect task leaks (#5528) 2024-10-22 10:19:00 +02:00
kittenchilly
db24128ee3
Update battle messages to Gen 5+ standards (#3240)
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-21 14:52:45 -03:00
Frank
544b76fbbf Added value for bard sound length 2024-10-21 09:04:42 -04:00
Eduardo Quezada
3205f377d5 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-21 08:18:44 -03:00
Alex
17614f8032
Remove unnecessary gBattlerAttacker usage (#5554) 2024-10-21 07:32:10 -03:00
Ariel A
0f706ac9e0 Merge branch 'followers' into followers-expanded-id 2024-10-21 00:05:26 -04:00
Ariel A
4056804575 feat: improved follower handling during scripted movements 2024-10-20 23:55:05 -04:00
ghoulslash
31fe6387e7 handle some suggestions 2024-10-20 18:50:06 -04:00
ghoulslash
4fc07c4369 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2024-10-20 18:46:54 -04:00
Eduardo Quezada
59e617b16d
Updated Wring Out effects to match Eruption effects (#5549) 2024-10-20 21:44:28 +02:00
Alex
5291117687
Global is used instead of passed var (#5546)
In `AI_CalcDamage` a global was used for the Terastorm check instead of passed var
2024-10-20 14:28:36 +02:00
ghoulslash
d487bd0548
Revival Blessing fixes + Using Lunar Blessing's animation (#5490)
* revival blessing fixes, add anim

* fix lunar blessing anim

* Added support for Revival Blessing in tests

* Added test to confirm absent flag fix

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-10-19 11:34:58 -03:00
RavePossum
85197eda5e
Move Relearner and Renaming From Summary Screen (#5513)
* implement move relearner in summary screen

* implement renaming in summary screen

* Enable summary screen rename and relearn by default

* Store original callback when opening screen to invoke later, hide rename/relearn for mons being moved in PC

* add a config to not restore full PP when relearning from summary screen

* hide summary relearner option if mon has no relearnable moves

* add note not to decap RELEARN string

* re-static function that now no longer needs to be accessible elsewhere

* Fix move relearner not showing up if you first select a mon with no moves

* The great curly brace massacre of 2024 (PR feedback)

* sprinkling in some parentheses

* PR feedback 2 (curly braces & whitespace)
2024-10-19 14:43:05 +02:00
ghoulslash
229525d122 some cleanup 2024-10-18 22:13:49 -04:00
ghoulslash
99c3146288 add mgba error if opening dexnav when DEXNAV_ENABLED if false 2024-10-18 22:02:04 -04:00
ghoulslash
cb9f1f27a7 move dexnav flags, vars to config, add DEXNAV_ENABLED config to add static asserts that flags, vars are setup and dexnav cannot be used/accessed otherwise 2024-10-18 22:00:19 -04:00
ghoulslash
54484593b3 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2024-10-18 21:46:54 -04:00
psf
8d7996dc5b
Added constant to expansion inclusive copyright magic number (#5413)
* Added constant to expansion inclusive copyright magic number

* Fixed open brackets
2024-10-18 18:06:04 -03:00
kittenchilly
04aa5b7c24
Add more later gen fishing mechanics (#5518)
* Add new fishing bite odds and follower boost

* Sticky

* Update item.h

* Update field_player_avatar.c

* Update field_player_avatar.c
2024-10-18 16:45:31 +02:00
Eduardo Quezada
358c0d0699
Added back GBA sprites via config (#5206)
* Add back older sprites

* Graphics config

* Added GBA most graphical data to gSpeciesInfo

* Footprints are now affected by P_GBA_SPECIES_GFX + removed duplicated files

* GBA mon icons

* Split GBA footprints into separate config

* Separated GBA icons into their own config

* Fixed GBA icons depending on P_GBA_SPECIES_GFX instead of P_GBA_ICONS

* Moved GBA sprites to regular folder with prefix

* Renamed configs

* Temporarely disabled shadows when GBA sprites are enabled

* Removed remaining files from pokemon_old folder
2024-10-18 13:37:00 +02:00
Bassoonian
3077592e68
Pret merge 2024-10-15 (#5527) 2024-10-17 09:00:18 +02:00
Eduardo Quezada
ee9c6d4912 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-17 00:16:01 -03:00
Eduardo Quezada
e230f379b3
Fixed 10,000,000 Volt Thunderbolt name (#5533) 2024-10-16 17:46:40 -03:00
Alex
2e7d856ee3
Removes Crit Chance preproc (#5520)
* Removes Crit Chance preproc

* renamed the function wrongly before pushing

* add assumes back where needed

* addresses review comments

* GetHoldEffectCritChanceIncrease

* remove redudant var call

* define for gen1 leek scale

* gen1 adjustments and fix test

* inline leek check

* clean up
2024-10-16 19:01:38 +02:00
Pawkkie
9882e0aea6
Refactor ShouldSwitchIfAllBadMoves (#5452)
* Refactor ShouldSwitchIfAllBadMoves

* Rest of bugfix

* Enable Shed Tail test

* Revert "Enable Shed Tail test"

This reverts commit e0b9a3affcf3c465c8743741e5ca61bde6c8cb18.

* Better names for i, j

* Fix MAX_MON_MOVES that should be MAX_BATTLERS_COUNT

* battlerIndex  / moveIndex  fix

* Update src/battle_controller_player_partner.c

---------

Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2024-10-16 11:22:48 -04:00
ghoulslash
43f184d0a5 Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into rhh/dexnav 2024-10-16 10:26:55 -04:00
Bassoonian
d4387d880c
Replace hardcoded flute check with consumability check (#5508) 2024-10-16 12:07:34 +02:00
AlexOn1ine
d044f53c72 Adds tests and Costar fix from PR #5526 2024-10-16 10:51:41 +02:00
ghoulslash
1cdc91ce53
Add Costar Tests, Download Test for Doubles (#5526)
* add download double battle test

* fix costar and add test

---------

Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-16 10:44:01 +02:00
GriffinR
0eb6d1d74c Merge branch 'porymap-6' of https://github.com/pret/pokeemerald into generate-map-constants 2024-10-15 22:04:45 -04:00
GriffinR
da9c0239d9 Merge branch 'master' of https://github.com/pret/pokeemerald into porymap-6 2024-10-15 22:02:40 -04:00