AgustinGDLV
|
0663510583
|
merged regi battle type into BATTLE_TYPE_LEGENDARY
|
2022-10-27 19:52:52 -07:00 |
|
AgustinGDLV
|
caaec99e77
|
added data and graphics for gigantamax mons
|
2022-10-27 16:18:37 -07:00 |
|
AgustinGDLV
|
056048daf9
|
added data for max moves
|
2022-10-27 13:17:15 -07:00 |
|
AgustinGDLV
|
7981887f0a
|
merge kyogre, groudon, rayquaza battle types
|
2022-10-27 11:20:46 -07: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
|
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
|
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 |
|
GriffinR
|
1107ff954d
|
Clean up shop.c
|
2022-09-22 15:08:17 -04: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
|
de32940fdf
|
Further removed trailing whitespaces
|
2022-09-13 16:26:36 -03:00 |
|
Eduardo Quezada
|
1d7e8bd730
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
|
2022-09-13 16:22:42 -03:00 |
|
LOuroboros
|
14c6d8b91a
|
Fixed alignment for the value of vars 0x4020 to 0x40FF
|
2022-09-12 21:33:03 -03:00 |
|
LOuroboros
|
cb83a09203
|
Fixed vars alignment
|
2022-09-12 21:27:53 -03:00 |
|
LOuroboros
|
222362e804
|
Fixed Raquaza typo
|
2022-09-12 21:26:22 -03:00 |
|
Eduardo Quezada
|
4b1aca19cb
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
# Conflicts:
# src/battle_controller_link_opponent.c
# src/battle_controller_opponent.c
# src/battle_controller_recorded_opponent.c
# src/battle_controllers.c
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
# src/pokemon.c
|
2022-09-10 00:17:03 -04:00 |
|
LOuroboros
|
12fee71008
|
Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE
|
2022-09-09 15:39:48 -03:00 |
|
Eduardo Quezada D'Ottone
|
69d3fafdcf
|
Merge pull request #2273 from LOuroboros/zazaForms
Introduced FORM_BATTLE form changes
|
2022-09-09 14:15:53 -04:00 |
|
Blackforest92
|
431cb6fa7c
|
Tidying graphics - Trio Weather
|
2022-09-09 21:57:40 +07:00 |
|
Eduardo Quezada
|
8449f237c2
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags
# Conflicts:
# src/pokemon.c
|
2022-09-09 09:02:35 -04:00 |
|
Eduardo Quezada
|
21df8c279b
|
Added SPECIES_FLAG_CANNOT_BE_TRADED
- Also corrected Cylarex's forms not having the legendary flag
|
2022-09-09 08:59:53 -04:00 |
|
Blackforest92
|
caf323a653
|
Erase ghost data in include/constants/map_groups.h
|
2022-09-09 00:40:30 +07:00 |
|
Blackforest92
|
3acb32acb8
|
Tyding graphics - Acupressure
|
2022-09-09 00:25:43 +07:00 |
|
Eduardo Quezada
|
7fe1e706b7
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonConfig
# Conflicts:
# include/constants/pokemon_config.h
|
2022-09-08 08:52:13 -04:00 |
|
Eduardo Quezada D'Ottone
|
066a5bee85
|
Merge pull request #2277 from TheXaman/tx_debug_system_rhh
Inclusion of the tx_debug_system
|
2022-09-08 00:26:37 -04:00 |
|
Eduardo Quezada D'Ottone
|
47a50b3dac
|
Merge branch 'master' into weather_forms_fixes
|
2022-09-07 23:07:25 -04:00 |
|
GriffinR
|
74b563f696
|
Merge pull request #1749 from GriffinRichards/ur-classes
Fix names and constant usage for union room classes
|
2022-09-06 21:35:10 -04:00 |
|
LOuroboros
|
8705d1656b
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into teleport
|
2022-09-06 20:38:28 -03:00 |
|
TheXaman
|
6062cf45fa
|
Merge branch 'master' into tx_debug_system_rhh
|
2022-09-07 00:03:58 +02:00 |
|
LOuroboros
|
f1c153e469
|
Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD
There was never a reason not to.
|
2022-09-06 18:37:16 -03:00 |
|
Eduardo Quezada
|
3a6318f1d9
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/configRefactor
# Conflicts:
# include/constants/battle_config.h
|
2022-09-06 15:20:54 -04:00 |
|
ghoulslash
|
971081b8fd
|
Merge pull request #2286 from AsparagusEduardo/RHH/pr/pretMerge_20220902
Flat Merge Friday (Weekly merge)
|
2022-09-06 15:13:47 -04:00 |
|
LOuroboros
|
0b07f4a06e
|
Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms
|
2022-09-06 10:53:12 -03:00 |
|