ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-03-16 18:48:32 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,792 Commits 1 Branch 0 Tags
Commit Graph

1628 Commits

Author SHA1 Message Date
ghoulslash
441586f23f
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags 
4 new species flags
 2022-10-07 10:55:43 -04:00
ghoulslash
1e04c80dfa
Merge pull request #2367 from AsparagusEduardo/RHH/pr/feature/MewTeach 
Special handling for Mew's Teachable moveset
 2022-10-07 10:39:56 -04:00
ghoulslash
923046c993
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925 
I don't have any Sunday memes (pret merge 2022-09-25)
 2022-10-07 10:25:59 -04:00
GriffinR
e293986fbb
Merge pull request #1793 from GriffinRichards/clean-shop 
Clean up shop.c
 2022-10-06 17:24:53 -04:00
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
GriffinR
6db489e2d5 Use constants for overworld object palette slots 2022-09-27 20:16:48 -04:00
GriffinR
4f407a1066 Convert tilesets.s to C 2022-09-27 17:23:26 -04:00
Eduardo Quezada
fb9105f8ac Added Mega Evolution flag 2022-09-27 10:21:26 -03:00
Eduardo Quezada
3d214f8204 Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags 
# Conflicts:
#	src/pokemon.c
 2022-09-27 10:13:32 -03:00
Eduardo Quezada
dfdfb72365 Separate config for updated move types 2022-09-26 07:50:43 -03:00
GriffinR
f0744641d1
Merge pull request #1651 from garakmon/entry_json 
use json for region map sections
 2022-09-25 21:56:09 -04:00
GriffinR
171367d66c
Merge pull request #1643 from cbt6/object-event-graphics-info 
Format object event graphics info
 2022-09-25 21:55:22 -04:00
GriffinR
56c28fb2dd Move region map gitignore to existing data gitignore 2022-09-25 18:15:16 -04:00
GriffinR
e473aaf783 Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json 2022-09-25 18:10:04 -04:00
GriffinR
7223dbd62f
Merge branch 'master' into rme-update 2022-09-25 11:56:57 -04:00
Eduardo Quezada
f969effd36 Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925 2022-09-25 12:51:39 -03:00
Eduardo Quezada D'Ottone
d59d8b92af
Merge branch 'dev' into AI 2022-09-24 11:07:09 -03:00
GriffinR
1107ff954d Clean up shop.c 2022-09-22 15:08:17 -04:00
GriffinR
9bcc36fe08
Merge pull request #1767 from GriffinRichards/trainer-pals 
Generate trainer pic palettes from image
 2022-09-22 11:34:03 -04:00
Eduardo Quezada D'Ottone
681ad8c7a9 Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig 
# Conflicts:
#	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_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
 2022-09-18 18:25:05 -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
2d78ac0192 Implemented Lures using the same vars as repels 2022-09-12 10:21:49 -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
Eduardo Quezada
5e399955d5 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/monAnimations 2022-09-09 17:37:23 -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
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
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
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
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
GriffinR
c8afeea182 Generate trainer pic palettes from image 2022-09-05 16:09:45 -04: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