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 |
|
ghoulslash
|
5a850b0b4e
|
Merge pull request #2212 from AsparagusEduardo/BE_healBallFix
Fixed Heal Ball not always healing caught Pokémon
|
2022-07-28 22:22:20 -04:00 |
|
Eduardo Quezada D'Ottone
|
e3d042bee9
|
Merge pull request #2214 from LOuroboros/patch-1
Sync this branch's include/constants/moves.h with the BE's
|
2022-07-28 11:05:57 -04:00 |
|
LOuroboros
|
b9c83710c4
|
Sync this branch's include/constants/moves.h with the BE's
|
2022-07-28 11:12:28 -03:00 |
|
Eduardo Quezada
|
09af7422d5
|
Further cleaning after comparing with pokefirered
STAT_BUFF changed to STAT_CHANGE, as it also uses debuffs
|
2022-07-28 01:27:05 -04:00 |
|
GriffinR
|
456d45985f
|
Merge pull request #1718 from AsparagusEduardo/pret_cleanEvoScene
Cleaned by comparing evolution_scene.c with pokefirered
|
2022-07-27 21:54:34 -04:00 |
|
Eduardo Quezada
|
dc47a959da
|
Reverted comments from pokefirered
|
2022-07-27 20:33:34 -04:00 |
|
Eduardo Quezada
|
b00bd8b181
|
Cleaned by comparing evolution_scene.c with pokefirered
|
2022-07-27 18:51:32 -04:00 |
|
Martin Griffin
|
2380d13a43
|
Macros for keeping .partyFlags, .partySize, and .party in sync
|
2022-07-27 23:25:37 +01:00 |
|
GriffinR
|
4ffe75c611
|
Merge pull request #1707 from GriffinRichards/use-pocket-consts
Add some missing pocket constant usage
|
2022-07-27 12:22:01 -04:00 |
|
GriffinR
|
1da46a4bbc
|
Merge pull request #1715 from AsparagusEduardo/pret_docBooleans
Documented boolean uses
|
2022-07-27 12:09:02 -04:00 |
|
Eduardo Quezada
|
e1c15a9cf6
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
|
2022-07-27 08:16:10 -04:00 |
|
Eduardo Quezada D'Ottone
|
0f6186d8ab
|
Merge pull request #2211 from AsparagusEduardo/BE_Gen3Switch
Config for Gen 3 faint switch mechanics
|
2022-07-27 08:14:13 -04:00 |
|
Eduardo Quezada
|
7af85b0c49
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
|
2022-07-27 08:12:08 -04:00 |
|
BuffelSaft
|
8d8c25b341
|
Merge pull request #2213 from AsparagusEduardo/BE_aiFixes
Small AI fixes by mrgriffin
|
2022-07-27 17:50:28 +12:00 |
|
Eduardo Quezada D'Ottone
|
aebd667260
|
Merge remote-tracking branch 'RHH/battle_engine' into BE_fixTransformForm
# Conflicts:
# src/battle_ai_main.c
|
2022-07-26 17:00:53 -04:00 |
|