Eduardo Quezada
|
ccb8d7a857
|
Reordered evolutions and added constants for new evo methods
|
2022-09-28 00:15:45 -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 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 |
|
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
|
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
|
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
|
dff6c17bd5
|
Started ordering Gen 6
|
2022-09-10 21:43:43 -04: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
|
7853ef5c14
|
BW, B2W2
|
2022-09-08 22:27:42 -04:00 |
|
Eduardo Quezada
|
2eb03172cc
|
Swapped default form defaults
|
2022-09-08 20:31:02 -04:00 |
|
Eduardo Quezada
|
52e084c5f1
|
Reserved ID for Shadow Lugia
|
2022-09-08 18:34:57 -04:00 |
|
Eduardo Quezada
|
486a836034
|
Platinum and HGSS forms
|
2022-09-08 17:37:14 -04:00 |
|
Eduardo Quezada
|
f30605822c
|
Arceus DP
|
2022-09-08 16:17:12 -04:00 |
|
Eduardo Quezada
|
6cae7a74d3
|
Cherrim, Shellos and Gastrodon
|
2022-09-08 16:16:28 -04:00 |
|
Eduardo Quezada
|
b4f99294e1
|
Normal form defines
|
2022-09-08 14:41:07 -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
|
e132eff850
|
Finished with Gen 3 forms
|
2022-09-08 12:15:38 -04:00 |
|
Eduardo Quezada
|
836fabc992
|
IDs aligned + fixed Zygarde
|
2022-09-08 10:13:28 -04:00 |
|
Eduardo Quezada
|
ca14a46215
|
Moved Unown forms
|
2022-09-08 09:56:45 -04: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 |
|