Commit graph

16277 commits

Author SHA1 Message Date
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
Eduardo Quezada
3205f377d5 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-21 08:18:44 -03:00
GhoulMage
d11fd21cd6
Changing EVO_NONE from 0xFFFE to 0 (#5547) 2024-10-21 07:33:21 -03:00
Alex
17614f8032
Remove unnecessary gBattlerAttacker usage (#5554) 2024-10-21 07:32:10 -03:00
Eduardo Quezada
59e617b16d
Updated Wring Out effects to match Eruption effects (#5549) 2024-10-20 21:44:28 +02:00
Bassoonian
c237bc2452
Remove now outdated information from readme (#5548) 2024-10-20 11:13:20 -03: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
Bassoonian
601438e980
Centralise AI Tests trainer name (#5532) 2024-10-19 17:51:20 -03:00
Eduardo Quezada
89e8bc5c4c
Add changelog header in PR template to aid automation (#5539)
* Add changelog header in PR template to aid automation

* Bullet points

* Finished the statement
2024-10-19 14:00:04 -03:00
Eduardo Quezada
495de8d182
Fix Follow Me failing in Single Battles for Gen 6/7 config (#5542) 2024-10-19 13:59:49 -03: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
8bb8500456
add curious medicine test (#5540)
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2024-10-19 14:03:57 +02: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
Bassoonian
3690e7247e
Remove agbcc screenshots from gitignore (#5538) 2024-10-18 18:03:40 -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
Eduardo Quezada
f88046b1c3 Re-removed agbcc for new Makefile 2024-10-17 06:26:55 -03:00
Bassoonian
3077592e68
Pret merge 2024-10-15 (#5527) 2024-10-17 09:00:18 +02:00
Eduardo Quezada
bb5aaa4005 Restored Debug build 2024-10-17 00:30:20 -03: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
ghoulslash
29e37a0025
Adds tests and Costar fix from PR #5526 (#5529) 2024-10-16 12:51:32 -04:00
Pawkkie
9882e0aea6
Refactor ShouldSwitchIfAllBadMoves (#5452)
* Refactor ShouldSwitchIfAllBadMoves

* Rest of bugfix

* Enable Shed Tail test

* Revert "Enable Shed Tail test"

This reverts commit e0b9a3affc.

* 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
Eduardo Quezada
20c5df74e4 Updated .gitignore for agbcc screenshot suffix 2024-10-16 09:45:58 -03:00
Eduardo Quezada
d58bbe2a6f Removed all instances of gflib from ld_scripts 2024-10-16 09:44:48 -03: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
Eduardo Quezada
9ed153ff93 Merge branch '_RHH/master' into _RHH/pr/master/pretSync20241015 2024-10-15 22:22:52 -03:00
Eduardo Quezada
80447bee8e Merge branch '_pret/master' into _RHH/pr/master/pretSync20241015 2024-10-15 20:56:56 -03:00
Alex
ed65c4a2f7
Fixes Partner targeting and Acupressure/Ally Switch interaction (#5446)
* Fixes Partner targeting and Acupressure/Ally Switch interaction

* More tests

* Update test/battle/move.c
2024-10-15 17:04:35 -04:00
Bassoonian
b9ac5d1d8a
Add newline to move relearner string (#5523) 2024-10-15 21:58:58 +02:00
luckytyphlosion
a55c75d350
Get rid of common syms (#2040) 2024-10-14 23:52:11 -04:00
mid-kid
253d3dd7ef
Remove unnecessary looping for rule generation and unroll macros (#2046) 2024-10-14 23:47:07 -04:00
hedara90
a5d3a7c9d5
2024-10-13 master to upcoming (#5519) 2024-10-13 21:30:02 +02:00
Hedara
1b3de8a7d6 Merge branch 'master' into 2024-10-13-masterToUpcoming 2024-10-13 20:28:47 +02:00
aronson
b91656d1c3
Update test LD script to respect 4 byte data section alignment (#5517) 2024-10-13 07:31:31 +01:00
GriffinR
a0be2cbf7b Fix Fallorbor typo 2024-10-12 23:50:12 -04:00
Eduardo Quezada
0a4b3a8dd7 Merge branch '_RHH/master' into _RHH/upcoming 2024-10-12 16:23:27 -03:00
aronson
a01f9b4708
Align EWRAM and IWRAM data-filled sections to 4 bytes (#5512) 2024-10-12 19:41:26 +01:00
psf
c82ff7b5b1
Merrp merge (12th of October) (#5514)
Co-authored-by: Ariel A <24759293+aarant@users.noreply.github.com>
Fixes #5482
2024-10-12 10:50:31 -07:00
kittenchilly
743dc4d765
Add text fitting tests for move, ability, item, and pokedex descriptions (#5505) 2024-10-12 19:37:11 +02:00
Bassoonian
eedeaf1ead
Clean up scrcmd PR (#5511)
Renamed CheckPartyHasSpecie to CheckPartyHasSpecies and cleaned up function calls
2024-10-12 10:34:05 -07:00
Bassoonian
8dba27249c Merge branch 'followers-expanded-id' of https://github.com/aarant/pokeemerald into merrpmerge1210 2024-10-12 18:41:33 +02:00
Ariel A
e10005010e Merge branch 'followers' into followers-expanded-id 2024-10-12 12:27:05 -04:00
Ariel A
d80190fe10 fix: Dig in Sealed Chamber no longer freezes follower. Fixed #5482 rhh 2024-10-12 12:23:18 -04:00
Ariel A
ef462d9d9b meta: remote_build no longer untracks new files after build 2024-10-12 12:19:42 -04:00
ghoulslash
f810d7d0c0
Adds new scripting macros to increase developer quality of life (#5177) 2024-10-11 21:08:41 -04:00