ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-07 18:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,549 Commits 1 Branch 0 Tags 235 MiB
6035c5a280
Commit Graph

11549 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LOuroboros
577791a6bc Moved order of defined header files in include/global.h 2022-05-13 10:52:09 -03:00
LOuroboros
1d75f3ffde Moved order of defined header files in include/global.h 2022-05-13 10:51:49 -03:00
LOuroboros
5397d020d7 Moved order of defined header files in include/global.h 2022-05-13 10:51:13 -03:00
LOuroboros
08225bbba9 Post Pret merge fix 
I made an oopsie.
 2022-05-13 10:46:08 -03: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
GriffinR
ed1cc203c6
Merge pull request #1654 from Kurausukun/better_dinfo 
Don't Build Modern with -g by Default
 2022-05-12 22:41:15 -04:00
Kurausukun
7d224197c0
Update INSTALL.md 2022-05-12 22:33:17 -04:00
Kurausukun
1c13335d16
Update INSTALL.md 2022-05-12 22:05:44 -04:00
GriffinR
1842af7570
Merge pull request #1655 from GriffinRichards/fix-berry-id 
Fix math in CreateBerrySprite
 2022-05-12 18:04:30 -04: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
ghoulslash
9c8191fb74
Merge pull request #2129 from LOuroboros/patch-1 
Update tutor_learnsets.h
 2022-05-11 15:19:23 -04:00
LOuroboros
5b1c31bbc9
Update tutor_learnsets.h 2022-05-10 12:39:36 -03:00
Eduardo Quezada D'Ottone
9685afd981
Merge pull request #2127 from Sneed69/evolution-after-whiteout 
Allow evolutions after whiting out
 2022-05-10 07:49:17 -04: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
ab97405097
Merge pull request #2113 from AgustinGDLV/evo_overworld 
Gen 8 Evolution Mechanics (Pokemon Expansion)
 2022-05-09 17:40:30 -04: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
9bb5db2275 removed duplicate define 2022-05-08 21:23:51 -07: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
Eduardo Quezada D'Ottone
78cbbb51bb
Merge pull request #2124 from ghoulslash/be/innerfocus 
add inner focus ability popup msg
 2022-05-08 20:37:35 -04:00
ghoulslash
07b0ce9737 add inner focus ability popup msg 2022-05-08 17:57:30 -04:00
Eduardo Quezada D'Ottone
7b53a4646c
Merge pull request #2122 from Sneed69/confuseberry_item 
Update Confuse Berry Hold Effect (Item Expansion)
 2022-05-08 09:02:36 -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
AgustinGDLV
7b0154336d
Merge branch 'battle_engine' into symbiosis 2022-05-07 13:26:21 -07:00
AgustinGDLV
c7bee35161 fixed conflict with new PR 2022-05-07 13:23:41 -07:00
AgustinGDLV
fa334b21f7 minor tweaks 2022-05-07 13:18:25 -07:00
AgustinGDLV
9d222d3ab4 fixed gems and damage-reducing berries 2022-05-07 13:12:21 -07:00
sneed
d8256663e3 fix syntax 2022-05-07 22:12:10 +03:00
sneed
c6b529ed50 add missing constant 2022-05-07 22:09:08 +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
LOuroboros
195a290a98 Small corrections 2022-05-07 14:32:57 -03:00
AgustinGDLV
8a0a2a5a39
Apply suggestions from code review 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-05-07 09:36:03 -07:00
AgustinGDLV
017f44f5ac
Apply suggestions from code review 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-05-07 09:35:00 -07: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