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

11424 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sneed
cb1c6ffbd2 comment out placeholders 2022-05-22 03:46:39 +03:00
Sneed69
d0a2be9630 weather forms fixes and config 2022-05-22 03:20:48 +03:00
GriffinR
6d772a5e30
Merge pull request #1662 from GriffinRichards/door-gfx 
Clean up door animations
 2022-05-21 16:07:02 -04:00
TheXaman
cbe8f30001 added FLAG_ADVENTURE_STARTED to cheat start 2022-05-21 12:54:02 +02:00
GriffinR
c9c754be06
Merge pull request #1661 from GriffinRichards/fix-inconsistent-static 
Fix inconsistent static s/g names
 2022-05-20 19:38:02 -04:00
Eduardo Quezada D'Ottone
6be8151981
Merge pull request #2146 from Sneed69/castform_battle 
Fix castform battle interactions
 2022-05-20 10:54:49 -04:00
Eduardo Quezada D'Ottone
df55a185ae
Merge pull request #2147 from Sneed69/r-ball-pike 
Disable last used ball in battle pike
 2022-05-19 22:04:21 -04:00
sneed
d8d31b7972 disable last used ball in bpike 2022-05-20 04:57:32 +03:00
GriffinR
7f64bf58d6
Merge pull request #1660 from GriffinRichards/doc-contest-bar 
Document Task_UpdateContestResultBar
 2022-05-19 12:52:44 -04:00
sneed
881e7e70ec Generalize usage of castformPalette 
https://github.com/pret/pokeemerald/pull/1663
 2022-05-19 15:23:09 +03:00
sneed
928d3c5a28 change form on weather fade 2022-05-19 15:08:03 +03:00
sneed
0424e37252 Fix cherrim + castform interaction 2022-05-19 14:20:34 +03:00
GriffinR
91baf08638 Generalize usage of castformPalette 2022-05-18 22:11:51 -04:00
Eduardo Quezada D'Ottone
86cbc9a06c
Merge pull request #2145 from Sneed69/cherrim 
Fix Cherrim/Flower Gift sprite swapping
 2022-05-18 18:03:54 -04:00
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 03c21c3b71.
 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