Eduardo Quezada
|
ccb8d7a857
|
Reordered evolutions and added constants for new evo methods
|
2022-09-28 00:15:45 -03:00 |
|
Eduardo Quezada
|
5b4a23b672
|
include/graphics.h
|
2022-09-27 21:09:09 -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 |
|
ghoulslash
|
8ecdf68491
|
Merge pull request #2360 from TheXaman/rhh_pokemon_debug_fix
Fixes: Pokémon Debug isn't loading female icon palettes correctly
|
2022-09-26 09:09:14 -04:00 |
|
Eduardo Quezada
|
dfdfb72365
|
Separate config for updated move types
|
2022-09-26 07:50:43 -03:00 |
|
TheXaman
|
886a487bf1
|
Added LoadMonIconPalettePersonality to load gender specific pokemon icon palettes
|
2022-09-26 12:40:30 +02:00 |
|
Eduardo Quezada D'Ottone
|
17c8842ad4
|
Merge branch 'dev' into teleport
|
2022-09-24 14:39:21 -03:00 |
|
Eduardo Quezada D'Ottone
|
38df216ebd
|
Merge pull request #2355 from ghoulslash/be/aiparty
Add overwrittenAbilities field
|
2022-09-24 14:33:02 -03:00 |
|
ghoulslash
|
c22671d2a2
|
add overwrittenAbilities field
|
2022-09-24 12:12:31 -04:00 |
|
Eduardo Quezada D'Ottone
|
a483899043
|
Merge branch 'dev' into symbiosis
|
2022-09-24 11:58:35 -03:00 |
|
Eduardo Quezada D'Ottone
|
d59d8b92af
|
Merge branch 'dev' into AI
|
2022-09-24 11:07:09 -03:00 |
|
Eduardo Quezada
|
9a03435284
|
Ordering grapjics
|
2022-09-23 22:26:49 -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 |
|
LOuroboros
|
5f67335212
|
Fixed typo in BoxMonKnowsMove
|
2022-09-19 05:21:54 -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 |
|
Eduardo Quezada D'Ottone
|
7825153bb2
|
Merge pull request #2282 from AsparagusEduardo/RHH/pr/tutorFix
Exp Candy Fixes
|
2022-09-15 22:46:59 -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 |
|
GriffinR
|
91c040b081
|
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace
Cleaned trailing whitespace
|
2022-09-13 14:00:11 -04:00 |
|
GriffinR
|
4c34babb4d
|
Merge pull request #1780 from LOuroboros/raquaza
Fixed a typo and scripting vars alignment
|
2022-09-12 22:02:46 -04: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
|
5eb9312250
|
Added missing labels in headers
|
2022-09-12 21:14:15 -03:00 |
|
GriffinR
|
d3d8b4a181
|
Merge pull request #1762 from GriffinRichards/sync-fieldmap
Sync fieldmap
|
2022-09-12 14:32:27 -04:00 |
|
Eduardo Quezada
|
65108c3192
|
Cleaned trailing whitespace
|
2022-09-11 14:14:49 -04:00 |
|
Eduardo Quezada
|
61752a4977
|
Added parenthesis to GET_SHINY_VALUE
|
2022-09-11 13:35:58 -04: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
|
29529a0c47
|
Remove primal_particle leftovers
|
2022-09-09 22:28:11 +07:00 |
|
Blackforest92
|
d870d71dbe
|
Remove windstorm_brew leftovers
|
2022-09-09 22:26:29 +07:00 |
|
Blackforest92
|
431cb6fa7c
|
Tidying graphics - Trio Weather
|
2022-09-09 21:57:40 +07:00 |
|
Eduardo Quezada
|
9144779634
|
Removed repeated extern consts in strings.h
|
2022-09-09 08:49:16 -04:00 |
|
Eduardo Quezada
|
bb6de0b009
|
Reordered B2W2 assets
|
2022-09-09 07:51:39 -04: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 |
|