ExpoSeed
d2566c8988
Refactor Multi-Attack, Judgment, and Techno Blast to use the same move effect
2020-11-07 23:34:04 -06:00
ultima-soul
564d75cd67
Merge pull request #577 from AsparagusEduardo/PE-pretSync
...
Sync with Pret
2020-11-07 16:46:06 -08:00
Eduardo Quezada D'Ottone
79edca1ae8
Fixed Pokédex showing by default Female version differences.
2020-11-07 21:24:20 -03:00
ultima-soul
99fdc13e61
Merge branch 'master' into battle_engine_sync
2020-11-07 15:59:20 -08:00
TheXaman
abf5d238c2
PokedexPlus with HGSS styled UI by TheXaman
...
more ui, BROKEN atm
type icons in info screen
working topbar
dpad for switching and white mon name
initial working stats screen
additional stats, proper move list array
Working stats screen, all infos in, all icons in, buggy when switching
Fixed sprite bug, proper sprite destruction, works with old compiler
new navigation: info>area>stats
power+accuracy text, change of positions
layout for stats screen, other screen visually broken
new stats layout properly working plus toggle infos
show lvl of LevelUpMove and TM/HM of TMHM_Move
3 dashes for EggMoves and CORRECT icon for TM/HMs pog
improved layout and contest move data!
TutorMoves now available
hold dpad to scroll, pure relieve
search by move code working
6evs, 16 character move names, tripple digit moves, new eduardo layout
working tileset, info screen no correct xy layout for elements yet
new list menu start
new layout working, only missing stats bars
new list, new search
fixed area screen change and fixed "new caught" bug (type icons)
2020-11-08 00:49:14 +01:00
luckytyphlosion
4b748d32cc
Bugfix for ChooseMoveOrAction_Doubles.
2020-11-07 18:21:17 -05:00
luckytyphlosion
a29b18ed2f
Merge branch 'master' of https://github.com/pret/pokeemerald
2020-11-07 18:06:37 -05:00
ExpoSeed
31b19400f9
Merge pull request #568 from LOuroboros/hurricane
...
Changed Hurricane's animation
2020-11-07 14:44:49 -06:00
Eduardo Quezada D'Ottone
68627882a5
Merge remote-tracking branch 'pret/master' into PE-pretSync
2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone
8d86169283
Merge remote-tracking branch 'pret/master' into IE-pretSync
2020-11-07 14:54:52 -03:00
Eduardo Quezada D'Ottone
09a5d6c722
Implemented Wish Mega Evolution
2020-11-07 10:13:32 -03:00
LOuroboros
ea99195194
Added functionality to the B_NEW_SURF_PARTICLE_PALETTE anim. config label
2020-11-06 22:29:20 -03:00
LOuroboros
d66b2fc820
Fixed anim. settings labels in src/battle_anim.c
2020-11-06 21:37:04 -03:00
LOuroboros
c66b77fbf8
Changed Hurricane's animation
2020-11-06 21:06:04 -03:00
ultima-soul
7fb457a30e
Merge pull request #564 from LOuroboros/patch-1
...
Fixed the descriptions of Freeze Dry and Flying Press
2020-11-06 15:56:37 -08:00
Eduardo Quezada D'Ottone
cb6802f01e
Standarized naming schemes.
2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
209ff3aa5e
Fixed spacing.
2020-11-06 18:11:05 -03:00
Eduardo Quezada D'Ottone
ed34e90848
Fixed new-line at EOF
2020-11-06 18:08:45 -03:00
Eduardo Quezada D'Ottone
5e33281350
Support for gender difference mon icons.
2020-11-06 17:48:03 -03:00
GriffinR
8b1c2c946b
Merge pull request #1247 from PidgeyALT/attemptcountfix
...
use constants for ball throw count
2020-11-06 15:41:25 -05:00
Eduardo Quezada D'Ottone
d7fbaa6cbf
Support for gender palettes.
2020-11-06 17:12:57 -03:00
PikalaxALT
75b12b86dc
Merge pull request #1246 from PikalaxALT/simplify_ram_reset
...
Simplify RAM reset adaptation for modern
2020-11-06 15:00:40 -05:00
MCboy
e31158d017
add spaces around - and remove comment from include in battle.h
2020-11-06 23:29:52 +03:30
Eduardo Quezada D'Ottone
3849f7dd5d
Female Eevee backsprite.
2020-11-06 16:45:25 -03:00
MCboy
3b91735e63
use constants for ball throw count
2020-11-06 22:59:46 +03:30
Eduardo Quezada D'Ottone
4d4b111327
Front pic gender differences for Eevee
2020-11-06 16:21:45 -03:00
LOuroboros
93d9ad0997
Fixed the descriptions of Freeze Dry and Flying Press
...
Addresses https://github.com/DizzyEggg/pokeemerald/issues/508
2020-11-06 15:24:00 -03:00
PikalaxALT
3112cf5726
swi --> svc
2020-11-06 12:34:57 -05:00
PikalaxALT
c70c44fa48
Simplify RAM reset adaptation for modern
2020-11-06 12:29:40 -05:00
Eduardo Quezada D'Ottone
b494b6e987
Fixing Litleo's and Pyroar's gender ratio.
2020-11-06 14:28:10 -03:00
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
Evan
b3d1e8b5b8
turn crit capture odds into a ratio
2020-11-03 08:57:11 -07: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
c2e8f51e35
Merge pull request #145 from AsparagusEduardo/IE-Config
...
Item Expansion config file.
2020-11-02 11:31:51 -06:00
Evan
e7372e7c5b
add B_ prefix to critical capture configs
2020-11-01 21:50:34 -07:00
Evan
59692e8e7f
styling fix
2020-11-01 21:08:58 -07:00
Eduardo Quezada D'Ottone
6c04aadff8
Going to bed now
2020-11-02 00:31:04 -03:00