18156 Commits

Author SHA1 Message Date
GriffinR
91baf08638 Generalize usage of castformPalette 2022-05-18 22:11:51 -04:00
Ariel A
6d79b6dbaa Merge branch 'romhack' into lighting 2022-05-18 20:14:22 -04:00
Ariel A
5727a467c4 Updated Chansey, Espeon, Gyarados and Magikarp sprites. Credit: Jaizu 2022-05-18 19:53:27 -04:00
Ariel A
01f73f54e1 Added follower transform effect and Castform forms. Credit: larryturbo
Castform forms from https://www.deviantart.com/larryturbo/art/351-Castform-Froms-830190053
2022-05-18 19:12:30 -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
5fa8ca55b0 Clean up some additional unknowns 2022-05-17 17:12:45 -04:00
GriffinR
593e2c9be0 Fix inconsistent static s/g names 2022-05-17 14:00:02 -04:00
Ariel A
ec756d3d12 Fixed object events not being unfrozen after using Flash. 2022-05-17 00:33:37 -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
TheXaman
d8f399e487 improved PokemonExpansion compatibility for Megas that dont have their own moveset, credits @aarant 2022-05-16 20:39:32 +02: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
TheXaman
19b8ec185f should fix not beeing able to select evo on base evo 2022-05-16 00:59:54 +02:00
TheXaman
b21c3205a5 tiny reformat 2022-05-16 00:10:08 +02: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
TheXaman
5ff1dcec9d improved BE compatibility, credits @AsparagusEduardo 2022-05-15 15:53:48 +02:00
cbt6
6d6dac3add Use ARRAY_COUNT in sStepTimes for step functions 2022-05-15 21:44:04 +08:00
TheXaman
a8da254fcf new caught pokemon forms (PE) now show the proper gender based sprite, credits @AsparagusEduardo 2022-05-15 01:17:45 +02:00
TheXaman
675957c24a new caught mon page should now show proper form in PE 2022-05-15 00:41:35 +02:00
TheXaman
6b217bbfcf fixes sprites on form pages not respecting the form (correct branch this time), credits @AsparagusEduardo 2022-05-15 00:13:29 +02:00
sneed
0330656868 Change triple kick power calculation 2022-05-14 17:09:42 +03:00
Ariel A
8672530f10 Fixed missing include in event_object_movement. Fixed Lombre follower palette. Credit: Jaizu 2022-05-13 22:21:23 -04:00
Eduardo Quezada
21d8c8e9c5 Using follower's nickname instead of ther species name. 2022-05-13 21:22:25 -04: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
ghoulslash
ebb711b6e5 fix bug bite not activating if faints target. also save original move target through the effect 2022-05-13 18:24:52 -04:00