LOuroboros
|
ce7815ebcc
|
Update pokemon.h
|
2021-12-28 15:11:52 -03:00 |
|
Eduardo Quezada D'Ottone
|
4d6f54e8d6
|
Merge pull request #2007 from ghoulslash/be/roleplay
Update Role Play
|
2021-12-25 11:37:57 -03:00 |
|
Eduardo Quezada D'Ottone
|
7bffe6d1d5
|
Merge pull request #2004 from ghoulslash/be/sports
Add sport effects back
|
2021-12-24 18:59:50 -03:00 |
|
Eduardo Quezada D'Ottone
|
75fbc5c0ab
|
Merge pull request #1981 from ghoulslash/be/aquaring
Fix aqua ring heal anim
|
2021-12-24 15:11:28 -03:00 |
|
ghoulslash
|
93a7e139ec
|
merge w be
|
2021-12-24 09:40:12 -05:00 |
|
Eduardo Quezada D'Ottone
|
a725592a6b
|
Merge pull request #1999 from ghoulslash/be/moveeffect
More battle-will-end checks on stat-changing damaging effects
|
2021-12-23 20:23:16 -03:00 |
|
Eduardo Quezada D'Ottone
|
67697d2de3
|
Merge pull request #1582 from ghoulslash/smart_wild_ai
Smart Wild AI Option
|
2021-12-23 20:18:18 -03:00 |
|
ghoulslash
|
b6b5d862f4
|
update role play mechanics
|
2021-12-23 08:37:11 -05:00 |
|
ghoulslash
|
4b5c5d14fc
|
Merge pull request #1989 from AsparagusEduardo/BE_debugHoldEffects
Updated AI debug hold effect name display.
|
2021-12-20 14:07:29 -05:00 |
|
ghoulslash
|
78b42fabef
|
Merge pull request #2001 from AsparagusEduardo/BE_debugDoc
Using TAG_NONE in battle debug
|
2021-12-20 14:06:59 -05:00 |
|
ghoulslash
|
05f91bc243
|
Update include/constants/battle_config.h
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
|
2021-12-20 14:06:32 -05:00 |
|
ghoulslash
|
02fe96cc08
|
fix config settings
|
2021-12-20 13:06:23 -05:00 |
|
Eduardo Quezada D'Ottone
|
4ab4250d5d
|
Merge branch 'battle_engine' into be/sports
|
2021-12-19 20:42:15 -03:00 |
|
Eduardo Quezada D'Ottone
|
a57043b589
|
Merge pull request #1983 from sphericalice/last_ball_refactor
Refactor CanThrowLastUsedBall and related functions
|
2021-12-19 20:21:50 -03:00 |
|
Eduardo Quezada D'Ottone
|
6d17156f74
|
Merge pull request #1934 from BuffelSaft/fix-burmy
Fix Burmy form change
|
2021-12-19 20:18:19 -03:00 |
|
Eduardo Quezada D'Ottone
|
4ca9f406f6
|
Merge pull request #1947 from LOuroboros/lightBall
Updated Light Ball's effect and improved readability
|
2021-12-18 15:03:18 -03:00 |
|
Eduardo Quezada D'Ottone
|
66e6b140ac
|
Merge pull request #1987 from rh-hideout/DizzyEggg-patch-1
Fix Intimidate affecting fainted mons
|
2021-12-18 15:01:19 -03:00 |
|
Eduardo Quezada D'Ottone
|
3a24bc8298
|
Merge branch 'battle_engine' into DizzyEggg-patch-1
|
2021-12-18 14:52:19 -03:00 |
|
Eduardo Quezada D'Ottone
|
1772997082
|
Merge pull request #1994 from AsparagusEduardo/BE_HPDrain
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
|
2021-12-18 13:50:05 -03:00 |
|
Eduardo Quezada D'Ottone
|
a075cca448
|
Merge branch 'battle_engine' into fix-burmy
|
2021-12-18 13:38:12 -03:00 |
|
Eduardo Quezada D'Ottone
|
bd75ee9688
|
Using TAG_NONE in battle debug
|
2021-12-18 10:55:04 -03:00 |
|
ultima-soul
|
84ce9745d5
|
Merge pull request #1990 from AsparagusEduardo/BE_debugArrows
Improved battle debug number value changing
|
2021-12-17 09:21:04 -08:00 |
|
ghoulslash
|
31bbc4ddde
|
prevent stat-raising damage effects if battle will end
|
2021-12-17 10:24:07 -05:00 |
|
Eduardo Quezada D'Ottone
|
837641f304
|
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-12-17 06:47:46 -03:00 |
|
Eduardo Quezada D'Ottone
|
8005db5040
|
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-12-17 06:47:35 -03:00 |
|
Eduardo Quezada D'Ottone
|
3a12cdb8cb
|
Update src/battle_debug.c
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
|
2021-12-17 06:47:02 -03:00 |
|
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 |
|
Eduardo Quezada D'Ottone
|
abe9910251
|
Fixed speed to be more like vanilla's
|
2021-12-12 12:42:14 -03:00 |
|
Eduardo Quezada D'Ottone
|
7ca07527fa
|
Config for HP bars moving faster for higher HP amounts. Credit to Dat.H
|
2021-12-12 12:33:49 -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
|
6f363b219e
|
Improved battle debug value change
|
2021-12-11 16:41:04 -03:00 |
|
Eduardo Quezada D'Ottone
|
2773b14de5
|
Updated AI debug hold effect name display.
|
2021-12-11 00:09:47 -03: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 |
|
DizzyEggg
|
0a7dd2edd6
|
Fix Intimidate affecting fainted mons
|
2021-12-07 12:19:27 +01: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 |
|
sphericalice
|
5c02facde4
|
Use more specific enum names for throwable Balls
|
2021-12-05 23:17:44 +00:00 |
|
sphericalice
|
3db871c49a
|
Refactor CanThrowLastUsedBall and related functions
|
2021-12-05 23:10:05 +00:00 |
|
ghoulslash
|
1e644c9d4c
|
fix spacing
|
2021-12-05 14:45:48 -05:00 |
|
ghoulslash
|
c0e408bfab
|
fix aqua ring heal anim
|
2021-12-05 14:44:22 -05: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 |
|