ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-16 16:42:10 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,110 Commits 1 Branch 0 Tags 235 MiB
Commit Graph

7868 Commits

Author SHA1 Message Date
GriffinR
c2dc4a5dea Some field door comments 2022-05-18 13:03:02 -04:00
GriffinR
5c8e1e81ea Color single-palette door anim graphics 2022-05-18 12:41:20 -04:00
LOuroboros
059dc02aef
Update pokemon.c 2022-05-18 11:03:57 -03:00
GriffinR
67d73ee36f Clean up door animation functions 2022-05-17 17:13:29 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
AgustinGDLV
e9669ccbfe
Update src/pokemon.c 
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
 2022-05-16 17:41:18 -07:00
AgustinGDLV
2d25cd56b9
Apply suggestions from code review 
Co-authored-by: sneed <56992013+Sneed69@users.noreply.github.com>
 2022-05-16 16:58:08 -07:00
AgustinGDLV
b197da077f
Update src/strings.c 
Co-authored-by: LOuroboros <lunosouroboros@gmail.com>
 2022-05-16 16:08:26 -07:00
AgustinGDLV
d385b838c8 fixed exp resetting 2022-05-16 15:53:42 -07:00
AgustinGDLV
bd008e4c80 fixed softlocks / messages 2022-05-16 15:25:13 -07:00
AgustinGDLV
01665c0213 reverted todo for dynamax candy 2022-05-16 13:52:38 -07:00
AgustinGDLV
6cb152e452 removing nonessential stuff 2022-05-16 13:51:28 -07:00
AgustinGDLV
0de15db564 clean-up 2022-05-16 13:26:26 -07:00
AgustinGDLV
d212a136da clean-up 2022-05-16 13:25:30 -07:00
AgustinGDLV
793e8ef5a4 fixed learning moves 2022-05-16 13:12:41 -07:00
GriffinR
71ea78cc32 Document Task_UpdateContestResultBar 2022-05-16 15:01:06 -04:00
AgustinGDLV
03c21c3b71 implementation of EXP candies 2022-05-15 21:28:23 -07:00
cbt6
6d6dac3add Use ARRAY_COUNT in sStepTimes for step functions 2022-05-15 21:44:04 +08:00
ghoulslash
7dd6988b2b fix args to GetMonData 2022-05-13 20:32:03 -04:00
ghoulslash
b5d98ec93e prevent overwriting wild mon held items 2022-05-13 20:05:52 -04: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
sneed
bceccf5474 changes 2022-05-10 08:17:31 +03:00
sneed
709f583390 Initial commit 2022-05-10 02:58:24 +03:00
Eduardo Quezada D'Ottone
f80bab897f
Merge pull request #2112 from AgustinGDLV/evo_battle 
Gen 8 Evolution Mechanics (Battle Engine)
 2022-05-09 17:40:19 -04:00
Eduardo Quezada D'Ottone
b43dfd5976
Quick formatting 2022-05-09 17:04:28 -04:00
Eduardo Quezada D'Ottone
b6922a1dab
Merge branch 'pokemon_expansion' into evo_overworld 2022-05-09 16:36:34 -04:00
AgustinGDLV
277f4a3751
niceties 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-05-08 21:23:06 -07:00
AgustinGDLV
502ce4bb33 fixed graphics bug and reverted last commit 2022-05-08 21:16:16 -07:00
AgustinGDLV
e50d5661cd removed unneccesary preproc 2022-05-08 20:57:12 -07:00
AgustinGDLV
54163240d8 implemented toggelable cancellation / multi-evo 2022-05-08 20:55:29 -07:00
ghoulslash
d5fe2240b8 fix IsAbilityPreventingEscape message in party menu 2022-05-08 21:07:44 -04:00
ghoulslash
07b0ce9737 add inner focus ability popup msg 2022-05-08 17:57:30 -04:00
Eduardo Quezada D'Ottone
13f9919b9e
Merge pull request #2123 from Sneed69/wikiberry_battle 
Update Confuse Berry Hold Effect (Battle Engine)
 2022-05-08 09:02:33 -04:00
sneed
eebfed20ad #elif 2022-05-08 09:58:06 +03:00
Eduardo Quezada D'Ottone
c71b60d9f8 Merge branch 'PokemonExpansion' into PE_breedOverrides 
# Conflicts:
#	include/constants/pokemon_config.h
 2022-05-07 19:45:06 -04:00
Eduardo Quezada D'Ottone
989ec641f4
Merge pull request #2120 from ghoulslash/be/healblock 
Heal Block AI and Pollen Puff Selection Prevention
 2022-05-07 19:29:24 -04:00
sneed
f83875cf0f remove item expansion check 2022-05-07 23:34:38 +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
sneed
4c8770fdc2 Update battle_util.c 2022-05-07 21:57:50 +03:00
sneed
7008c01f25 Update items.h 2022-05-07 21:41:21 +03:00
ghoulslash
0172f84617
Merge pull request #2070 from AsparagusEduardo/PE_evoData 
Updated missing evolution and form change data
 2022-05-07 11:37:11 -04:00
ghoulslash
5dae95d8f8
Merge pull request #2096 from rh-hideout/revert-2095-CanMonLearnTMTutor 
Revert "Removed ternary from CanMonLearnTMTutor"
 2022-05-07 11:31:48 -04:00
ghoulslash
9fa4d916d3
Merge pull request #2055 from AsparagusEduardo/BE_configs 
Once again, Battle Configs
 2022-05-07 11:31:25 -04:00
ghoulslash
5456a87b83 fix pollen puff heal blocked battler in CanTargetBattler 2022-05-07 11:27:32 -04:00