Commit Graph

11030 Commits

Author SHA1 Message Date
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
Eduardo Quezada
40805fffc0 Space cleanup 2022-07-29 21:28:39 -04:00
Eduardo Quezada
2e1bf0d965 OamData mosaic FALSE 2022-07-29 21:27:39 -04:00
Eduardo Quezada
2214b01954 Forgot to include this fix 2022-07-29 17:07:56 -04:00
Eduardo Quezada
5d4b76c0ba Review changes from pokefirered #524 2022-07-29 17:00:07 -04:00
Eduardo Quezada
9dc64b67cd Review changes 2022-07-29 15:38:23 -04:00
Eduardo Quezada
01558ff8f3 Struct pointers star standarizing 2022-07-29 11:15:33 -04:00
Eduardo Quezada
13672680b0 void pointer standarized 2022-07-29 10:52:35 -04:00
Eduardo Quezada
aa93af4083 Fixed check 2022-07-29 10:34:21 -04:00
Eduardo Quezada
fa32f337be Review changes 2022-07-29 10:21:20 -04:00
Eduardo Quezada
7b3401ee27 Standarized use of star in pointer types 2022-07-29 10:17:58 -04:00
Eduardo Quezada
9caca17064 Cleanup by syncing src/battle_script_commands.c with pokefirered 2022-07-29 09:43:16 -04:00
ghoulslash
aa00812f81
Merge pull request #2183 from Greenphx9/16-letter-move-names
16-letter Move Names
2022-07-29 08:17:43 -04:00
GriffinR
591eef550e
Merge pull request #1720 from Jaizu/patch-25
Remove duplicated CB2_InitCopyrightScreenAfterBootup
2022-07-29 06:56:35 -04:00
Jaizu
7a8c28ccca
Remove duplicated CB2_InitCopyrightScreenAfterBootup 2022-07-29 10:52:36 +02:00
Greenphx9
05cbd6a906 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names 2022-07-29 18:49:25 +10:00
ghoulslash
0c79d04dec
Merge pull request #1928 from AsparagusEduardo/BE_fixTransformForm
Prevent Transforming Pokémon from changing forms
2022-07-28 22:26:56 -04:00