ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 01:23:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,960 Commits 1 Branch 0 Tags 235 MiB
21867a6061
Commit Graph

10960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
GriffinR
b59fb7637a
Merge pull request #1668 from mrgriffin/static-assert-save-structs 
Static assertion for size of save structs
 2022-05-25 15:25:49 -04:00
Martin Griffin
1cc59acca9 Static assertion for size of save structs 2022-05-25 19:48:42 +01:00
GriffinR
2a6e57c082
Merge pull request #1667 from Sneed69/summary_enum 
Document DrawPagination
 2022-05-25 10:15:21 -04:00
sneed
a913191323 Document DrawPagination 2022-05-25 16:12:16 +03:00
GriffinR
12a0920c3b
Merge pull request #1666 from Sneed69/summary_enum 
Minor summary screen clarification
 2022-05-25 01:51:17 -04:00
sneed
5c92062c23 Update pokemon_summary_screen.c 2022-05-25 08:37:36 +03:00
GriffinR
09ea1c84f9
Merge pull request #1665 from Sneed69/master 
Rename chanceCommon to chanceNotRare in SetWildMonHeldItem
 2022-05-23 18:59:09 -04:00
sneed
c316b11739 chanceCommon to chanceNotRare 2022-05-24 00:53:09 +03:00
GriffinR
0fb4163f20
Merge pull request #1664 from Sneed69/itemCommon_itemRare 
Rename BaseStats.item1 and item2 to provide context
 2022-05-23 17:12:10 -04:00
sneed
c8e08edbae rename item1 and item2 in BaseStats 2022-05-23 19:10:24 +03:00
hamish
307d5d93c4 add potlergeist animation 2022-05-23 08:53:08 -04:00
sneed
248863239b repair sawssuck abilities 2022-05-23 04:10:18 +03:00
sneed
b71fbec130 repair meteor minior stats 2022-05-23 03:29:01 +03:00
sneed
c8d78706ba add dex colors to castform forms 2022-05-23 02:53:01 +03:00
sneed
ce468a0903 add macros for handling form base stats 2022-05-23 01:04:21 +03:00
Eduardo Quezada D'Ottone
f2c509eab7
Merge pull request #2151 from Sneed69/dummy_abilities 
Add dummy abilities to make base stats header smaller
 2022-05-22 13:27:27 -04:00
sneed
587b056ccb add dummy abilities to PE 2022-05-22 19:55:09 +03:00
GriffinR
f756e60455
Merge pull request #1663 from GriffinRichards/castform-pal 
Generalize usage of castformPalette
 2022-05-21 23:45:01 -04:00
GriffinR
6d772a5e30
Merge pull request #1662 from GriffinRichards/door-gfx 
Clean up door animations
 2022-05-21 16:07:02 -04: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
GriffinR
71ea78cc32 Document Task_UpdateContestResultBar 2022-05-16 15:01:06 -04: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