atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11497 commits 2 branches 40 tags 600 MiB
Commit graph

8161 commits

Author SHA1 Message Date
Eduardo Quezada
7ed16b55ed Scatterbug and Spewpa forms 2022-09-23 07:56:27 -03:00
Eduardo Quezada
171664bc55 Merge remote-tracking branch 'RHH_origin/dev' into RHH/concept/speciesReorder 2022-09-21 22:32:17 -03:00
Eduardo Quezada
eda1dce876 More reordering, using form constants 2022-09-21 22:31:33 -03:00
StubbornOne
cad8922d7b Replace battle-type flags in GetAiLogicData with BATTLE_TYPE_HAS_AI 2022-09-21 23:42:40 +08:00
Eduardo Quezada
41774f49ed Ordered gen 3 data 2022-09-20 14:52:13 -03:00
Eduardo Quezada
ad89897500 Using base forms in tables 2022-09-20 08:18:00 -03:00
LOuroboros
d04a852e91
Update debug.c 2022-09-20 02:31:20 -03:00
Eduardo Quezada
a6a032c3cf Using base forms in tables 2022-09-20 00:00:34 -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
24aebf0624
Merge pull request #2337 from LOuroboros/patch-2 
Renamed some misclassified labels in src/debug.c
 2022-09-19 14:33:51 -03:00
Eduardo Quezada D'Ottone
6868d8aa2a
Merge pull request #2338 from LOuroboros/BoxMonMon 
Fixed typo in BoxMonKnowsMove
 2022-09-19 14:33:12 -03:00
Eduardo Quezada
192312d7ee Extrapolated Battle Arena's move Mind ratings 2022-09-19 14:29:22 -03:00
LOuroboros
5f67335212 Fixed typo in BoxMonKnowsMove 2022-09-19 05:21:54 -03:00
LOuroboros
c137b01dd8
Update debug.c 2022-09-19 04:19:19 -03:00
ghoulslash
add3625589 fix natural cure, shed skin, early bird check in ShouldSwitchIfGameStatePrompt 2022-09-18 22:47:30 -04:00
Eduardo Quezada
adb4e54e95 Fixed multi battle battler coordinates and party menu when only one Pokémon is chosen 2022-09-18 22:34:06 -03:00
Eduardo Quezada D'Ottone
41ae8ecdb7
Update src/battle_controller_opponent.c 2022-09-18 00:51:34 -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
ed81ec41bc
Merge pull request #2324 from ghoulslash/be/aiswitch 
fix ai switch semi invulnerable
 2022-09-15 23:15:02 -04:00
ghoulslash
95a3ead254 styling fix 2022-09-15 22:10:39 -04: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
20190ac85a fix ai switch semi invulnerable 2022-09-15 18:34:15 -04: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
41d11b0708 Restored filename format for gendered species 2022-09-14 11:13:42 -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
Eduardo Quezada
ee628de82f Config to turn off Hippopotas' and Hippowdon's female icons 2022-09-13 21:42:53 -03:00
Eduardo Quezada
0caf79f702 Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2 
# Conflicts:
#	graphics/pokemon/cherrim/anim_front.png
#	graphics/pokemon/scyther/anim_front.png
#	graphics/pokemon/scyther/front.png
#	graphics/pokemon/shinx/anim_front.png
#	src/data/pokemon_graphics/back_pic_table.h
#	src/data/pokemon_graphics/front_pic_table.h
#	src/data/pokemon_graphics/palette_table.h
#	src/data/pokemon_graphics/shiny_palette_table.h
#	src/pokemon_icon.c
 2022-09-13 20:44:49 -03:00
Eduardo Quezada
c68ca72fb0 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 2022-09-13 16:26:59 -03: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
c1dfd3c9ec
Merge pull request #1763 from GriffinRichards/rm-global 
Drop usage of global directive
 2022-09-13 15:08:37 -04:00
LOuroboros
2d841a25f9
Removed unused extern declaration of old gUnknown func 2022-09-13 15:45:01 -03:00
GriffinR
91c040b081
Merge pull request #1777 from AsparagusEduardo/pret/pr/trailingWhitespace 
Cleaned trailing whitespace
 2022-09-13 14:00:11 -04:00
Ct11217
96d190f5ad Updated Toxic Status Counter 2022-09-12 20:39:21 -06: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
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
Eduardo Quezada
69f01d73cd Added missing uses of Fairy type for Union Room and Battle Factory 2022-09-11 12:41:56 -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
5e399955d5 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/monAnimations 2022-09-09 17:37:23 -04:00
Eduardo Quezada
503b85aa2d Generating music names for the debug menu based on their labels 2022-09-09 16:44:34 -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
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
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
2336e58c54 Back pic coordinates 2022-09-08 21:19:12 -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
LOuroboros
db6d285f00
Small syntax fix for CanLearnTeachableMove 2022-09-08 17:53:15 -03: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
Eduardo Quezada
5af46ead83 Actually done with Gen 3 now 2022-09-08 14:34:05 -04: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
297a8a86f0 Reordered unown in macros 2022-09-08 11:23:48 -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
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
47a50b3dac
Merge branch 'master' into weather_forms_fixes 2022-09-07 23:07:25 -04:00
LOuroboros
05c13614c6
Undefined temporary preproc macro HIBYTE 2022-09-07 13:41:48 -03: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
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
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