Commit graph

12770 commits

Author SHA1 Message Date
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
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
sneed
0330656868 Change triple kick power calculation 2022-05-14 17:09:42 +03: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
ghoulslash
b09dad68d5 minor edits to consumeberry calls 2022-05-13 16:29:37 -04:00
ghoulslash
cdd37ad1bb fix stuff cheeks w new consumeberry impl 2022-05-13 16:28:23 -04:00
ghoulslash
f6f4227f49 better bug bite impl, fix item removal 2022-05-13 16:21:41 -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
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