Commit Graph

11294 Commits

Author SHA1 Message Date
Porygon23
36c1c4dc11
Update include/battle_ai_switch_items.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
2022-09-16 08:21:13 -06:00
Ct11217
cc4a9b9f4b Recommit to Dev branch 2022-09-15 22:57:29 -06: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
133aa9e28d
Merge pull request #2306 from AsparagusEduardo/RHH/pr/autogenNames
Generating music names for the debug menu based on their labels
2022-09-15 18:02:27 -04: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
6cfacb396e
Merge pull request #2307 from AsparagusEduardo/RHH/pr/debugMapCount
Automated creation of MAP_GROUP_COUNT for the debug menu
2022-09-15 18:01:05 -04:00
ghoulslash
5bdd292dc3
Merge pull request #2310 from AsparagusEduardo/RHH/pr/FairyUses
Added missing uses of Fairy type for Union Room and Battle Factory
2022-09-15 18:00:38 -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 D'Ottone
8f0054a0cd
Merge pull request #2315 from TheXaman/rhh_debug_flicker_fix
Debug menu: removes flickering, adds weather menu, misc. fixes
2022-09-14 11:05:46 -03:00
TheXaman
ef4e64c2f7 -added a submenu to set the weather
-lowest flag is 1
2022-09-14 15:19:23 +02:00
TheXaman
1e03b4747f debug menu: object events now frozen while open 2022-09-14 13:43:26 +02:00
TheXaman
2c20514035 improved debug menu function declaration consistency 2022-09-14 13:39:35 +02:00
Ct11217
96d190f5ad Updated Toxic Status Counter 2022-09-12 20:39:21 -06: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
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
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
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 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
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 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
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 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