ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-03 09:50:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,587 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

126 Commits

Author SHA1 Message Date
Eduardo Quezada
9b977486fe Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2022-10-07 14:05:45 -03: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 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
de32940fdf Further removed trailing whitespaces 2022-09-13 16:26:36 -03: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
d699ea3334 Fixed macro alignments 2022-09-05 08:38:35 -04:00
Eduardo Quezada
2ee843c70d Proper label for species flags 2022-09-04 22:13:28 -03:00
Eduardo Quezada
925384eedc Generations of Pokémon can now be disabled individually 2022-08-30 12:50:59 -04:00
Eduardo Quezada
e9a5442be5 Removed unused ITEM_EXPANSION constants from base stats 2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6 Separated P_NEW_POKEMON into sections by generation. 
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
 2022-08-30 12:50:59 -04: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
75ac960365 Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
Blackforest92
346f3b7f4c Fix PLA's base_stats.h (rename .item2 to .itemRare) 2022-08-19 18:01:28 +07:00
Blackforest92
a9d09bcd17 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into Legends_Arceus_Expansion 2022-08-19 17:53:01 +07:00
ExpoSeed
49da2ee53f Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
ghoulslash
0588bba193
Merge pull request #2195 from AsparagusEduardo/PE_pretmerge 
Pokémon Expansion pret merge
 2022-07-22 14:01:27 -04:00
sphericalice
65db9238e8
Give Pikachu its typing back 2022-07-18 09:41:04 +01:00
Eduardo Quezada D'Ottone
e791cf90ad Merge tag 'pretmaster' into BE_pretmerge2 
# Conflicts:
#	data/battle_anim_scripts.s
#	include/battle_anim.h
#	include/battle_controllers.h
#	include/battle_interface.h
#	include/battle_main.h
#	include/battle_setup.h
#	include/constants/battle_anim.h
#	include/constants/battle_string_ids.h
#	src/battle_ai_switch_items.c
#	src/battle_anim_fire.c
#	src/battle_anim_normal.c
#	src/battle_controllers.c
#	src/battle_dome.c
#	src/battle_gfx_sfx_util.c
#	src/battle_interface.c
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/battle_util.c
#	src/pokemon.c
 2022-07-15 12:58:46 -04:00
Eduardo Quezada D'Ottone
c69275f373 Merge remote-tracking branch 'pret/master' into PE_pretmerge 
# Conflicts:
#	include/battle_anim.h
#	include/pokemon.h
#	src/data/pokemon/base_stats.h
 2022-07-12 17:20:49 -04:00
Blackforest92
8c88e8a9b7 Legends Arceus Pokemon 95% Finished 2022-07-03 17:15:37 +07:00
sneed
c8e08edbae rename item1 and item2 in BaseStats 2022-05-23 19:10:24 +03:00
sneed
248863239b repair sawssuck abilities 2022-05-23 04:10:18 +03:00
sneed
b71fbec130 repair meteor minior stats 2022-05-23 03:29:01 +03:00
sneed
c8d78706ba add dex colors to castform forms 2022-05-23 02:53:01 +03:00
sneed
ce468a0903 add macros for handling form base stats 2022-05-23 01:04:21 +03:00
sneed
587b056ccb add dummy abilities to PE 2022-05-22 19:55:09 +03:00
Eduardo Quezada D'Ottone
84d713a50f Legendary and Mythical flags 2022-04-14 18:44:20 -04:00
LOuroboros
f82c946ff3 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:26:27 -03:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
Eduardo Quezada D'Ottone
3bbaf5a15d Optimized SpeciesHasGenderDifference into Base Stat flag 2022-01-01 19:24:34 -03:00
ultima-soul
b0b8b9bf46 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 23:51:29 -08:00
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
ultima-soul
45fb16c40a
Merge pull request #1494 from LOuroboros/feathers_PE 
Corrected the Wings/Feathers #2
 2021-06-02 22:56:39 -07:00
Eduardo Quezada D'Ottone
5fd4c35483
Merge pull request #1412 from amiosi/noFlip 
restore and add noFlip values
 2021-05-21 11:44:11 -04:00
LOuroboros
41bc603110 Wings -> Feathers 2021-05-17 22:06:31 -03:00
ExpoSeed
f922d42988 Refactor hidden abilities 2021-04-16 23:38:35 -05:00
amiosi
d7d8c62753 restore and add noFlip values 
sources: vanilla emerald, pokediamond, hgss/bw2 overworlds, oras/usum menu sprites.
missing: bw2 & oras data
 2021-02-22 16:04:55 -05:00
amiosi
a021204389 oricorio pau constants 2021-02-02 14:49:01 -05:00
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
ExpoSeed
2e0b02e491
Merge pull request #1322 from amiosi/pokemon_expansion 
Dex colors, mawile footprint, hoopa friendship, koffing abilities, config fix
 2021-01-21 19:16:59 -06:00
amiosi
08eb883939 sounds like a lot of HOOPA 2021-01-21 20:10:38 -05:00
ultima-soul
767f26b73c Corrected defines for Item Expansion-introduced items for Gen 8 species data. 2021-01-08 19:06:20 -08:00
amiosi
6c5852c4e0 colors n stuff 2020-12-31 13:13:10 -05:00
ghoulslash
6f05ef01ac
Merge pull request #1306 from ExpoSeed/galar-mon-flags 
Add Galarian Form mon flags
 2020-12-21 10:05:19 -07:00
ExpoSeed
ef6a7fbf43 Add Galarian Form mon flags 2020-12-18 18:25:24 -06:00
LOuroboros
cb9faeed3d
Corrected the ability 1 of Calyrex's forms 
There isn't an `ABILITY_AS_ONE` defined in the `include/constants/abilities.h` of the battle_engine branch, so this wasn't building a ROM correctly.
https://github.com/rh-hideout/pokeemerald-expansion/blob/pokemon_expansion/src/data/pokemon/base_stats.h#L34158
https://github.com/rh-hideout/pokeemerald-expansion/blob/battle_engine/include/constants/abilities.h#L290
 2020-12-18 08:17:49 -03:00
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08:00
ExpoSeed
3adf316574 Add mon flags 2020-11-24 22:42:42 -06:00