Commit graph

11621 commits

Author SHA1 Message Date
Eduardo Quezada
dc8dbc3910 Ordered Gen 1 mon graphics in src/data/graphics/pokemon.h 2022-10-24 09:33:36 -03:00
Eduardo Quezada
5f6fa958c4 Reordered pokemon front pic data 2022-10-19 12:04:52 -03:00
Eduardo Quezada
bd9877563a Species name read from form instead of dex number 2022-10-19 11:34:44 -03:00
Eduardo Quezada
d17cb7eebc Loads footprint from form instead of dex number 2022-10-19 11:27:54 -03:00
Eduardo Quezada
05c07bdb48 Assigned footprints to forms 2022-10-19 11:25:28 -03:00
Eduardo Quezada
feecaf4e58 Ordered palette tables 2022-10-19 10:47:26 -03:00
Eduardo Quezada
2456553da0 Reordered back pic table 2022-10-19 10:24:23 -03:00
Eduardo Quezada
612fe51a8c Reordered front pic table 2022-10-19 09:47:52 -03:00
Eduardo Quezada
14e2ea5d15 Moved Gen 3 dex entries to base stats 2022-10-18 12:12:27 -03:00
Eduardo Quezada
993e1072e1 Fixed getting weight/height, cry and area 2022-10-17 15:22:41 -03:00
Eduardo Quezada
0c34b6cdcb Moved Gen 2 dex entries to base stats 2022-10-17 15:20:53 -03:00
Eduardo Quezada
bde28f33a1 Form height order 2022-10-17 00:38:34 -03:00
Eduardo Quezada
911a9aaf02 Reading dex data from base stats 2022-10-17 00:04:12 -03:00
Eduardo Quezada
713b646a46 Moved Gen 1 dex entries to base stats 2022-10-16 23:24:20 -03:00
Eduardo Quezada
eff21004f8 Option to separate dex letter filter by single letter 2022-10-11 11:41:57 -03:00
Eduardo Quezada
95b32afbc0 Merge remote-tracking branch 'TheXaman/rhh_pokemon_expansion_formsDexData' into RHH/pr/breaking/speciesReorder
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/pokedex_text.h
#	src/pokedex.c
2022-10-11 02:48:46 -03:00
Eduardo Quezada
a0d9f6f5d7 Enamorus 2022-10-11 02:02:49 -03:00
Eduardo Quezada
5dc27ed441 Show forms when browsing by weight 2022-10-11 01:39:08 -03:00
Eduardo Quezada
f84a1edc48 Shows the first form seen by form table order 2022-10-10 22:12:11 -03:00
Eduardo Quezada
ee03065904 Base form check 2022-10-10 20:29:12 -03:00
Eduardo Quezada
790afb9460 GetSetPokedexCaughtFlag 2022-10-10 18:43:57 -03:00
Eduardo Quezada
6a65a7ba79 Adapted functions 2022-10-10 18:17:56 -03:00
Eduardo Quezada
0f53923bd9 Different amount of flags for seen vs caught 2022-10-10 17:22:59 -03:00
Eduardo Quezada
69243b7618 Function to get form tables 2022-10-10 16:52:19 -03:00
Eduardo Quezada
24d2a1765e Form species tables based on national dex number 2022-10-10 16:49:01 -03:00
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