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

11618 commits

This branch
This branch
All branches
Author SHA1 Message Date
Eduardo Quezada D'Ottone
b4e456aeca
Merge pull request #1607 from BuffelSaft/mega-icon 
Move mega indicator for lv 100 mons
 2021-09-26 17:40:36 -03:00
Eduardo Quezada D'Ottone
d220d25aab
Merge pull request #1666 from LOuroboros/bKGD_PE 
Fix the 'bKGD: invalid index' error
 2021-09-26 11:39:26 -03:00
Eduardo Quezada D'Ottone
3ab909f165
Merge pull request #1687 from LOuroboros/mentalHerb 
Sync include/constants/hold_effects.h
 2021-09-26 11:19:15 -03:00
LOuroboros
872d2a7008 Made this build again 2021-09-25 22:33:07 -03:00
LOuroboros
1b039062da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gulp_missile 2021-09-25 22:20:34 -03:00
Eduardo Quezada D'Ottone
c574825974
Merge pull request #1689 from LOuroboros/itemUseDay 
Added a day time exclusive equivalent to `FORM_USE_ITEM`
 2021-09-25 22:11:51 -03:00
LOuroboros
234f3290c3 Added a day time exclusive equivalent to FORM_USE_ITEM 
Primarily for Shaymin, since it can only change its form with the Gracidea during the day.
Special thanks to AsparagusEduardo.
 2021-09-25 22:00:10 -03:00
Eduardo Quezada D'Ottone
869cb1ede6
Merge pull request #1686 from LOuroboros/patch-2 
Fix Dream Ball's effect's code
 2021-09-25 21:25:33 -03:00
LOuroboros
a49676ab55 Set the right holdEffectParam to the terrain seeds 2021-09-25 21:09:38 -03:00
LOuroboros
813d114132 Synced include/constants/hold_effects.h with the BE 2021-09-25 20:58:07 -03:00
LOuroboros
ab08ef18f7
Update battle_script_commands.c 2021-09-25 20:42:34 -03:00
Eduardo Quezada D'Ottone
082dd1cb23
Merge pull request #1685 from LOuroboros/formIcon 
Fixed form icon subpriority
 2021-09-25 20:07:26 -03:00
LOuroboros
87bc1f502a Fixed form icon subpriority 2021-09-25 19:58:12 -03:00
Eduardo Quezada D'Ottone
48492997f3
Merge pull request #1681 from ghoulslash/dream_ball 
Dream ball checks comatose
 2021-09-25 11:53:17 -03:00
Eduardo Quezada D'Ottone
6f9d862fd1
Merge pull request #1682 from Syreldar/fix-retaliate-naming 
Fixed Retaliate's naming.
 2021-09-25 11:53:04 -03:00
GriffinR
db057eb86b Relocate battle_message comment 2021-09-24 17:33:18 -04:00
GriffinR
a66d7e1b43 Document some single-remaining symbols 2021-09-24 17:14:20 -04:00
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04:00
Syreldar
4c05520bf3 Fixed Retaliate's naming. 2021-09-24 16:02:26 +02:00
ghoulslash
9ab29e993c add battle engine define check 2021-09-24 08:58:51 -04:00
ghoulslash
4aeeb71393 dream ball checks comatose 2021-09-24 08:57:10 -04:00
ghoulslash
1125459259
Merge pull request #1680 from LOuroboros/blackSludge 
Completed Black Sludge's effect
 2021-09-24 06:48:40 -06:00
LOuroboros
8a2921ef71 Completed Black Sludge's effect 2021-09-24 07:01:48 -03:00
GriffinR
09fd4fc4c5
Merge pull request #1504 from LOuroboros/staticRegionMapSecIdToPopUpThemeIdMapping 
Renamed gRegionMapSectionId_To_PopUpThemeIdMapping
 2021-09-23 22:48:42 -04:00
LOuroboros
ac599589ec gRegionMapSectionId_To_PopUpThemeIdMapping -> sRegionMapSectionId_To_PopUpThemeIdMapping 2021-09-23 23:36:37 -03:00
GriffinR
9d0f9042fe
Merge pull request #1498 from LOuroboros/trailingSpaces 
Removed trailing spaces in the most relevant files
 2021-09-23 21:49:49 -04:00
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces 2021-09-23 21:39:21 -04:00
LOuroboros
6b2d756829 Fixed and pngcrush'd Bastiodon's icon 
Thanks to Cynderquil for fixing it.
 2021-09-23 20:40:33 -03:00
Eduardo Quezada D'Ottone
e87c170db0 Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	src/battle_main.c
#	src/battle_script_commands.c
 2021-09-23 18:20:35 -03:00
Eduardo Quezada D'Ottone
13a464ffa4
Merge pull request #1673 from ghoulslash/gen8_move_effects 
Gen8 move effects Fixes
 2021-09-23 18:04:20 -03:00
ultima-soul
3b951aeb83
Merge pull request #1360 from ghoulslash/prankster 
Prankster Gen 7
 2021-09-23 12:27:15 -07:00
ultima-soul
fe6a11e5ec
Update asm/macros/battle_script.inc 2021-09-23 12:26:36 -07:00
ghoulslash
767e25bfed
Update asm/macros/battle_script.inc 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 13:19:12 -06:00
ghoulslash
2f69748e0d merge with be 2021-09-23 14:38:01 -04:00
ghoulslash
94ec25319f syntax fixes. Use BlocksPrankster for perish song battle script 2021-09-23 14:35:37 -04:00
ghoulslash
8a9d28d97f
Update src/battle_util.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:36 -06:00
ghoulslash
2cea541b2a
Update src/battle_script_commands.c 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:26 -06:00
ghoulslash
d4a153bf14
Update data/battle_scripts_1.s 
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-09-23 12:21:16 -06:00
ghoulslash
3925c07c1a fix l graphic 2021-09-23 13:20:32 -04:00
ghoulslash
768598b154 fix bad merge 2021-09-23 12:22:36 -04:00
ghoulslash
33972b5493 merge with be 2021-09-23 12:04:13 -04:00
ghoulslash
3f34fec42f change last ball graphic based on config. replace saveblock field with ewram field 2021-09-23 12:03:01 -04:00
Eduardo Quezada D'Ottone
d084d2a68d Merge branch 'BattleEngine' into booleanStandard 
# Conflicts:
#	include/battle.h
#	src/battle_main.c
#	src/battle_script_commands.c
 2021-09-22 23:42:00 -03:00
Eduardo Quezada D'Ottone
075c0299a1 Better names for Micle and Custap flags 2021-09-22 23:29:26 -03:00
Eduardo Quezada D'Ottone
380e1e470c Applied use of TRUE and FALSE for flags. 2021-09-22 23:29:00 -03:00
ghoulslash
6ec1a74948 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into gen8_move_effects 2021-09-22 21:51:45 -04:00
ghoulslash
936f2c7bcb fix eject pack weak armor special case 2021-09-22 21:51:37 -04:00
Eduardo Quezada D'Ottone
2c66aa84b6
Merge pull request #1378 from ghoulslash/gen8_move_effects 
Several Gen 8 Move Effects
 2021-09-22 22:48:29 -03:00
ghoulslash
9bf2ffe459 fix lash out stat fell 2021-09-22 21:15:02 -04:00
ghoulslash
d738297f24 merge with be 2021-09-22 16:26:09 -04:00