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

11401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sneed
ef496ddb9d Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into cherrim 2022-05-19 00:54:16 +03:00
Eduardo Quezada D'Ottone
ded8434635
Merge pull request #2144 from Sneed69/castform 
Add missing castform sprite graphics rules
 2022-05-18 17:52:36 -04:00
Eduardo Quezada D'Ottone
6ee5c203fc
Merge pull request #2143 from LOuroboros/patch-1 
Added Castform's forms to HasTwoFramesAnimation
 2022-05-18 17:52:09 -04:00
sneed
09bace2b26 fix cherrim sprite 2022-05-19 00:40:54 +03:00
sneed
5a4c165bea fix 4bpp instead of gbapal 2022-05-18 21:27:47 +03:00
sneed
49abca345d back_normal.4bpp to normal/back.4bpp 2022-05-18 21:11:39 +03:00
sneed
8c15c5b6d7 fix castform sprite 2022-05-18 20:47:14 +03:00
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
3e44ce08b3 Revert "implementation of EXP candies" 
This reverts commit 03c21c3b71f848340baf90bad318c0027622b6e5.
 2022-05-15 21:34:50 -07:00
AgustinGDLV
03c21c3b71 implementation of EXP candies 2022-05-15 21:28:23 -07:00
AgustinGDLV
729302c92e Merge branch 'symbiosis' of https://github.com/AgustinGDLV/pokeemerald into symbiosis 2022-05-15 09:50:53 -07:00
AgustinGDLV
7cc284cf0b learning GetBattlerHoldEffect is a thing 2022-05-15 09:50:12 -07:00
GriffinR
8a921bb680
Merge pull request #1659 from cbt6/step-functions 
Use ARRAY_COUNT in sStepTimes for step functions
 2022-05-15 10:19:06 -04:00
cbt6
6d6dac3add Use ARRAY_COUNT in sStepTimes for step functions 2022-05-15 21:44:04 +08:00
Eduardo Quezada D'Ottone
671323c3e2
Merge pull request #2139 from ghoulslash/be/wildmon 
prevent overwriting wild mon held items
 2022-05-13 21:07:46 -04: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
74265efe61 Corrected size value of trainerHillTimes 2022-05-13 10:55:53 -03:00
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
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