ultima-soul
|
961710ddd9
|
Merge pull request #1986 from AsparagusEduardo/BE_steamEngine
Added Steam Engine's overworld effect
|
2021-12-16 16:15:58 -08:00 |
|
Eduardo Quezada D'Ottone
|
d23e7069bd
|
Merge pull request #1998 from ultima-soul/be/enigma_berry_3
Eliminate Item Expansion Conflicts for ITEM_ENIGMA_BERRY_E_READER Constant
|
2021-12-16 21:07:15 -03:00 |
|
ultima-soul
|
a2ad860ae4
|
Merge branch 'pret/enigma_berry_2' into be/enigma_berry_3
|
2021-12-11 19:11:13 -08:00 |
|
ultima-soul
|
f4af5ea206
|
Merge conflict resolution trick.
|
2021-12-11 18:52:39 -08:00 |
|
Eduardo Quezada D'Ottone
|
aa2b2e6a70
|
Merge pull request #1929 from ultima-soul/battle_engine_sync
Battle Engine Upstream Sync
|
2021-12-09 20:02:45 -03:00 |
|
ultima-soul
|
a5afdac0ae
|
Resolved review suggestions for upstream Battle Engine sync.
|
2021-12-08 12:08:16 -08:00 |
|
Eduardo Quezada D'Ottone
|
756700ff4d
|
Added Steam Engine's overworld effect
|
2021-12-06 20:52:32 -03:00 |
|
DizzyEggg
|
dff72b97dd
|
Merge pull request #1971 from sphericalice/patch-2
Remove extra spaces in battle strings
|
2021-12-06 14:13:39 +01:00 |
|
DizzyEggg
|
97539d7443
|
Merge pull request #1951 from ghoulslash/be/sheercold
Ice Types immune to Sheer Cold
|
2021-12-06 14:12:06 +01:00 |
|
ultima-soul
|
7369f60c06
|
Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into battle_engine_sync
|
2021-12-03 17:30:45 -08:00 |
|
sphericalice
|
10c6630ffd
|
Remove extra spaces in battle strings
|
2021-12-03 19:34:03 +00:00 |
|
Eduardo Quezada D'Ottone
|
ae1d124a0c
|
Merge pull request #1969 from LOuroboros/patch-2
Removed ITEM_ENIGMA_BERRY_E_READER usage
|
2021-12-03 15:53:46 -03:00 |
|
LOuroboros
|
ac606364e9
|
Removed ITEM_ENIGMA_BERRY_E_READER usage
|
2021-12-03 15:44:12 -03:00 |
|
Eduardo Quezada D'Ottone
|
8058da5b88
|
Merge pull request #1963 from ghoulslash/be/aifix
Fix AI protect struct reset
|
2021-12-02 16:24:52 -03:00 |
|
ghoulslash
|
0434bf22e6
|
Merge pull request #1962 from LOuroboros/patch-2
One more merge conflict rejected
|
2021-12-02 13:20:14 -05:00 |
|
ultima-soul
|
23bf41713c
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-12-01 20:17:08 -08:00 |
|
ghoulslash
|
fbf74a9988
|
fix protect struct reset
|
2021-12-01 15:30:07 -05:00 |
|
LOuroboros
|
e7bef25fb1
|
Updated hold_effects.h
|
2021-12-01 13:32:43 -03:00 |
|
Eduardo Quezada D'Ottone
|
14f974c9a9
|
Merge pull request #1954 from ghoulslash/be/aifix
revert ai item usage code
|
2021-11-30 14:06:25 -03:00 |
|
GriffinR
|
83be1bfc8f
|
Remove sFiller from malloc.c
|
2021-11-29 11:19:30 -05:00 |
|
ghoulslash
|
d108f77aa4
|
revert ai item usage code
|
2021-11-28 13:12:56 -05:00 |
|
ultima-soul
|
0312c5be8b
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-27 21:38:26 -08:00 |
|
GriffinR
|
4c64863bc5
|
Merge pull request #1567 from LOuroboros/sBattleTerrainTable
Renamed gBattleTerrainTable
|
2021-11-27 23:43:22 -05:00 |
|
GriffinR
|
01859a63ff
|
Merge pull request #1566 from cbt6/move-speed
Rename speed parameter to distance in jump functions
|
2021-11-27 23:37:50 -05:00 |
|
LOuroboros
|
b042eb6436
|
gBattleTerrainTable -> sBattleTerrainTable
|
2021-11-28 01:22:27 -03:00 |
|
cbt6
|
c59c7b0518
|
Use enums for jump distances
|
2021-11-28 12:01:29 +08:00 |
|
cbt6
|
b6430098d4
|
Rename speed parameter to distance in jump functions
|
2021-11-28 12:01:29 +08:00 |
|
GriffinR
|
e677a00676
|
Merge pull request #1560 from GriffinRichards/retire-ok
Retire OK bot
|
2021-11-27 21:27:14 -05:00 |
|
ghoulslash
|
e2af9ec3b4
|
ice type immunity to sheer cold
|
2021-11-26 11:49:49 -05:00 |
|
GriffinR
|
e0fae879da
|
Merge pull request #1558 from GriffinRichards/update-macros
Update event macro comments
|
2021-11-22 19:10:49 -05:00 |
|
ghoulslash
|
3ac480076c
|
Merge pull request #1933 from BuffelSaft/brick-break
Fix Brick Break
|
2021-11-21 22:30:38 -05:00 |
|
BuffelSaft
|
8118f3bb44
|
Fix Brick Break
Should remove the target's screens, not the attacker's.
|
2021-11-22 16:17:10 +13:00 |
|
ultima-soul
|
3ed51d6d91
|
Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync
|
2021-11-21 10:40:26 -08:00 |
|
Eduardo Quezada D'Ottone
|
0f801b110b
|
Merge pull request #1696 from ghoulslash/battle_ai
AI Item Usage Considers Move Choice
|
2021-11-21 14:51:20 -03:00 |
|
Eduardo Quezada D'Ottone
|
dee7f97a8d
|
Merge branch 'battle_engine' into battle_ai
|
2021-11-21 14:46:09 -03:00 |
|
Eduardo Quezada D'Ottone
|
30a4ef3723
|
Merge pull request #1924 from ghoulslash/be/wish
Fix wish
|
2021-11-21 14:04:06 -03:00 |
|
GriffinR
|
f81565163e
|
Retire OK bot
|
2021-11-21 11:48:50 -05:00 |
|
GriffinR
|
5cb875b6cb
|
Merge pull request #1559 from GriffinRichards/remove-flower
Fix incorrect flower animation palettes
|
2021-11-21 11:29:11 -05:00 |
|
GriffinR
|
23dd1dad7f
|
Fix incorrect palettes in Mauville flower tileset anims
|
2021-11-21 11:23:03 -05:00 |
|
ghoulslash
|
3404039330
|
Merge pull request #1918 from kleeenexfeu/be_mega_evo_alter_turn
Mega Evolution alters turn order
|
2021-11-21 08:12:21 -05:00 |
|
Eduardo Quezada D'Ottone
|
29172d6357
|
Merge pull request #1925 from ghoulslash/be/rampage
fix rampage cancelling
|
2021-11-21 00:15:53 -03:00 |
|
ghoulslash
|
3fb62f74c6
|
fix rampage cancelling
|
2021-11-20 18:35:56 -05:00 |
|
ghoulslash
|
37ab20e29c
|
fix wish
|
2021-11-20 16:49:04 -05:00 |
|
kleeenexfeu
|
62b31aec55
|
syntax
|
2021-11-20 02:12:43 +01:00 |
|
kleeenexfeu
|
da20dae9c3
|
Only recalculate speed for battler choosing a move
Other actions have priority
|
2021-11-20 02:09:33 +01:00 |
|
kleeenexfeu
|
6402a7ab6e
|
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-11-19 23:42:20 +01:00 |
|
kleeenexfeu
|
c1743db19a
|
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-11-19 23:30:45 +01:00 |
|
kleeenexfeu
|
acddeeb1f9
|
follow suggestion
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-11-19 23:30:33 +01:00 |
|
Eduardo Quezada D'Ottone
|
377c313771
|
Merge pull request #1919 from ghoulslash/be/unseenfist
Fix unseen fist check
|
2021-11-19 18:48:58 -03:00 |
|
ghoulslash
|
fb468b6776
|
fix unseen fist check
|
2021-11-19 16:32:00 -05:00 |
|