GriffinR
42b7f11db0
Merge pull request #1245 from GriffinRichards/modernfactoryfix
...
Fix battle factory on gcc 10
2020-11-04 18:34:53 -05:00
GriffinR
1220f0655c
Revert to original battle factory gcc 10 fix
2020-11-04 17:46:07 -05:00
GriffinR
c3080a5a2a
Fix typo
2020-11-04 16:46:26 -05:00
GriffinR
70ff0d1735
Condense fix for battle factory on gcc 10
2020-11-04 16:43:59 -05:00
Eduardo Quezada D'Ottone
6cb73c1e8a
Fixed Trapinch's evolutions abilities. ( #555 ) from AsparagusEduardo
...
Fixed Trapinch's evolutions abilities.
2020-11-04 18:23:15 -03:00
GriffinR
c59a818462
Fix battle factory on gcc 10
2020-11-04 15:35:22 -05:00
PikalaxALT
99dd461bef
Merge pull request #1189 from aaaaaa123456789/reverts
...
Undo PokeCodec's PRs and port changes
2020-11-03 09:28:45 -05:00
Eduardo Quezada D'Ottone
0c6dc6abab
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# graphics/pokemon/burmy/footprint.png
# graphics/pokemon/gastrodon/footprint.png
# graphics/pokemon/rotom/footprint.png
# graphics/pokemon/shellos/footprint.png
# graphics/pokemon/wormadam/footprint.png
# include/constants/species.h
# src/data/pokemon/base_stats.h
2020-11-03 00:13:51 -03:00
aaaaaa123456789
ca950a8daf
Solve merge conflicts from previous commit
2020-11-02 22:18:26 -03:00
aaaaaa123456789
bacc831aa9
Re-apply joypad macros (minus merge conflicts)
2020-11-02 22:02:39 -03:00
Kurausukun
6545745e59
Merge branch 'reverts' of https://github.com/aaaaaa123456789/pokeemerald into reverts
2020-11-02 18:43:40 -05:00
Kurausukun
8bf401c227
address comments
2020-11-02 18:43:11 -05:00
Eduardo Quezada D'Ottone
c598daf228
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-FixTrapinchAbility
...
# Conflicts:
# src/data/pokemon/base_stats.h
2020-11-02 19:39:18 -03:00
ultima-soul
1e283e9dbf
Merge pull request #551 from LOuroboros/gen5_footprints
...
Added footprints for the Gen. 5 species
2020-11-02 10:28:06 -08:00
ultima-soul
104b48986c
Merge pull request #538 from AsparagusEduardo/PE-IsUltraBeast
...
Created macro used to detect Ultra Beasts.
2020-11-02 09:53:28 -08:00
ExpoSeed
d6cbbc71a5
Merge pull request #29 from AsparagusEduardo/PR-CommentGen4Abilities
...
Toggle options for abilities and Egg Groups.
2020-11-01 21:07:24 -06:00
ExpoSeed
3573c467e7
Merge pull request #552 from LOuroboros/gen4_footprints_corrections
...
Corrected a few Gen. 4 footprints after accidentally screwing them up
2020-11-01 20:59:24 -06:00
Eduardo Quezada D'Ottone
910d502df2
Review changes
2020-11-01 19:23:45 -03:00
Eduardo Quezada D'Ottone
014afea3df
Fixed Trapinch's evolutions abilities.
2020-11-01 16:59:03 -03:00
Eduardo Quezada D'Ottone
44e066cdb4
Fixed missing abilities.
2020-11-01 15:37:01 -03:00
Eduardo Quezada D'Ottone
2c3d4ec7c7
Moved P_UPDATED_STATS ifs to above typing.
2020-11-01 15:32:50 -03:00
LOuroboros
bdcd910397
Swapped tabs to spaces in footprint_table.h
2020-11-01 15:18:41 -03:00
ultima-soul
1ec8282cd8
Merge pull request #545 from ExpoSeed/mega-pinsir-icon-fix
...
Fix Mega Pinsir Icon
2020-11-01 10:15:08 -08:00
Eduardo Quezada D'Ottone
b372ab1c34
Fixed label for Egg Group config.
2020-11-01 14:50:29 -03:00
Eduardo Quezada D'Ottone
ad5b728967
Fixed Quick Feet BATTLE_ENGINE define.
2020-11-01 14:50:08 -03:00
Eduardo Quezada D'Ottone
56056c01f4
Fixed identation for real.
2020-11-01 14:45:41 -03:00
LOuroboros
e948ffc8b7
Corrected a few Gen. 4 footprints after accidentally screwing them up
2020-11-01 12:24:34 -03:00
LOuroboros
7fe0e779f4
Review corrections
2020-11-01 12:01:07 -03:00
LOuroboros
7cf3c256cd
Added footprints for the Gen. 5 species, thanks to Blackforest
2020-11-01 09:44:05 -03:00
ExpoSeed
c71f0ed1b7
Merge pull request #547 from LOuroboros/gen4_footprints
...
Added footprints for the Gen. 4 species
2020-10-31 22:37:41 -05:00
LOuroboros
781b8f919e
Review changes
2020-10-30 17:41:50 -03:00
GriffinR
9e55ae22b1
Merge pull request #1242 from GriffinRichards/constants-menuinfoicons
...
Use constants for menu info icon table
2020-10-29 23:50:43 -04:00
GriffinR
fbff087e9a
Merge pull request #1238 from ketsuban/master
...
Eliminate goto in ItemUseCB_Medicine
2020-10-29 23:50:17 -04:00
GriffinR
be1685c87f
Use constants for menu info icon table
2020-10-29 16:34:33 -04:00
Eduardo Quezada D'Ottone
3218424d5b
Merge pull request #548 from LOuroboros/bouffalant
...
Fixed Bouffalant's sprite
2020-10-28 23:38:06 -03:00
LOuroboros
79555e8a7e
Fixed Bouffalant's sprite
2020-10-27 15:31:59 -03:00
LOuroboros
480a8cc751
I missed Buneary's footprint
2020-10-27 15:16:20 -03:00
LOuroboros
3d117c9127
8bpp bad 1bpp good
2020-10-27 15:07:28 -03:00
LOuroboros
6435158742
Added footprints for the Gen. 4 species
2020-10-27 09:38:04 -03:00
ExpoSeed
2668f86256
Fixed Mega Pinsir icon. Thanks Blackforest!
2020-10-27 00:34:04 -05:00
Eduardo Quezada
2964cc3828
Filled missing form names.
2020-10-26 22:53:31 -03:00
Eduardo Quezada
ed6fd6c964
Fixed compile
2020-10-26 22:37:01 -03:00
Eduardo Quezada
dbd382e61b
Added missing National Dex association.
2020-10-26 22:20:30 -03:00
Eduardo Quezada
2c098d8294
Merge branch 'pokemon_expansion' into PE-Ultima-Forms
...
# Conflicts:
# src/data/pokemon/base_stats.h
2020-10-26 20:06:37 -03:00
aaaaaa123456789
9794b077b5
Update src/digit_obj_util.c
...
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26 19:14:08 -03:00
aaaaaa123456789
bcbd05e151
Fix whitespace issues
2020-10-26 15:52:44 -03:00
aaaaaa123456789
4bbc14ecdd
Remove unused variable
...
Co-authored-by: Seija <71219152+PokeCodec@users.noreply.github.com>
2020-10-26 15:51:10 -03:00
aaaaaa123456789
00db69a302
Port back improvements from later commits
2020-10-26 12:31:07 -03:00
aaaaaa123456789
1c3d75f673
Merge branch 'master' into reverts
2020-10-26 12:16:36 -03:00
Kurausukun
fe40c0c466
re-match BattleIntroOpponent1SendsOutMonAnimation
...
a lot of functions and a bit of data had to be moved from battle_main.c
to battle_util.c; I have added a note to battle_util.c stating the
reason for this
2020-10-26 05:52:00 -04:00
