Eduardo Quezada
|
c1c9837bfc
|
Merge remote-tracking branch 'RHH/item_expansion' into MergedBranchUltimate
|
2022-08-22 17:31:21 -04:00 |
|
Eduardo Quezada
|
18612b7686
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into MergedBranchUltimate
|
2022-08-22 17:31:00 -04:00 |
|
Eduardo Quezada
|
2b7a2c4d09
|
Merge remote-tracking branch 'RHH/battle_engine' into MergedBranchUltimate
|
2022-08-22 17:30:48 -04:00 |
|
Eduardo Quezada
|
75ac960365
|
Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms
|
2022-08-22 17:27:21 -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 |
|
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 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 |
|
Eduardo Quezada D'Ottone
|
08f08ece98
|
B_WIN constants in battle_z_move.c
|
2022-08-04 15:35:08 -04:00 |
|
Eduardo Quezada D'Ottone
|
54097951f7
|
Using B_WAIT_TIME_LONG
|
2022-08-03 16:51:02 -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 |
|
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 |
|
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 |
|
ghoulslash
|
aa00812f81
|
Merge pull request #2183 from Greenphx9/16-letter-move-names
16-letter Move Names
|
2022-07-29 08:17:43 -04: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
|
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 |
|
Eduardo Quezada D'Ottone
|
611b192e8c
|
Small AI fixes by mrgriffin
|
2022-07-26 09:53:39 -04:00 |
|
Eduardo Quezada D'Ottone
|
8d18fc0dd8
|
Fixed Heal Ball not always healing caught Pokémon
|
2022-07-25 08:54:03 -04:00 |
|
Eduardo Quezada D'Ottone
|
bfb86fdc86
|
Config for Gen 3 faint switch mechanics
|
2022-07-24 14:57:47 -04:00 |
|
Eduardo Quezada
|
be22f299f8
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
|
2022-07-24 14:00:10 -04:00 |
|
ghoulslash
|
57e2de092b
|
Merge pull request #2210 from LOuroboros/prankster
Corrected usage of B_PRANKSTER_DARK_TYPES in AI_CheckBadMove
|
2022-07-24 07:29:03 -04:00 |
|
LOuroboros
|
f1d8d006f3
|
Corrected usage of B_PRANKSTER_DARK_TYPES in AI_CheckBadMove
|
2022-07-24 06:47:50 -03:00 |
|
Eduardo Quezada
|
e96c9c87fa
|
Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge
# Conflicts:
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 23:38:52 -04:00 |
|
Eduardo Quezada
|
231727d02b
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into RHH_masterMerge
# Conflicts:
# asm/macros/event.inc
# data/specials.inc
# include/constants/species.h
# src/data/pokemon/base_stats.h
|
2022-07-22 23:33:04 -04:00 |
|
Eduardo Quezada
|
f3bebcd12c
|
Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge
# Conflicts:
# include/battle_anim.h
# include/global.h
# include/pokemon.h
# src/battle_message.c
# src/battle_script_commands.c
# src/data/pokemon/base_stats.h
|
2022-07-22 22:57:02 -04:00 |
|
ghoulslash
|
1260666c91
|
Merge pull request #1911 from AsparagusEduardo/PE_breedOverrides
Added Egg breeding species overrides.
|
2022-07-22 14:05:14 -04:00 |
|
ghoulslash
|
cef730e451
|
Merge pull request #2196 from AsparagusEduardo/IE_pretmerge
Item Expansion pret merge
|
2022-07-22 14:01:50 -04:00 |
|
ghoulslash
|
0588bba193
|
Merge pull request #2195 from AsparagusEduardo/PE_pretmerge
Pokémon Expansion pret merge
|
2022-07-22 14:01:27 -04:00 |
|
ghoulslash
|
3a77b52bad
|
Merge pull request #2194 from AsparagusEduardo/BE_pretmerge
Battle Engine pret merge
|
2022-07-22 14:00:40 -04:00 |
|
ghoulslash
|
a51acab9e3
|
Merge pull request #2193 from AsparagusEduardo/BE_plusMinus
Config for Plus and Minus interaction
|
2022-07-21 16:48:04 -04:00 |
|
Eduardo Quezada D'Ottone
|
af72fb0d32
|
Simplified pre-gen5 checks
|
2022-07-21 16:36:07 -04:00 |
|
Eduardo Quezada D'Ottone
|
56b9a50109
|
Merge remote-tracking branch 'RHH/battle_engine' into BE_plusMinus
# Conflicts:
# include/constants/battle_config.h
|
2022-07-21 16:28:16 -04:00 |
|
ghoulslash
|
24bb2f7ed0
|
Merge pull request #2179 from LOuroboros/pinch
Removed global and unused IsPinchBerryItemEffect
|
2022-07-21 16:14:56 -04:00 |
|
ghoulslash
|
49a932a892
|
Merge pull request #2205 from AsparagusEduardo/BE_LightThatBurnsTheSky
Fixed Light That Burns The Sky not using the calculated damage category
|
2022-07-21 16:14:38 -04:00 |
|
ghoulslash
|
30a494f964
|
Merge pull request #2197 from AsparagusEduardo/BE_explosion
Config for Explosion halving defense
|
2022-07-21 16:11:32 -04:00 |
|
ghoulslash
|
504600c996
|
Merge pull request #2201 from AsparagusEduardo/BE_sturdy
Config for Sturdy's Gen5+ effect.
|
2022-07-21 16:09:01 -04:00 |
|