Eduardo Quezada
|
a3d84b0cc8
|
Merge remote-tracking branch 'RHH_origin/wip-2.0.0' into RHH/pr/breaking/speciesReorder
# Conflicts:
# src/data/pokemon/level_up_learnsets.h
|
2022-10-27 09:21:30 -03:00 |
|
Eduardo Quezada
|
8fc6cf7a14
|
Macros
|
2022-10-26 22:17:00 -03:00 |
|
Eduardo Quezada
|
eed8e19529
|
Removed extra Toxtricity and Alcremie Gigantamax forms
|
2022-10-25 16:51:12 -03:00 |
|
Eduardo Quezada
|
ecd34a351b
|
Ordered Gen 1-3 mon to vanilla order
|
2022-10-25 16:28:18 -03:00 |
|
Eduardo Quezada
|
8462176667
|
Tentative version for base stat changes
|
2022-10-25 14:45:42 -03:00 |
|
Eduardo Quezada D'Ottone
|
4cbc6d4de1
|
Config for running indoors
|
2022-10-14 22:31:45 -03:00 |
|
LOuroboros
|
90f79999bb
|
Added class-based Poké Balls for trainers
Thanks to Ghoulslash for helping me optimizing things.
|
2022-10-14 11:14:30 -03:00 |
|
Eduardo Quezada
|
eff21004f8
|
Option to separate dex letter filter by single letter
|
2022-10-11 11:41:57 -03:00 |
|
Eduardo Quezada
|
5dc27ed441
|
Show forms when browsing by weight
|
2022-10-11 01:39:08 -03:00 |
|
Eduardo Quezada
|
0f53923bd9
|
Different amount of flags for seen vs caught
|
2022-10-10 17:22:59 -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 |
|
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 |
|
Eduardo Quezada
|
8ea060044a
|
Battle text pauses config
|
2022-10-07 17:22:29 -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 |
|
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 |
|
ghoulslash
|
441586f23f
|
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags
4 new species flags
|
2022-10-07 10:55:43 -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
|
e293986fbb
|
Merge pull request #1793 from GriffinRichards/clean-shop
Clean up shop.c
|
2022-10-06 17:24:53 -04: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
|
0370cb3fd2
|
Removed comment MAP_GROUP_COUNT
|
2022-09-30 22:05:10 -03:00 |
|
Eduardo Quezada
|
ccb8d7a857
|
Reordered evolutions and added constants for new evo methods
|
2022-09-28 00:15:45 -03:00 |
|
Eduardo Quezada
|
ecad6ff0db
|
Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2
|
2022-09-27 10:46:49 -03:00 |
|
Eduardo Quezada
|
fb9105f8ac
|
Added Mega Evolution flag
|
2022-09-27 10:21:26 -03:00 |
|
Eduardo Quezada
|
3d214f8204
|
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags
# Conflicts:
# src/pokemon.c
|
2022-09-27 10:13:32 -03:00 |
|
Eduardo Quezada
|
4c7b6d1662
|
Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/speciesReorder
# Conflicts:
# src/battle_script_commands.c
|
2022-09-26 17:46:30 -03:00 |
|
Eduardo Quezada
|
dfdfb72365
|
Separate config for updated move types
|
2022-09-26 07:50:43 -03:00 |
|
Eduardo Quezada
|
f969effd36
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
|
2022-09-25 12:51:39 -03:00 |
|
Eduardo Quezada D'Ottone
|
17c8842ad4
|
Merge branch 'dev' into teleport
|
2022-09-24 14:39:21 -03:00 |
|
Eduardo Quezada D'Ottone
|
a483899043
|
Merge branch 'dev' into symbiosis
|
2022-09-24 11:58:35 -03:00 |
|
Eduardo Quezada
|
7ed16b55ed
|
Scatterbug and Spewpa forms
|
2022-09-23 07:56:27 -03:00 |
|
GriffinR
|
1107ff954d
|
Clean up shop.c
|
2022-09-22 15:08:17 -04:00 |
|
Eduardo Quezada
|
eda1dce876
|
More reordering, using form constants
|
2022-09-21 22:31:33 -03:00 |
|
Eduardo Quezada
|
ad89897500
|
Using base forms in tables
|
2022-09-20 08:18:00 -03:00 |
|
Eduardo Quezada
|
a6a032c3cf
|
Using base forms in tables
|
2022-09-20 00:00:34 -03:00 |
|
Eduardo Quezada
|
268b666104
|
Fixed order + Cry orders
|
2022-09-19 22:26:53 -03:00 |
|
Eduardo Quezada
|
ff34d0efd3
|
Merge remote-tracking branch 'RHH_origin/dev' into RHH/concept/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/level_up_learnsets.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
|
2022-09-19 19:26:24 -03:00 |
|
Eduardo Quezada
|
ea40ac8629
|
Reordered species IDs for Gen 8
|
2022-09-19 18:47:15 -03:00 |
|
Eduardo Quezada D'Ottone
|
681ad8c7a9
|
Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig
# Conflicts:
# 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_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
|
2022-09-18 18:25:05 -03:00 |
|
Eduardo Quezada D'Ottone
|
293a880238
|
Apply suggestions from code review
|
2022-09-18 00:50:21 -03:00 |
|
Ct11217
|
5f74781a7d
|
Remove ACE_POKEMON_FUNCTIONALITY
|
2022-09-17 17:44:50 -06:00 |
|
ghoulslash
|
8bbe1b9037
|
Merge pull request #2327 from AsparagusEduardo/RHH/pr/Metronome
Config to limit the moves called by Metronome (by generation)
|
2022-09-16 11:03:33 -04:00 |
|
Eduardo Quezada
|
6b79c7772c
|
Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909
# Conflicts:
# src/battle_interface.c
|
2022-09-16 11:56:50 -03:00 |
|
Eduardo Quezada
|
672f572ff8
|
Config to limit the moves called by Metronome (by generation)
|
2022-09-16 11:04:30 -03:00 |
|
ghoulslash
|
6616c89451
|
Merge pull request #2303 from Blackforest92/RHH-PR-Branch
Tidying graphics - Trio Weather
|
2022-09-15 18:01:43 -04:00 |
|
ghoulslash
|
354a8256e4
|
Merge pull request #2226 from Porygon23/AI-Logic-Updates
Added corner case logic for AI Switching.
|
2022-09-15 17:56:35 -04:00 |
|
Eduardo Quezada
|
bca1267ca8
|
Altered MAX_FRONTIER_PARTY_SIZE to be automatically calculated by the other frontier party sizes
|
2022-09-15 14:52:18 -03:00 |
|
Eduardo Quezada
|
ee628de82f
|
Config to turn off Hippopotas' and Hippowdon's female icons
|
2022-09-13 21:42:53 -03:00 |
|
Eduardo Quezada
|
0caf79f702
|
Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2
# Conflicts:
# graphics/pokemon/cherrim/anim_front.png
# graphics/pokemon/scyther/anim_front.png
# graphics/pokemon/scyther/front.png
# graphics/pokemon/shinx/anim_front.png
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
|
2022-09-13 20:44:49 -03:00 |
|
Eduardo Quezada
|
de32940fdf
|
Further removed trailing whitespaces
|
2022-09-13 16:26:36 -03:00 |
|