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
|
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 |
|
Eduardo Quezada
|
9144779634
|
Removed repeated extern consts in strings.h
|
2022-09-09 08:49:16 -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
|
1fa9bc1b5c
|
Adjusted style of coords tables
|
2022-09-08 18:32:01 -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 |
|
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 |
|
Jaizu
|
d58af1ba92
|
Fix 'y' actually being 'x' in CreatePCMultichoice
|
2022-09-08 10:38:52 +02: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
|
4a6d3d1deb
|
Whitespace
|
2022-09-08 00:19:13 -04:00 |
|
Eduardo Quezada D'Ottone
|
0d4455f951
|
Merge pull request #2150 from Sneed69/weather_forms_fixes
Weather forms fixes and config
|
2022-09-07 23:15:48 -04:00 |
|
Eduardo Quezada D'Ottone
|
47a50b3dac
|
Merge branch 'master' into weather_forms_fixes
|
2022-09-07 23:07:25 -04:00 |
|
GriffinR
|
c5e1feae38
|
Merge pull request #1772 from LOuroboros/patch-1
Undefined temporary preproc macro HIBYTE
|
2022-09-07 16:50:57 -04:00 |
|
LOuroboros
|
05c13614c6
|
Undefined temporary preproc macro HIBYTE
|
2022-09-07 13:41:48 -03:00 |
|
GriffinR
|
af1725793a
|
Merge pull request #1771 from SBird1337/doc/aslr
[doc] fix misnamed dma <--> aslr
|
2022-09-07 10:43:08 -04:00 |
|
sbird
|
3a0759d458
|
[doc] fix misnamed dma <--> aslr
|
2022-09-07 14:37:03 +02:00 |
|
GriffinR
|
281bddcd3d
|
Merge pull request #1765 from AsparagusEduardo/pret/pokefirered_sync4
Implemented review changes from https://github.com/pret/pokefirered/pull/548
|
2022-09-06 21:40:37 -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 |
|
GriffinR
|
f334b61b44
|
Merge pull request #1769 from AsparagusEduardo/pret/pr/frontierTrainerMonAlign
Aligned FRONTIER_MONS trainer macros with the rest for consistency
|
2022-09-06 21:20:49 -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 |
|
LOuroboros
|
a7a1ab9aeb
|
Merged FORM_ITEM_HOLD_ABILITY into FORM_ITEM_HOLD
There was never a reason not to.
|
2022-09-06 19:20:11 -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 |
|
TheXaman
|
94995c54fb
|
fix?
|
2022-09-06 23:35:05 +02:00 |
|
Eduardo Quezada
|
12bb32666b
|
Aligned FRONTIER_MONS trainer macros with the rest for consistency
|
2022-09-06 17:05:56 -04:00 |
|
Eduardo Quezada D'Ottone
|
f79e9f02de
|
Merge pull request #2289 from Blackforest92/RHH-PR-Branch
Tidying Graphics/Battle_Anims
|
2022-09-06 17:02:25 -04:00 |
|
TheXaman
|
b249399a53
|
changed 'B_FLAG_NO_CATCHING' to be evaluated by 'GetBallThrowableState()'
|
2022-09-06 23:00:26 +02:00 |
|
Eduardo Quezada D'Ottone
|
3fe9ef26b5
|
Merge pull request #2299 from ghoulslash/readme_updates
update readme with credits, wiki links
|
2022-09-06 15:52:23 -04:00 |
|
ghoulslash
|
d33e4b0fe8
|
Merge pull request #2297 from AsparagusEduardo/RHH/pr/configRefactor
Config refactor
|
2022-09-06 15:32:37 -04: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
|
79bfbfb1b0
|
Merge pull request #2198 from AsparagusEduardo/BE_BattlePikeComatose
Comatose prevents Battle Pike's status effects.
|
2022-09-06 15:18:48 -04:00 |
|
ghoulslash
|
59de7e48e5
|
Merge pull request #2265 from AsparagusEduardo/RHH_substructFix
Fixed PokemonSubstruct3 alignment
|
2022-09-06 15:14:45 -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 |
|
ghoulslash
|
51a569b66b
|
Merge pull request #2290 from AsparagusEduardo/RHH/pr/ballMulti_fix
Fixed ball multiplier fallthroughs
|
2022-09-06 15:10:28 -04:00 |
|
ghoulslash
|
9e4b18dfe2
|
update readme with credits, wiki links
|
2022-09-06 14:28:52 -04:00 |
|