GriffinR
|
4c34babb4d
|
Merge pull request #1780 from LOuroboros/raquaza
Fixed a typo and scripting vars alignment
|
2022-09-12 22:02:46 -04:00 |
|
GriffinR
|
e7a459c778
|
Merge pull request #1781 from AsparagusEduardo/pret/pr/argumentsHeaders
Added missing labels in headers
|
2022-09-12 21:27:57 -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 |
|
TheXaman
|
806106b537
|
removed flickering in debug menu @Jaizu
|
2022-09-12 12:12:26 +02:00 |
|
Eduardo Quezada D'Ottone
|
17fecd5996
|
Merge pull request #2313 from LOuroboros/intrepidDoges
Fixed the hero duo's abilities
|
2022-09-11 21:45:18 -04:00 |
|
Eduardo Quezada D'Ottone
|
6cbcbf41da
|
Merge pull request #2314 from LOuroboros/abilityPopUps
Fixed ability pop ups
|
2022-09-11 21:41:51 -04:00 |
|
LOuroboros
|
fc65a483aa
|
Fixed ability pop ups
|
2022-09-11 22:34:24 -03:00 |
|
LOuroboros
|
717d06bd17
|
Fixed the hero duo's abilities in doubles
|
2022-09-11 21:57:42 -03:00 |
|
LOuroboros
|
e624f205ba
|
Added CompareStat checks for the hero duo's abilities
|
2022-09-11 21:46:40 -03:00 |
|
Eduardo Quezada
|
65108c3192
|
Cleaned trailing whitespace
|
2022-09-11 14:14:49 -04:00 |
|
GriffinR
|
91cba0e648
|
Merge pull request #1776 from AsparagusEduardo/pret/pr/ShinyValue
Added parenthesis to GET_SHINY_VALUE
|
2022-09-11 13:49:50 -04:00 |
|
Eduardo Quezada
|
61752a4977
|
Added parenthesis to GET_SHINY_VALUE
|
2022-09-11 13:35:58 -04:00 |
|
Eduardo Quezada
|
69f01d73cd
|
Added missing uses of Fairy type for Union Room and Battle Factory
|
2022-09-11 12:41:56 -04:00 |
|
Eduardo Quezada D'Ottone
|
c340f8f051
|
Merge pull request #2309 from Jaizu/patch-28
Fix Lure prices
|
2022-09-11 12:13:26 -04:00 |
|
Jaizu
|
0daeee83f3
|
Fix Lure prices
This change reflects the original prices used in Pokémon let's go pikachu/eevee
|
2022-09-11 18:06:05 +02: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 |
|
Eduardo Quezada
|
a462db5e69
|
Automated creation of MAP_GROUP_COUNT for the debug menu
|
2022-09-09 23:34:05 -04:00 |
|
Eduardo Quezada
|
503b85aa2d
|
Generating music names for the debug menu based on their labels
|
2022-09-09 16:44:34 -04:00 |
|
Eduardo Quezada D'Ottone
|
6e7f139716
|
Merge pull request #2304 from LOuroboros/shashaForms
Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE
|
2022-09-09 15:35:09 -04:00 |
|
LOuroboros
|
ceb0c67bcf
|
Modified check in case FORM_ITEM_USE of GetFormChangeTargetSpeciesBoxMon
|
2022-09-09 16:17:13 -03: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 |
|
LOuroboros
|
e8832a2655
|
Updated FORM_ITEM_HOLD check in GetFormChangeTargetSpeciesBoxMon
|
2022-09-09 14:56:12 -03:00 |
|
GriffinR
|
c3623bc928
|
Merge pull request #1775 from AsparagusEduardo/pret/pr/repeatedStrings
Removed repeated extern consts in strings.h
|
2022-09-09 12:53:55 -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 |
|
ghoulslash
|
61cde312cc
|
Merge pull request #2301 from Blackforest92/RHH-PR-Branch
Tyding graphics - Acupressure
|
2022-09-09 10:26:23 -04: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 |
|
GriffinR
|
ecb75ee514
|
Merge pull request #1774 from AsparagusEduardo/pret/pr/monCoords
Adjusted style of coords tables
|
2022-09-08 21:48:05 -04:00 |
|
Eduardo Quezada
|
2336e58c54
|
Back pic coordinates
|
2022-09-08 21:19:12 -04:00 |
|
Eduardo Quezada
|
63c9e184a0
|
Better way to default cries to Unown
|
2022-09-08 20:32:41 -04:00 |
|
Eduardo Quezada
|
2eb03172cc
|
Swapped default form defaults
|
2022-09-08 20:31:02 -04:00 |
|
Eduardo Quezada
|
5e3a7646e5
|
Coord tables style
|
2022-09-08 18:39:42 -04:00 |
|
Eduardo Quezada
|
52e084c5f1
|
Reserved ID for Shadow Lugia
|
2022-09-08 18:34:57 -04:00 |
|
Eduardo Quezada
|
1fa9bc1b5c
|
Adjusted style of coords tables
|
2022-09-08 18:32:01 -04:00 |
|
Eduardo Quezada
|
486a836034
|
Platinum and HGSS forms
|
2022-09-08 17:37:14 -04:00 |
|
Eduardo Quezada D'Ottone
|
54ad9ec1d3
|
Merge pull request #2302 from LOuroboros/patch-1
Small syntax fix for CanLearnTeachableMove
|
2022-09-08 17:01:15 -04:00 |
|
LOuroboros
|
db6d285f00
|
Small syntax fix for CanLearnTeachableMove
|
2022-09-08 17:53:15 -03:00 |
|
GriffinR
|
75ded96ecf
|
Merge pull request #1773 from Jaizu/patch-27
Fix 'y' actually being 'x' in CreatePCMultichoice
|
2022-09-08 16:31:26 -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
|
93631ba3b9
|
Uncommented level up learnsets
|
2022-09-08 15:10:52 -04:00 |
|