Commit Graph

4387 Commits

Author SHA1 Message Date
DizzyEggg
54150e3794 Revert "Cherrim sun form gfx"
This reverts commit cd09047c4f.
2019-06-15 14:16:11 +02:00
DizzyEggg
cd09047c4f Cherrim sun form gfx 2019-06-10 11:16:52 +02:00
DizzyEggg
fffeefd0e2
Merge pull request #159 from LOuroboros/patch-2
Update base_stats.h
2019-06-09 11:50:12 +02:00
DizzyEggg
90ba2c545b
Merge pull request #158 from LOuroboros/patch-1
Update evolution.h
2019-06-09 09:49:33 +02:00
LOuroboros
68b744b3e4
Update base_stats.h
Corrected the label of the Razor Claw in 3 instances, so people can comment things out more easily.
2019-06-07 08:25:15 -03:00
LOuroboros
7cb5ebcb8d
Update evolution.h
Fixed a typo and corrected the label of the Shiny and Dusk Stones in 2 instances, so people can comment things out more easily.
2019-06-07 08:14:16 -03:00
DizzyEggg
1c60387968 Merge with master, placeholder back anims 2019-06-03 11:24:10 +02:00
DizzyEggg
f64c1dfabf Some pokenav work 2019-05-26 07:20:51 -05:00
DizzyEggg
818e1909ff Make nonmatching PSS functions functionally equivalent 2019-05-26 07:17:05 -05:00
Slawter666
5f292d621a Use event object constants 2019-05-25 14:41:48 -05:00
DizzyEggg
39770f7fde Use constants for new game berries setting script 2019-05-25 08:27:07 -05:00
DizzyEggg
453be19670 change cooltrainer unused class name 2019-05-25 08:26:40 -05:00
DizzyEggg
a074f36766 USE PROTAG 2019-05-25 08:26:40 -05:00
DizzyEggg
e706280503 Rename PKMN TRAINER CALSS 4 2019-05-25 08:26:40 -05:00
Kurausukun
22880768d5 rename instrument samples 2019-05-25 08:25:19 -05:00
Papa Cancer
e53ba4773d Documenting bags, berries and graphics
Bag graphics and berry graphics mostly documented
item_menu.c significantly documented
Bag structs documented and functions renamed to match formatting
2019-05-22 21:10:16 -05:00
Flametix
dbdb827e54 Fix typos (#713)
* fix typos
2019-05-18 21:56:19 -05:00
DizzyEggg
ab421f1089 Use array count for trainer parties 2019-05-17 07:33:22 -05:00
DizzyEggg
ad6093f5bc Merge with master, fix conflicts 2019-05-17 10:15:30 +02:00
garak
60baf19d45 rename gFacilityClassPicsByIndex to gLinkPlayerFacilityClasses 2019-05-16 17:10:13 -05:00
garak
daecd5ec40 name some trainer card related functions 2019-05-16 17:10:13 -05:00
DizzyEggg
188f2aa29e ability random define for battle pyramind 2019-05-16 17:09:43 -05:00
DizzyEggg
4ae1e014bc Change abilities in base stats to array 2019-05-16 17:09:43 -05:00
DizzyEggg
33979f0fa6 use ability num instead of alt ability 2019-05-16 17:09:43 -05:00
DizzyEggg
26e4b52fe8 Dummy learnsets for forms 2019-05-16 10:16:00 +02:00
Slawter666
2fdc489bc0 Further documentation of party_menu.c 2019-05-15 16:55:39 -05:00
Slawter666
d1a12be53a Minor party_menu.c documentation 2019-05-15 16:55:39 -05:00
DizzyEggg
20841a9f87 Use PLAYER_NAME_LENGTH constant 2019-05-15 16:53:59 -05:00
DizzyEggg
6367269ce9 Add dummy learnsets 2019-05-15 13:47:33 +02:00
DizzyEggg
38b320eaa5 Data for hidden abilities 2019-05-14 13:20:10 +02:00
DizzyEggg
00dcc05516 Add new dex flags 2019-05-14 11:54:58 +02:00
DizzyEggg
dfb9a1fa16 Add all new cries 2019-05-14 10:58:11 +02:00
DizzyEggg
5682f98605 Merge branch 'master' into pokemon_expansion 2019-05-14 09:12:45 +02:00
Fontbane
d9115ada86 Use species constants for VAR_TEMP_1 before givemon 2019-05-13 10:16:28 -05:00
huderlem
08c8ca8287
Merge pull request #630 from PikalaxALT/dodrio_berry_picking
Dodrio berry picking
2019-05-12 07:09:16 -05:00
DizzyEggg
9abdf224cb Coords for megas 2019-05-12 08:49:57 +02:00
PikalaxALT
539d472796 Merge branch 'master' into dodrio_berry_picking 2019-05-11 21:22:09 -04:00
PikalaxALT
fc72b74e6c Fix building 2019-05-08 17:06:39 -05:00
PikalaxALT
657068359d Better dependency handling for wild_encounters 2019-05-08 17:06:39 -05:00
Marcus Huderle
0babaa8c07 Convert wild encounter data to JSON 2019-05-08 17:06:39 -05:00
Marcus Huderle
483648e372 Create jsonproc tool
Add custom function hooks to jsonproc

Add jsonproc to build_tools.sh

Newer g++
2019-05-08 17:06:39 -05:00
DizzyEggg
3994d8089e Add cry files 2019-05-05 10:18:14 +02:00
DizzyEggg
a22495d7cb Gen4 mon animations 2019-05-05 10:09:52 +02:00
DizzyEggg
02594be062 Merge branch 'master' into pokemon_expansion 2019-05-04 09:20:45 +02:00
huderlem
fe59902b8a Fix indentation 2019-05-03 18:21:11 -05:00
hjk321
26114d4579 Update comparison 2019-05-03 18:21:11 -05:00
hjk321
ee4049d93e Fix indentation Error 2019-05-03 18:21:11 -05:00
hjk321
438c5432aa Document MON_DATA_10 2019-05-03 18:21:11 -05:00
hjk321
106a89eace Document magic number from atk04_critcalc 2019-05-03 18:21:11 -05:00
DizzyEggg
fdb328fbd3 Gfx for megas 2019-04-29 14:27:36 +02:00