ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-07 18:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,009 Commits 1 Branch 0 Tags 235 MiB
7c9a3f338a
Commit Graph

739 Commits

Author SHA1 Message Date
GriffinR
62968895ca Add MON_PIC_SIZE constant 2021-03-29 09:38:19 -04:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -07:00
GriffinR
6127c6f32e Misc labels in battle facilities 2021-03-22 15:30:19 -05:00
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04:00
ExpoSeed
3655fe52f3 Prison Bottle and Reveal Glass don't exist yet 2021-03-09 11:54:56 -06:00
GriffinR
55a40b901f Label battle tower link script 2021-03-04 19:30:19 -06:00
ExpoSeed
6f64c1b2b9 Implement GetFormChangeTargetSpecies 2021-03-03 13:07:50 -06:00
ExpoSeed
ec1a09bcd5 Revamp table 2021-03-02 14:18:34 -06:00
ExpoSeed
7802264732 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-03-01 19:38:13 -06:00
GriffinR
c6141fea83 Document easy chat 2021-02-24 11:03:45 -05:00
GriffinR
1cac608dbe Document mail 2021-02-24 11:03:39 -05:00
GriffinR
06ae5a37e2
Merge pull request #1336 from GriffinRichards/giftribbons 
Document some ribbon usage
 2021-02-24 10:07:59 -05:00
GriffinR
fc3d6eb178
Merge pull request #1328 from GriffinRichards/doc-pokeuseitem 
Document PokemonUseItemEffects
 2021-02-22 12:15:19 -05:00
SphericalIce
381116b3c4 Add labels for cracked floor metatiles 2021-02-22 15:29:14 +00:00
GriffinR
02c1fbd733 Document ribbon TV show, add new ribbon IDs/size 2021-02-18 09:59:24 -05:00
GriffinR
e059c4fdfa Use new gift ribbons size, label unused ribbons 2021-02-17 14:11:45 -05:00
GriffinR
ee4af94a36
Merge pull request #1324 from GriffinRichards/doc-sb 
Document remainder of secret_base.c
 2021-02-15 17:41:55 -05:00
Deokishisu
7b2bf8c7e2 Rename obedient/fatefulEncounter to eventLegal 
Per discussion on pret, `obedient`/`fatefulEncounter` has been renamed to `eventLegal`, and all related functions and constants have been modified with this in mind.

Additionally, fixed some whitespace alignment issues in `script_cmd_table.h`, `pokemon.h`, and `tv.c` from the last commit.
 2021-02-15 14:54:35 -05:00
Deokishisu
b89c3e901e Fix giftRibbons Field in SaveBlock1 & Relabel Gift Ribbons in pokemon.h 
The giftRibbons field has been split out into proper subfields. The new ExternalEvent structs deal with interconnectivity between external games/peripherals and Emerald, such as PokéCoupon storage and the flag for receiving Wishmaker Jirachi.

The giftRibbon fields in `PokemonSubstruct3` have also been renamed to their appropriate ribbons, and commented with distribution info if applicable. The previous `fatefulEncounter` field was actually filler, and relabeled as such, while the obedient bit was renamed `fatefulEncounter`. All relevant constants and functions dealing with the Pokémon data structure were renamed with these changes in mind.
 2021-02-15 11:40:16 -05:00
GriffinR
5f58ea02c6
Merge pull request #1330 from sphericalice/hidden-to-buried 
Rename 'hidden' Trainers/obj events to 'buried'
 2021-02-14 21:48:21 -05:00
SphericalIce
56e047f949 Fix Lilcove Motel typos 2021-02-14 21:38:39 +00:00
SphericalIce
70ff6c3b84 Rename 'hidden' Trainers/obj events to 'buried' 2021-02-14 19:25:23 +00:00
GriffinR
be0699bd64
Merge pull request #1326 from GriffinRichards/doc-layouts 
Label unused layouts
 2021-02-14 14:22:28 -05:00
GriffinR
a85ac11b28
Merge pull request #1325 from GriffinRichards/constants-berrytree 
Add berry tree id constants
 2021-02-14 14:15:51 -05:00
GriffinR
8634710996 Document PokemonUseItemEffects 2021-02-12 16:02:04 -05:00
LOuroboros
21ee6cb9fb Added constant labels for EV manipulating item effects 2021-02-12 07:26:11 -03:00
GriffinR
20b76c6071 Fix swapped route 102 berries 2021-02-10 16:26:09 -05:00
GriffinR
2237d0748f Label unused layouts 2021-02-08 14:45:56 -05:00
GriffinR
0851c34bac Add berry tree id constants 2021-02-05 15:25:12 -05:00
GriffinR
a240481d5f Document secret_base.c 2021-02-05 12:08:25 -05:00
Deokishisu
ac43365d58 Fix "Compatibility" Misspelling 
Someone misspelled "compatibility" as "compatability" in the daycare-related files. This commit spells them correctly.
 2021-02-05 01:27:11 -05:00
amiosi
663cc5b15c oricorio... 2021-02-03 13:02:13 -05:00
amiosi
2d6b80455d Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 13:25:53 -05:00
amiosi
47e1d6b790 MIMEJR -> MIME_JR 2021-02-02 12:36:05 -05:00
ultima-soul
96232ea166 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-01-28 23:59:08 -08:00
ExpoSeed
34c6771e94 Create form change table 2021-01-27 16:30:43 -06:00
GriffinR
0064333e4a Clean up scrcmd.c 2021-01-26 02:16:26 -05:00
GriffinR
8fe4d004e3
Merge pull request #1305 from GriffinRichards/doc-battletv 
Document battle tv data
 2021-01-21 12:27:14 -05:00
GriffinR
6999b237eb
Merge pull request #1309 from GriffinRichards/misc-macro 
Use constants for item data, misc other constants/fixes
 2021-01-19 20:49:58 -05:00
GriffinR
752982552e Add FIRST_BALL, some FIRST_BERRY_INDEX usage 2021-01-19 13:39:18 -05:00
SphericalIce
2dfaba9472 Name color return values more accurately 2021-01-19 17:59:36 +00:00
SphericalIce
8de76ed533 Make broader use of RGB macros 2021-01-19 17:15:12 +00:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
GriffinR
564278fd49 Document battle tv data 2021-01-14 06:29:59 -05:00
GriffinR
b9e1b050e1 Label remaining battle types 2021-01-13 15:20:29 -05:00
ultima-soul
9c5ec33aa7 Sync Crown Tundra and renamed moves Battle Engine defines. 2021-01-12 14:22:33 -08:00
GriffinR
92de664f79 List battle animation indexes alongside tables 2021-01-11 16:07:16 -05:00
Philipp AUER
b5fa0129d5 [pokemon-expansion] Changes as requested by code review 
Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update include/constants/pokemon_config.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>

Update src/data/pokemon/evolution.h

Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
 2021-01-11 21:43:00 +01:00
opakedragon
cbaf9b38b2
rename string id to reflect usage 2021-01-11 08:48:00 -05:00
sbird
95665c24b4 [pokemon_expansion] define missing items from ITEM_EXPANSION for gEvolutionTable 2021-01-10 18:30:15 +01:00
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
ExpoSeed
10f4b48215 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2021-01-01 14:14:51 -08:00
GriffinR
769ddf22c2 Label remaining subs in battle_tower.c 2020-12-24 16:18:47 -05:00
ultima-soul
ad67068f7e Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into gen_8_mon_data 2020-12-16 13:28:42 -08:00
ultima-soul
c675c92a1d Add Gen 8 Pokemon data. 2020-12-16 12:57:36 -08:00
Tim Gates
581306db7b
docs: fix simple typo, redunant -> redundant 
There is a small typo in include/constants/battle_frontier.h.

Should read `redundant` rather than `redunant`.
 2020-12-13 22:14:50 +11:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
LOuroboros
8b5a5a1896 Reverted include/constants/abilities.h to vanilla 
With the new abilities introduced by the battle_engine in src/data/pokemon/base_stats.h behind locked behind that branch's defined label, we don't need to define them in this branch anymore.
 2020-12-10 16:38:29 -03:00
GriffinR
f95192ed87 Define terminal species IDs relatively 2020-12-08 00:45:05 -05:00
LOuroboros
ce8f794100
Updated abilities.h 
Straight up copied from the BE to avoid silly merge conflicts.
 2020-12-05 14:57:13 -03:00
ghoulslash
66ed10a826
Merge pull request #1251 from ExpoSeed/PE-mon-flags 
Add mon flags
 2020-12-03 15:07:17 -05:00
ExpoSeed
f2259d7ce1 Remove IS_ULTRA_BEAST 2020-11-24 22:44:00 -06:00
ExpoSeed
3adf316574 Add mon flags 2020-11-24 22:42:42 -06:00
LOuroboros
c4c802162e A few more evo related changes. 
-EVO_MAP -> EVO_MAPSEC
-Introduced a new EVO_SPECIFIC_MAP method. Its name is self-explanatory. (Thanks to Pyredrid!)
-Changed the maps where Eevee can evolve into Leafeon and Glaceon to make use of it.
 2020-11-25 01:15:19 -03:00
LOuroboros
89f6036e77 Bumped EVOS_PER_MON from 8 to 10 2020-11-24 23:47:07 -03:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
LOuroboros
890144f153
Defined Isle of Armor moves 
Straight up copied from the battle_engine branch.
 2020-11-15 13:05:49 -03:00
Eduardo Quezada D'Ottone
54630ff5a9 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/data/pokemon/evolution.h
 2020-11-13 16:40:31 -03:00
LOuroboros
6f122ac8f8 Defined EVO_MOVE_MEGA_EVOLUTION for BE compatibility 2020-11-11 15:18:39 -03:00
Eduardo Quezada D'Ottone
d97932c009 Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/pokemon.c
 2020-11-10 19:29:50 -03:00
Eduardo Quezada D'Ottone
df11b68acb Moved POKEMON_EXPANSION define to global.h to fix reading from other branches 2020-11-09 12:58:03 -03:00
Eduardo Quezada D'Ottone
68627882a5 Merge remote-tracking branch 'pret/master' into PE-pretSync 2020-11-07 15:00:10 -03:00
Eduardo Quezada D'Ottone
cb6802f01e Standarized naming schemes. 2020-11-06 20:15:28 -03:00
Eduardo Quezada D'Ottone
0c6dc6abab Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	graphics/pokemon/burmy/footprint.png
#	graphics/pokemon/gastrodon/footprint.png
#	graphics/pokemon/rotom/footprint.png
#	graphics/pokemon/shellos/footprint.png
#	graphics/pokemon/wormadam/footprint.png
#	include/constants/species.h
#	src/data/pokemon/base_stats.h
 2020-11-03 00:13:51 -03:00
ultima-soul
104b48986c
Merge pull request #538 from AsparagusEduardo/PE-IsUltraBeast 
Created macro used to detect Ultra Beasts.
 2020-11-02 09:53:28 -08:00
Eduardo Quezada D'Ottone
b372ab1c34 Fixed label for Egg Group config. 2020-11-01 14:50:29 -03:00
Eduardo Quezada
ed6fd6c964 Fixed compile 2020-10-26 22:37:01 -03:00
Eduardo Quezada
2c098d8294 Merge branch 'pokemon_expansion' into PE-Ultima-Forms 
# Conflicts:
#	src/data/pokemon/base_stats.h
 2020-10-26 20:06:37 -03:00
aaaaaa123456789
1c3d75f673 Merge branch 'master' into reverts 2020-10-26 12:16:36 -03:00
Eduardo Quezada
641daafb3f Fixed identation for better readability. 2020-10-25 12:34:48 -03:00
Eduardo Quezada
13a6b70e8c Updating Egg Groups. 2020-10-24 08:04:30 -03:00
Eduardo Quezada
67817ff9b9 Updated abilities. 2020-10-24 07:58:58 -03:00
Eduardo Quezada
ced1ccd659 Created macro to be used by Beast Balls 2020-10-23 23:16:37 -03:00
Kurausukun
44c2d15ca9 re-match sub_81C79BC (from #1177) 
also re-define RBG macros
 2020-10-23 22:07:30 -04:00
Kurausukun
90211248af re-match Cmd_unknown_24 (from #1140) 
changes to data structs are necessary. other things that look
unnecessary, like the order of operands, are also necessary. fuck this
function.
 2020-10-23 20:47:10 -04:00
Eduardo Quezada D'Ottone
353f9eca42
Merge pull request #30 from AsparagusEduardo/PE-PokemonConfig 
Updated types and stats in configuration file.
 2020-10-23 12:40:10 -03:00
Eduardo Quezada
92728a1875 Added Ultimasoul's Forms from his FromID system. 2020-10-23 11:44:47 -03:00
Eduardo Quezada D'Ottone
38573ab402
Merge pull request #16 from LOuroboros/deoxys 
Added the data of Deoxys' forms
 2020-10-22 00:52:40 -03:00
Eduardo Quezada
2b95f9fc43 Updated types and stats in config. 2020-10-16 21:04:11 -03:00
Eduardo Quezada
34ce08db0b Added Karrablast/Shelmet evolution method. 2020-10-14 20:16:18 -03:00
ExpoSeed
a539045dae Relocate and redefine POKEMON_SLOTS_NUMBER 2020-10-13 12:05:42 -05:00
ExpoSeed
90d4359aeb Fix constants 2020-10-12 19:11:41 -05:00
ExpoSeed
bc4e992be2 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion 2020-10-11 00:10:12 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
ExpoSeed
5794fc69e8 Merge branch 'pokemon_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-pokemon-expansion 2020-10-04 02:35:23 -05:00
GriffinR
66bd1e6d3f Use constants for item digits 2020-09-25 11:18:52 -04:00
aaaaaa123456789
7dc95a0103 Undo PokeCodec's PRs 
This commit undoes most of PokeCodec's PRs after the debate in chat. Some
harmless or completely superseded PRs have been left alone, as there is not
much benefit in attempting to undo them.

Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136,
#1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179,
#1180, #1181, #1182 and #1183.
 2020-09-13 06:30:55 -03:00
DizzyEggg
448599f53c Merge with master 2020-09-08 12:01:20 +02:00
PokeCodec
3d87a88067 Make battle pyramid defines into enums 2020-09-04 19:49:53 -04:00