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
12,090 Commits 1 Branch 0 Tags
Commit Graph

1672 Commits

Author SHA1 Message Date
Blackforest92
56f4c319a4 Fix multiple pokemon graphics, tidying pokemon graphic folders 2022-07-22 22:17:29 +07:00
Eduardo Quezada D'Ottone
25397e5794 Fixed Light That Burns The Sky not using the calculated damage category 
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
 2022-07-21 15:13:00 -04:00
ghoulslash
462a144956
Merge pull request #2200 from AsparagusEduardo/BE_ZMove_power 
Updated Z-Move power for Gen 8 moves and moves with power varying by Gen
 2022-07-20 18:10:31 -04:00
AgustinGDLV
9c73cb322e replaced bitfield with LUT 2022-07-20 10:48:09 -07:00
Eduardo Quezada D'Ottone
f00beac3f9 Updated Z-Move power for Gen 8 moves and moves with power varying by Gen 2022-07-20 11:32:16 -04:00
Eduardo Quezada D'Ottone
e14afd8957 Added Growth's Atk. raise to the its configuration, as that was also introduced in Gen 5. 2022-07-20 10:33:18 -04:00
Eduardo Quezada D'Ottone
fe63dafcc1 Merge branch 'battle_engine' into BE_pretmerge 
# Conflicts:
#	src/battle_anim_fire.c
#	src/battle_controller_player.c
 2022-07-20 08:50:30 -04:00
sphericalice
65db9238e8
Give Pikachu its typing back 2022-07-18 09:41:04 +01:00
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
ExpoSeed
da4d1bc626
Merge pull request #2176 from LOuroboros/patch-1 
Fixed Pokéblock Case's description
 2022-07-16 03:35:26 -05: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
LOuroboros
cec7e30ef1
Update battle_moves.h 2022-07-15 01:51:36 -03:00
Eduardo Quezada D'Ottone
f78bb4fb84 Merge remote-tracking branch 'pret/master' into item_expansion 
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-12 17:42:32 -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
Greenphx9
4294682d8c 16-letter move names 
Move define, add spaces between comments, fix include
if TRUE -> if set to TRUE

Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>
 2022-07-11 12:49:30 +10:00
LOuroboros
640974b164
Update items.h 2022-07-05 22:13:15 -03:00
Blackforest92
ff861ff963 Add some of Legends Arceus battle sprites 2022-07-04 12:28:40 +07:00
LOuroboros
3c9be7c3b2
Fixed Pokéblock Case's description 2022-07-03 13:36:00 -03:00
Blackforest92
8c88e8a9b7 Legends Arceus Pokemon 95% Finished 2022-07-03 17:15:37 +07:00
ghoulslash
fc2cfd8c9d
Merge pull request #2136 from LOuroboros/pePretMerge 
Pret merge for the pokemon_expansion
 2022-07-01 09:22:55 -04:00
ghoulslash
a349462b78
Merge pull request #2134 from LOuroboros/bePretMerge 
Pret merge for the battle_engine
 2022-07-01 09:21:51 -04:00
GriffinR
277750b088
Merge branch 'master' into rme-update 2022-06-22 10:02:17 -04:00
GriffinR
7143865f6f Add some battle frontier constant usage 2022-06-09 12:57:28 -04:00
sneed
c8e08edbae rename item1 and item2 in BaseStats 2022-05-23 19:10:24 +03:00
hamish
307d5d93c4 add potlergeist animation 2022-05-23 08:53:08 -04: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
Eduardo Quezada D'Ottone
f2c509eab7
Merge pull request #2151 from Sneed69/dummy_abilities 
Add dummy abilities to make base stats header smaller
 2022-05-22 13:27:27 -04:00
sneed
587b056ccb add dummy abilities to PE 2022-05-22 19:55:09 +03:00
sneed
5b0afffd91 popup and flower gift description fixes 2022-05-22 13:10:51 +03:00
BuffelSaft
16570e8c3f Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-22 12:55:55 +12:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
AgustinGDLV
01665c0213 reverted todo for dynamax candy 2022-05-16 13:52:38 -07:00
AgustinGDLV
0de15db564 clean-up 2022-05-16 13:26:26 -07:00
AgustinGDLV
793e8ef5a4 fixed learning moves 2022-05-16 13:12:41 -07:00
AgustinGDLV
03c21c3b71 implementation of EXP candies 2022-05-15 21:28:23 -07:00
BuffelSaft
bb25746e05 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald into multistrike 2022-05-13 22:40:43 +12:00
LOuroboros
52d6c96e69 Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge 2022-05-13 03:20:42 -03:00
LOuroboros
12d956872b Merge branch 'master' of https://github.com/pret/pokeemerald into iePretMerge 2022-05-13 03:18:37 -03:00
LOuroboros
2263caef7a Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine 2022-05-13 03:17:31 -03:00
Eduardo Quezada D'Ottone
a896f9aed7
Merge pull request #2133 from Sneed69/cobaberry 
Coba berry fix
 2022-05-12 13:39:50 -04:00
sneed
0c0bea33c7 Update items.h 2022-05-12 18:39:10 +03:00
LOuroboros
5b1c31bbc9
Update tutor_learnsets.h 2022-05-10 12:39:36 -03:00
Eduardo Quezada D'Ottone
b6922a1dab
Merge branch 'pokemon_expansion' into evo_overworld 2022-05-09 16:36:34 -04:00
AgustinGDLV
54163240d8 implemented toggelable cancellation / multi-evo 2022-05-08 20:55:29 -07:00
sneed
eebfed20ad #elif 2022-05-08 09:58:06 +03:00
sneed
d8256663e3 fix syntax 2022-05-07 22:12:10 +03:00
sneed
5592fa434a catch < gen7 with engine 2022-05-07 22:01:35 +03:00