atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
9144 commits 2 branches 40 tags 600 MiB
Commit graph

9144 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
ghoulslash
e731d93c0b update a couple gen 3 ability names 2021-11-29 12:46:14 -05:00
ghoulslash
7a7c6afc39 larger ability popup, fix ability name printing/clearing, and config for longer ability names 2021-11-29 12:42:01 -05: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
LOuroboros
68c557fd46 Updated Light Ball's effect and improved readability 2021-11-24 19:04:15 -03:00
ghoulslash
95ad508868 baton pass status4_xx_sport 2021-11-23 21:25:03 -05:00
ghoulslash
5c52abd856 gen3 sport move functionality behind config 2021-11-23 21:20:32 -05:00
ghoulslash
b5bc8bb346 fix B_SPORT_DMG_REDUCTION 2021-11-23 18:37:27 -05:00
ghoulslash
e3ddad2d11 add sport effects back 2021-11-23 18:36:10 -05:00
kleeenexfeu
9b25e0147c
Update include/constants/battle_config.h 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2021-11-23 14:35:37 +01:00
kleeenexfeu
f2755ad970
reword B_RECALC_TURN_AFTER_ACTIONS explanation 2021-11-23 14:28:52 +01:00
kleeenexfeu
84e6e083f7
hate the explanations about turn order ._. 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2021-11-23 14:24:30 +01:00
kleeenexfeu
1a3561bb0b space 2021-11-23 13:48:03 +01:00
kleeenexfeu
6ceffaaf3e recalculate turn order after relevant actions 2021-11-23 13:46:36 +01:00
kleeenexfeu
1a5d3191e2 battle_engine merge 2021-11-23 13:38:36 +01:00
GriffinR
e0fae879da
Merge pull request #1558 from GriffinRichards/update-macros 
Update event macro comments
 2021-11-22 19:10:49 -05:00
BuffelSaft
62f01e89d7 Fix Burmy form change 
Wasn't properly tracking if Burmy had appeared in battle; gSentPokesToOpponent is used only for exp calculation and is cleared when an opponent faints, so a new var was needed.
 2021-11-23 00:46:43 +13: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
W1serV1ser
5d1228fc2e More spacing and format fixes 2021-11-21 15:42:31 -08: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
W1serV1ser
844a0217f7 Fixed spacing, added braces, and reverted comment 2021-11-20 12:04:21 -08:00
W1serV1ser
c2f81cd5f5 Added Sky Drop 2021-11-20 11:44:48 -08:00