Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,413 Commits 1 Branch 0 Tags
Commit Graph

1527 Commits

Author SHA1 Message Date
Eduardo Quezada
90ad11278d Sorry Mewtwo ^^; 2022-09-28 09:17:10 -03:00
Eduardo Quezada
d24899369f Special handling for Mew's Teachable moveset 2022-09-28 09:04:31 -03:00
Eduardo Quezada
dfdfb72365 Separate config for updated move types 2022-09-26 07:50:43 -03:00
Eduardo Quezada D'Ottone
d59d8b92af
Merge branch 'dev' into AI 2022-09-24 11:07:09 -03: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
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
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
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
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
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
431cb6fa7c Tidying graphics - Trio Weather 2022-09-09 21:57:40 +07:00
Eduardo Quezada
1fa9bc1b5c Adjusted style of coords tables 2022-09-08 18:32:01 -04:00
Blackforest92
3acb32acb8 Tyding graphics - Acupressure 2022-09-09 00:25:43 +07: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
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
Eduardo Quezada
12bb32666b Aligned FRONTIER_MONS trainer macros with the rest for consistency 2022-09-06 17:05:56 -04:00
Eduardo Quezada
7a0838a0f2 Adjusted GetFormChangeTargetSpeciesBoxMon to allow having form changes of the same method in the same table 2022-09-06 10:53:18 -03:00
LOuroboros
0b07f4a06e Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into zazaForms 2022-09-06 10:53:12 -03:00
LOuroboros
bb290d5ab0 Updates 
-Removed the pointless param1 setting in sXerneasFormChangeTable
-Updated the descriptions of Behemoth Blade and Behemoth Bash
-Added a new parameter to the struct FormChange
-Allowed FORM_BATTLE_BEGIN and FORM_BATTLE_END to replace a move through a new function called "TryToSetBattleFormChangeMoves".
-Added missing calls to "CalculateMonStats".
-Renamed BoxPokemon pointer in GetFormChangeTargetSpeciesBoxMon for consistency's sake
-Optimized check inside UndoFormChange (even though the plan is to get rid of that func entirely.)

Special thanks to Blecoutre who fixed my TryToSetBattleFormChangeMoves function. It just wasn't working correctly at all.
 2022-09-06 10:45:07 -03:00
Eduardo Quezada
7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs 
# Conflicts:
#	src/battle_script_commands.c
 2022-09-05 14:43:04 -04:00
tustin2121
33f10d2139 Adding missing externs 
If there are not externs on these forward declarations, it's entirely possible for the program to link and missing data to be assigned to someplace presumed in IWRAM or something.
 2022-09-05 09:49:20 -04:00
LOuroboros
b9a32a93f5 Update src/data/text/move_descriptions.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-08-31 23:39:59 -03:00
LOuroboros
7b8226a8af Added descriptions for LA's moves 2022-08-30 23:05:22 -03:00
LOuroboros
cc86b2fd96 Added Z-Move stats for LA's moves 2022-08-30 20:29:36 -03:00
LOuroboros
c167e2c6cc Added Legends: Arceus' move data 2022-08-30 19:32:44 -03:00
LOuroboros
df88317a98 Introduced FORM_BATTLE form changes 
For species such as Xerneas and Zacian.
 2022-08-29 19:10:52 -03:00
Blackforest92
b209645b20 Changes Origin to Origin Forme 2022-08-29 21:33:28 +07:00
Eduardo Quezada D'Ottone
32a1017c2d
Fixed tab 2022-08-29 10:13:01 -04:00
Blackforest92
61c33f56a0 Updated to latest master branch + add PLA's data to teachable_learnsets.h 2022-08-29 21:01:31 +07:00
Eduardo Quezada D'Ottone
8ca2f949e3
Merge pull request #2233 from gruxor/tmhm_rework 
Reworked TMHM into expandable list format
 2022-08-29 04:20:45 -04:00
Blackforest92
d6998d4579 Edited PLA' pokedex_text.h 2022-08-28 19:55:45 +07:00
Eduardo Quezada
69f4c226f0 Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs 
# Conflicts:
#	src/battle_ai_main.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_script_commands.c
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2022-08-27 02:42:22 -04:00
crater-git
f8fb4e8cf2 Renamed funcs, lists, etc. - Teach->Teachable 2022-08-26 14:48:06 -04:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy 
Gen 8 EXP Candies
 2022-08-25 23:03:24 -04:00
Eduardo Quezada D'Ottone
6b414d9555
Apply suggestions from code review 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-08-25 22:40:19 -04:00
crater-git
ed02c4b425 Removed tutor move distinction, combined llists 2022-08-25 19:56:47 -04:00
AgustinGDLV
e204527f43 changed candy item parameters 2022-08-25 15:52:47 -07:00
ghoulslash
591bac25c4
Merge pull request #2243 from AsparagusEduardo/RHH_placeholderMoves 
Moves with EFFECT_PLACEHOLDER can't be used.
 2022-08-25 15:34:23 -04:00
crater-git
1ff5bdca9d Added list endings to otherwise empty learnsets 2022-08-24 11:55:39 -04:00
Blackforest92
fb00ac977a Adjust endif in form_species_tables.h to include Hisuian Sneasel and Qwilfish 2022-08-24 16:21:45 +07:00
Blackforest92
07a07ddc8d Update to latest master branch + allow Reveal Glass to work with Enamorus 2022-08-24 15:00:48 +07:00
Eduardo Quezada D'Ottone
21867a6061
Merge branch 'master' into AI 2022-08-24 01:07:35 -04:00
Eduardo Quezada D'Ottone
21fe205f0f
Merge pull request #2206 from Blackforest92/Minor_Graphic_Fixes 
Fix multiple pokemon icons & tidying pokemon graphic folders
 2022-08-24 00:52:49 -04:00