Commit Graph

11424 Commits

Author SHA1 Message Date
Ct11217
bb978764f3 Fixed recommended changes
Added additional double battle logic for yawn
2022-08-13 00:39:44 -06:00
GriffinR
5515e328b2 Clean up lock/unlock anim movement 2022-08-12 21:18:10 -04:00
Ct11217
7378d1099b Removed AI_GetAbility
Misc cleanup
2022-08-12 15:21:25 -06:00
AgustinGDLV
a5e742afcd implemented review changes 2022-08-12 12:00:05 -07:00
GriffinR
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen
Clean up naming screen graphics
2022-08-12 11:05:55 -04:00
GriffinR
574cf1ddb9
Merge pull request #1725 from GriffinRichards/security-signature
Sector security -> signature
2022-08-12 10:47:10 -04:00
Ct11217
b95e450cb6 Added corner case logic for AI Switching.
1. Refactor Perish Song
2. Yawn
3. Secondary Damage (Leech Seed, Cursed etc).
4. Added Preliminary logic to help AI be smarter against semi-invulnerable

Added AI logic regarding abilities that benefit from switching
1. Natural Cure
2. Regenerator
2022-08-11 22:48:36 -06:00
GriffinR
cf4d05e9e7 Fix typo 2022-08-11 12:09:38 -04:00
GriffinR
63468f9fcb Add some missing battle arena constants 2022-08-11 12:02:56 -04:00
Eduardo Quezada D'Ottone
3d94ada041
Merge pull request #2166 from Sneed69/fix_tm_compat
Fix tm/hm compatibility
2022-08-11 10:07:03 -04:00
GriffinR
286a99eb1d
Merge pull request #1723 from GriffinRichards/fix-impassable
MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes
2022-08-10 21:28:14 -04:00
GriffinR
e814fe0224
Merge pull request #1734 from WhenGryphonsFly/clean__battledomebugfix
Fix BUGFIX return statement in battle_dome.c
2022-08-10 21:21:54 -04:00
WhenGryphonsFly
475658116e Fix BUGFIX return statement in battle_dome.c 2022-08-10 20:00:16 -05:00
GriffinR
cd5a03d4aa
Merge pull request #1733 from WhenGryphonsFly/clean__pokeruspartysize
Use PARTY_SIZE for Pokerus Nurse Conversation
2022-08-10 20:45:57 -04:00
WhenGryphonsFly
86881b12ef Use PARTY_SIZE for Pokerus Nurse Conversation 2022-08-10 19:09:59 -05:00
GriffinR
e06ba39751 Use button constants in Task_HandleChooseMonInput 2022-08-10 15:14:35 -04:00
GriffinR
f534e8e44a Move party menu data constants 2022-08-10 14:30:01 -04:00
GriffinR
bfdbbad468 Split naming screen palettes/graphics, use correct image palettes, clean up 2022-08-09 09:27:28 -04:00
ghoulslash
eb0cc91dce
Merge pull request #2224 from AsparagusEduardo/BE_cosntantsZmove
B_WIN constants in battle_z_move.c
2022-08-08 21:13:23 -04:00
ghoulslash
1259cf3cac
Merge pull request #2225 from AsparagusEduardo/BE_pausesAndWaits
Using B_WAIT_TIME_LONG for new battle scripts
2022-08-08 21:13:02 -04:00
Eduardo Quezada
1fd1870a13 Moved enum to include/pokemon.h 2022-08-08 18:40:47 -04:00
Eduardo Quezada
75d52dc762 Convert MON_DATA constants into enum to ease editing and addition of fields. 2022-08-08 18:18:17 -04:00
Eduardo Quezada
4b08a511c3 Cleanup from https://github.com/pret/pokefirered/pull/532 2022-08-07 22:40:15 -04:00
Eduardo Quezada D'Ottone
65d8e9b084
Merge pull request #2223 from LOuroboros/patch-3
Fixed a wrong instance of IS_MOVE_STATUS in IsViableZMove
2022-08-07 11:21:52 -04:00
LOuroboros
80057fc990
Update battle_z_move.c 2022-08-07 10:19:03 -03:00
GriffinR
079b1762ac Update special save sector size checks 2022-08-05 12:11:33 -04:00
GriffinR
2487ddb128 Sector security -> signature 2022-08-05 10:42:31 -04:00
GriffinR
aa9ccbf194
Merge pull request #1724 from DizzyEggg/lang_improvements
Accomodate some parts of code based on the french decomp
2022-08-04 21:37:19 -04:00
Eduardo Quezada D'Ottone
08f08ece98 B_WIN constants in battle_z_move.c 2022-08-04 15:35:08 -04:00
DizzyEggg
c991131b75 Change language stuff based on the french decomp 2022-08-04 11:53:16 +02:00
Eduardo Quezada D'Ottone
54097951f7 Using B_WAIT_TIME_LONG 2022-08-03 16:51:02 -04:00
GriffinR
e5c36cd745 MapGridIsImpassableAt -> MapGridGetCollisionAt, and add fixes 2022-08-03 14:21:13 -04:00
GriffinR
79384ec9f3
Merge pull request #1702 from GriffinRichards/clean-psn
Clean up field_poison.c
2022-08-02 13:20:49 -04:00
GriffinR
99a37b5aa5
Merge pull request #1717 from mrgriffin/trainer-party-macro
Macros for keeping .partyFlags, .partySize, and .party in sync
2022-08-02 13:11:43 -04:00
ExpoSeed
807c3fd17f Delete item and ability defines in configs 2022-08-02 00:28:42 -05:00
ExpoSeed
49da2ee53f Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
ultima-soul
6b35dd5774
Merge pull request #2208 from AsparagusEduardo/RHH_masterMerge
RHH master merge
2022-08-01 21:06:40 -07:00
Ariel A
9a0a759b3f Fixed multihit odds. 2022-08-01 20:23:25 -04:00
GriffinR
79c5a5983e
Merge pull request #1721 from AsparagusEduardo/pret_clean2
Companion PR to pokefirered #525
2022-08-01 16:57:40 -04:00
Eduardo Quezada
b49f8c10ad Review changes from https://github.com/pret/pokefirered/pull/525 2022-08-01 15:37:05 -04:00
Eduardo Quezada
cc288e3786 Review changes 2022-08-01 15:14:21 -04:00
Eduardo Quezada
7ea49adf3c CpuCopy16 in UnkUtil_CpuRun 2022-08-01 08:04:48 -04:00
Eduardo Quezada
c6cdb2a281 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-31 22:57:46 -04:00
Eduardo Quezada D'Ottone
1f9b57f1fc
Merge pull request #2217 from benicioneto/battle_engine
Fix the AI
2022-07-31 13:08:26 -04:00
benicioneto
3d8aeeac77 Fix the AI
The AI was using only the first move, and soft locking when the first move's PP ends
2022-07-30 17:33:48 -03:00
Eduardo Quezada
a72d4c4168 Cleanup from syncing pss and mon markings 2022-07-30 12:43:14 -04:00
GriffinR
5101811407
Merge pull request #1719 from AsparagusEduardo/pret_cleanBattleScriptCommands
Further cleaning after comparing with pokefirered
2022-07-30 09:09:23 -04:00
ghoulslash
154c38050a
Merge pull request #2215 from AsparagusEduardo/BE_steamEruption
Fixed Steam Eruption's long name
2022-07-30 09:06:20 -04:00
Eduardo Quezada D'Ottone
22ab78e2f8 Fixed Steam Eruption's long name 2022-07-30 00:10:20 -04:00
Eduardo Quezada
897b3d07f6 Sync src/pokeball.c with pokefirered 2022-07-29 21:29:12 -04:00