Eduardo Quezada
|
58436a077b
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/breaking/speciesReorder
# Conflicts:
# src/data/pokemon/base_stats.h
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
# src/data/pokemon/form_species_table_pointers.h
# src/data/pokemon/teachable_learnsets.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
|
2022-10-10 11:50:05 -03:00 |
|
Eduardo Quezada D'Ottone
|
2ce340e8e1
|
Merge pull request #2262 from LOuroboros/becomingAHero
Fixed Mega Evolved Pokémon being able to get Friendship effects in battle
|
2022-10-07 18:27:29 -03:00 |
|
LOuroboros
|
589c969e89
|
Removed unused access to struct MegaEvolutionData in GetBattlerFriendshipScore
|
2022-10-07 18:20:00 -03:00 |
|
ghoulslash
|
06bddbac23
|
Merge pull request #2379 from AsparagusEduardo/RHH/pr/pretmerge_20221007
One for the go! (pret merge 2022/10/07)
|
2022-10-07 17:14:00 -04:00 |
|
ghoulslash
|
1a9f6abe99
|
Merge pull request #2380 from AsparagusEduardo/RHH/pr/feature/bWaitTime
Config for Battle text pause times
|
2022-10-07 16:32:29 -04:00 |
|
ghoulslash
|
9164f03f96
|
Merge pull request #2141 from Sneed69/Triple-Kick-Fix
Triple kick power calc rework
|
2022-10-07 16:31:50 -04:00 |
|
Eduardo Quezada
|
8ea060044a
|
Battle text pauses config
|
2022-10-07 17:22:29 -03:00 |
|
Eduardo Quezada
|
2a8048b677
|
Removed ItemId_GetId like in upstream
|
2022-10-07 14:53:58 -03:00 |
|
Eduardo Quezada
|
68b474c0f0
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
# Conflicts:
# include/constants/items.h
# src/battle_interface.c
|
2022-10-07 14:52:32 -03:00 |
|
ghoulslash
|
5f6e97af7f
|
Merge pull request #2283 from AsparagusEduardo/RHH/pr/pokemonConfig
Toggles for Pokémon species by generation
|
2022-10-07 13:24:13 -04:00 |
|
Eduardo Quezada
|
9b977486fe
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig
# Conflicts:
# src/data/pokemon/base_stats.h
|
2022-10-07 14:05:45 -03:00 |
|
LOuroboros
|
50ca188cb2
|
Replaced didMegaEvo with a shiny new species flag
|
2022-10-07 12:32:36 -03:00 |
|
LOuroboros
|
02c6bc64b2
|
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald-expansion into becomingAHero
|
2022-10-07 12:20:52 -03:00 |
|
ghoulslash
|
441586f23f
|
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags
4 new species flags
|
2022-10-07 10:55:43 -04:00 |
|
ghoulslash
|
d7f7fa7d07
|
Merge pull request #2376 from AsparagusEduardo/RHH/pr/feature/ballsMulti
Changed ballMultiplier to account for future Hisuian ball multipliers
|
2022-10-07 10:48:02 -04:00 |
|
ghoulslash
|
1e04c80dfa
|
Merge pull request #2367 from AsparagusEduardo/RHH/pr/feature/MewTeach
Special handling for Mew's Teachable moveset
|
2022-10-07 10:39:56 -04:00 |
|
ghoulslash
|
7c7eb8ac7f
|
Merge pull request #2365 from AsparagusEduardo/RHH/pr/BattleArenaBide
Added missing Bide exception to Battle Arena Mind Points
|
2022-10-07 10:32:47 -04:00 |
|
ghoulslash
|
923046c993
|
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925
I don't have any Sunday memes (pret merge 2022-09-25)
|
2022-10-07 10:25:59 -04:00 |
|
GriffinR
|
bb2e64b3fc
|
Merge pull request #1786 from tustin2121/patch-spritestuff
Subsprite Tables Documentation
|
2022-10-06 22:17:32 -04:00 |
|
tustin2121
|
ea168d1a6b
|
Fix typo 2: revelations
|
2022-10-06 20:34:46 -04:00 |
|
tustin2121
|
f3bddd1ea6
|
Fix typo
|
2022-10-06 19:36:01 -04:00 |
|
GriffinR
|
e293986fbb
|
Merge pull request #1793 from GriffinRichards/clean-shop
Clean up shop.c
|
2022-10-06 17:24:53 -04:00 |
|
GriffinR
|
c6e4c29ea3
|
Merge pull request #1792 from GriffinRichards/display-tiles
Add DISPLAY_TILE_* constants
|
2022-10-05 20:44:28 -04:00 |
|
GriffinR
|
cefbf5986c
|
Merge pull request #1797 from AsparagusEduardo/pret/pr/item
Removed unused functions in item header
|
2022-10-04 22:42:42 -04:00 |
|
Eduardo Quezada
|
a20334f79a
|
Removed unused functions in item header
|
2022-10-04 22:06:07 -03:00 |
|
Eduardo Quezada
|
e8ed0bd9f2
|
Changed ballMultiplier to account for future Hisuian ball multipliers
|
2022-10-04 20:39:45 -03:00 |
|
Eduardo Quezada
|
6bcaaad8a3
|
Ordered Gen 8 egg moves
|
2022-10-03 16:12:32 -03:00 |
|
Eduardo Quezada
|
7d7c0927a2
|
Ordered Gen 7 egg moves
|
2022-10-03 16:07:35 -03:00 |
|
Eduardo Quezada
|
38ef41a827
|
Ordered Gen 6 egg moves
|
2022-10-03 14:46:49 -03:00 |
|
Eduardo Quezada
|
167889c54e
|
Ordered Gen 5 egg moves
|
2022-10-03 14:37:33 -03:00 |
|
Eduardo Quezada
|
8e7fa2097f
|
Ordered Gen 4 egg moves
|
2022-10-03 14:29:11 -03:00 |
|
Eduardo Quezada
|
dfe2ea3a43
|
Ordered Gen 3 egg moves
|
2022-10-03 14:25:01 -03:00 |
|
Eduardo Quezada
|
4407437029
|
Ordered Gen 2 egg moves
|
2022-10-03 12:59:01 -03:00 |
|
Eduardo Quezada
|
7fd91264c0
|
Ordered form cries
|
2022-10-03 12:54:50 -03:00 |
|
Eduardo Quezada
|
ed2f69d3ef
|
Fixed compiling when disabling species
|
2022-10-03 12:43:06 -03:00 |
|
Eduardo Quezada
|
b160bd9626
|
Ordered Gen 1 egg moves
|
2022-10-03 11:54:10 -03:00 |
|
Eduardo Quezada
|
70907fa375
|
merging in mon animations PR
# Conflicts:
# src/data/pokemon_graphics/front_pic_anims.h
# src/pokemon.c
|
2022-10-02 21:20:56 -03:00 |
|
Eduardo Quezada
|
fe107645f7
|
Merged pallete conversion
# Conflicts:
# include/constants/pokemon_config.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
|
2022-10-02 16:01:55 -03:00 |
|
Eduardo Quezada D'Ottone
|
6a224e3ad1
|
Reordered gen 8 TeachableLearnsets
|
2022-10-01 22:52:29 -03:00 |
|
Eduardo Quezada D'Ottone
|
325c38b7d7
|
Reordered gen 7 TeachableLearnsets
|
2022-10-01 22:37:03 -03:00 |
|
Eduardo Quezada D'Ottone
|
52c87be04b
|
Reordered gen 6 TeachableLearnsets
|
2022-10-01 21:58:28 -03:00 |
|
Eduardo Quezada D'Ottone
|
d9bae8ea2d
|
Reordered gen 5 TeachableLearnsets
|
2022-10-01 21:51:25 -03:00 |
|
Eduardo Quezada D'Ottone
|
d0895a7c32
|
Merge pull request #2370 from StephenLynx/master
Fixed berserk not activating if mon falls to exactly half HP.
|
2022-10-01 21:30:44 -03:00 |
|
Sérgio Augusto Vianna
|
764bed6580
|
Fixed berserk not activating if mon falls to exactly half HP.
|
2022-10-01 20:50:55 -03:00 |
|
Eduardo Quezada D'Ottone
|
b33ceee9ec
|
Reordered gen 4 TeachableLearnsets
|
2022-10-01 20:34:52 -03:00 |
|
Eduardo Quezada D'Ottone
|
8ca0c59a88
|
Reordered gen 3 TeachableLearnsets
|
2022-10-01 18:05:21 -03:00 |
|
Eduardo Quezada D'Ottone
|
5c974b9182
|
Removed event moves from Smeargle
|
2022-10-01 18:00:32 -03:00 |
|
Eduardo Quezada D'Ottone
|
af171eb4d4
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
# Conflicts:
# src/pokemon_summary_screen.c
|
2022-10-01 17:32:32 -03:00 |
|
Eduardo Quezada
|
0370cb3fd2
|
Removed comment MAP_GROUP_COUNT
|
2022-09-30 22:05:10 -03:00 |
|
Jaizu
|
34c0a5bd8a
|
Spiky Eared Pichu second frame
|
2022-09-30 17:54:11 -03:00 |
|