Commit graph

540 commits

Author SHA1 Message Date
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04:00
LOuroboros
75b6d2837e Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into the_potion_seller 2021-04-07 17:10:52 -03:00
GriffinR
d717a635c8 event_object_movement cleanup 2021-04-06 17:55:29 -04:00
GriffinR
756fad0e61 Document some event object movement 2021-04-06 14:34:36 -04:00
GriffinR
802d2b2f0f Label Kyogre/Groudon anims 2021-04-06 03:46:19 -04:00
GriffinR
00c3044c96 Clarify Groudon/Kyogre/Rayquaza gfx names 2021-04-06 02:38:15 -04:00
ExpoSeed
5eed23b5d8 Razor claw effect 2021-04-05 23:19:03 -05:00
GriffinR
806abe2999 Document some objev anims, make objevgfx info static 2021-04-05 19:52:35 -04:00
ExpoSeed
3517baae2d Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into IE/item-use-form-change 2021-04-04 01:21:18 -05:00
LOuroboros
f04f35f5c3 Added a config for the amount of HP recovered by healing items 2021-04-02 20:34:57 -03:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
GriffinR
50e9666e16
Merge branch 'master' into doc-introcred 2021-03-29 20:56:15 -04:00
GriffinR
dea07dc865 Standardize intro gfx names 2021-03-29 20:48:48 -04:00
GriffinR
357c5439f5 Document some credits 2021-03-29 08:52:40 -04:00
GriffinR
c86cc8b371 Document intro, start intro_credits/credits 2021-03-28 23:13:56 -04:00
GriffinR
7a5c6d4d86 Standardize Friendship/Happiness 2021-03-27 17:27:20 -05:00
ultima-soul
7abfe7469a Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-03-23 18:41:53 -07:00
GriffinR
4077c53338 A few labels in party, start, option menus 2021-03-22 15:30:19 -05:00
GriffinR
8eafe1fd4e Move pointillism points array to src 2021-03-18 17:36:18 -05:00
ExpoSeed
08bd8f8403 Support form changes with PE 2021-03-03 15:34:22 -06:00
Evan
791fd5e709 finish berry hold effects 2021-03-03 09:25:25 -07: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
GriffinR
64fc585cc3 Document pokenav ribbons summary screen 2021-02-18 11:33:55 -05:00
SphericalIce
70ff6c3b84 Rename 'hidden' Trainers/obj events to 'buried' 2021-02-14 19:25:23 +00: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
7e26aa3d21
Merge pull request #1316 from GriffinRichards/doc-scrcmd
Label remaining script commands, document some scrcmd.c, event_object_lock, trainer_see, berry tree
2021-02-01 21:04:00 -05:00
ultima-soul
5fdb578747 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-02-01 15:58:18 -08:00
GriffinR
12af03cd62 Label bard music pitch table 2021-01-28 16:36:56 -05:00
GriffinR
89b85a49ec Index gBardSounds_Moves and gBardSounds_Pokemon with constants 2021-01-28 15:55:33 -05:00
ExpoSeed
857fc9ce95
Merge pull request #1320 from amiosi/item_expansion
update item effects, prices, names & descriptions
2021-01-28 12:15:11 -06:00
GriffinR
92bd6400b7 Fix up berry sparkle 2021-01-26 05:40:34 -05:00
amiosi
44a0983624 missed some 2021-01-22 07:43:48 -05:00
amiosi
9456382a32 yellow shmellow 2021-01-21 19:05:01 -05:00
amiosi
184dad1874 changes according to review 2021-01-21 19:04:26 -05:00
ghoulslash
9b1a482837
Merge pull request #1317 from ultima-soul/form_species_tables_ie
Add Form Species ID Tables
2021-01-20 13:54:58 -07:00
ultima-soul
f571c8af2a Merge branch 'form_species_tables' into form_species_tables_ie 2021-01-20 11:34:59 -08:00
ultima-soul
267900bdcb Add Form Species ID tables and functions to access them. 2021-01-20 11:31:20 -08:00
GriffinR
752982552e Add FIRST_BALL, some FIRST_BERRY_INDEX usage 2021-01-19 13:39:18 -05:00
GriffinR
cf9f8d01c5 Add misc item data constants 2021-01-19 05:49:20 -05:00
ghoulslash
b006f04ad5
Merge pull request #1256 from ghoulslash/item_expansion
add z crystal and z ring
2021-01-15 11:50:54 -07:00
ExpoSeed
5250aaf265
Merge pull request #1277 from LOuroboros/x_items_IE
Reworked the effects of the X Items #2
2021-01-15 12:04:54 -06:00
GriffinR
8e06d5679c Index gBardSoundsTable 2021-01-14 03:54:59 -05:00
GriffinR
46e0a0607d Array count for easy chat word groups 2021-01-14 03:48:49 -05:00
GriffinR
f63bc6e27a Index sTMHMMoves 2021-01-14 03:41:28 -05:00
ghoulslash
e013c44340
Merge pull request #1319 from LOuroboros/item_tweaks
Updated the type-enhancing items' boost
2021-01-12 09:24:55 -07:00
amiosi
7e91129332 may as well do the rest 2021-01-11 20:18:23 -05:00
amiosi
eaca987879 more fixes
light ball and gen 6 evolution held items
2021-01-11 19:54:41 -05:00
amiosi
3aadd69303 fixes
pokeblock berries and evolution items
2021-01-11 19:49:03 -05:00
Evan
4912bc1d25 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2021-01-11 17:15:41 -07:00
amiosi
8d7d819cde beast ball cannot be sold 2021-01-10 15:08:48 -05:00
LOuroboros
f4d34f70c4 Renamed some X Defend labels to reflect its new name 2021-01-10 01:54:41 -03:00
LOuroboros
db37c4f25c Review correction to src/data/pokemon/item_effects.h 2021-01-09 21:47:58 -03:00
SphericalIce
3c2a33b9b2 Use constants for max IVs & the random IV generation flag 2021-01-07 22:13:14 +00:00
GriffinR
0ca76fc179 Some decoration labels, use constant for tileset size 2021-01-04 16:27:57 -06:00
GriffinR
039108284d Clean up gDecorations with gItems format 2021-01-04 16:27:57 -06:00
LOuroboros
91c92e9c04 #if X_ITEMS_REWORK == TRUE -> #ifdef BATTLE_ENGINE 2021-01-04 06:49:18 -03:00
amiosi
5392c101d0 tabs 2021-01-03 19:11:24 -05:00
ExpoSeed
208e0abe04 Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD 2020-12-31 18:44:43 -06:00
amiosi
2e5575385a pr commit 2020-12-30 20:27:37 -05:00
LOuroboros
7049413ce2 Updated the type-enhancing items' boost 2020-12-30 15:59:13 -03:00
Evan
728586de51 make ultranecrozium-z description fit 2020-12-20 16:36:31 -07:00
Evan
d500bd4e2f fix zring and ultranecrozium descriptions 2020-12-19 22:17:20 -07:00
LOuroboros
55bc2b4bb9 Corrected small inconsistency in move flag names 2020-12-12 12:18:56 -03:00
LOuroboros
c496e0ce6c Tweaked the X Items' effects' entries in src/data/pokemon/item_effects.h 2020-12-08 18:27:03 -03:00
Evan
a0ae0ece53 add ultranecrozium-z and update z crystal data 2020-12-08 09:55:50 -07:00
Evan
8a56a52666 update z crystal descriptions 2020-12-01 17:49:43 -05:00
GriffinR
076b2c2edc Designated initializers for gTrainerBackPicTable 2020-11-30 15:32:08 -05:00
Evan
539a88207e add z crystal and z ring 2020-11-29 10:00:03 -05:00
Ashley Coleman
0f04944b81 Rename graphics files for COOLTRAINER to match define 2020-11-26 11:05:02 -08:00
GriffinR
513c7c5f45 Clarify Kecleon objects 2020-11-23 14:42:47 -05:00
GriffinR
bf65c1fb25 Name object event pals/tags 2020-11-23 14:24:48 -05:00
Eduardo Quezada D'Ottone
6f29abbe0e
Plate type data and hold effect #1207 from ExpoSeed 2020-11-09 15:24:13 -03:00
Eduardo Quezada D'Ottone
4a17d62ecd Fixed gen 3 fossil config 2020-11-08 20:27:46 -03:00
Eduardo Quezada D'Ottone
2e01654eb9 Plate type data and hold effect. 2020-11-08 01:47:05 -06:00
ExpoSeed
c2e8f51e35
Merge pull request #145 from AsparagusEduardo/IE-Config
Item Expansion config file.
2020-11-02 11:31:51 -06:00
Eduardo Quezada
4aa6442cd4 Fixed price mixed up. 2020-10-25 01:28:14 -03:00
Eduardo Quezada
9eeb574ad1 Fixed Escape Rope using bug. Thanks ExpoSeed! 2020-10-25 01:08:27 -03:00
LOuroboros
c2502b0bf5 Review corrections 2020-10-24 15:44:40 -03:00
LOuroboros
c2f278bde3 Corrections to various items
-Fixed the Honey's sprite thanks to Blackforest
-Corrected many items' descriptions (with feedback from the bois at RHH's Discord server)
-Added missing items data
2020-10-24 09:41:19 -03:00
LOuroboros
15345fb401 Fixed the Honey's sprite and description 2020-10-24 06:26:30 -03:00
Eduardo Quezada
e861abeff3 Initial review changes. 2020-10-23 22:19:37 -03:00
Evan
f7c3b3e246 reformat oval charm description 2020-10-19 16:07:04 -06:00
Evan
d64b926469 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into item_expansion 2020-10-19 11:22:41 -06:00
Eduardo Quezada
12bc93dc78 Review changes 2020-10-17 17:07:54 -03:00
Eduardo Quezada
137d9801c0 Key Items configuration in file. 2020-10-17 01:25:54 -03:00
LOuroboros
f00d50d7b7 Renamed the HOLD_EFFECT_EV_BOOST label 2020-10-15 05:25:07 -03:00
ExpoSeed
8b83d88e75 Merge branch 'master' of https://github.com/pret/pokeemerald into sync-item-expansion 2020-10-11 00:07:10 -05:00
GriffinR
65a4e06737 Add ITEM6_HEAL constants, change move flags to shifts 2020-10-05 18:48:51 -04:00
ExpoSeed
c3113b43bb Merge branch 'item_expansion' of https://github.com/DizzyEggg/pokeemerald into sync-item-expansion 2020-10-04 02:36:07 -05:00
GriffinR
5259898325 Replace POKEMON_SLOTS_NUMBER 2020-10-01 17:07:12 -05:00
tustin2121
be9100fe52 Review changes 2020-09-20 13:04:20 -04:00
tustin2121
832be34898 More documenting trainer hill
- Renamed members and added comments in the TrHillDisplay struct.
- Formatted the trainer hill data to better match the metatile layout its representing.
- Documented the function which uses this data.
2020-09-20 01:50:54 -04:00
tustin2121
0d3646c0b9 Trainer hill location data
Changed the trainer hill data for trainer locations, directions, and ranges from vague unusable numbers into readable data via use of preprocessor macros.
2020-09-20 01:09:22 -04:00
ExpoSeed
227d2dce32 Make description slightly more precise 2020-09-16 12:51:14 -05:00
ExpoSeed
778e6925de Complete TMHM Learnset description 2020-09-16 12:36:11 -05:00
GriffinR
921f389e4e Fix Rusboro and Lavarige typos 2020-09-11 14:47:47 -04:00
DizzyEggg
271219f962 Merge with master 2020-09-08 12:00:51 +02:00
GriffinR
4ad147f75d
Merge pull request #1156 from GriffinRichards/doc-rayscene
Document Rayquaza cutscene
2020-09-01 14:46:14 -04:00
GriffinR
f5495d1220 Give proper names to underwater maps 2020-09-01 03:03:14 -04:00
GriffinR
38d4fc9c17 Clean up rayquaza scene documentation 2020-08-27 16:04:11 -04:00
GriffinR
52b1251b48 Document second rayquaza scene 2020-08-27 15:43:27 -04:00
GriffinR
ba13e9ec95 Document first rayquaza scene 2020-08-27 15:43:18 -04:00
DizzyEggg
35559d6b71 Merge with master 2020-08-27 10:58:31 +02:00
GriffinR
95ea0e92e7 Start documenting rayquaza_scene 2020-08-25 17:49:42 -04:00
PikalaxALT
d2c7a862c7
Merge pull request #1147 from GriffinRichards/doc-contestai
Document contest AI
2020-08-21 15:16:37 -04:00
GriffinR
fbb70b3727 Document contest AI scripts 2020-08-21 14:57:17 -04:00
PikalaxALT
cd895e497d
Merge pull request #1141 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
2020-08-21 12:44:07 -04:00
GriffinR
0e7f634b00 Wrap asm statements in NONMATCHING 2020-08-18 08:16:09 -04:00
GriffinR
65bd2faf94 Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest 2020-08-16 05:59:10 -04:00
GriffinR
2749948eeb Clean up contest doc 2020-08-16 05:52:17 -04:00
GriffinR
cc4255d4c0 Add some charmap constant usage 2020-08-11 00:23:28 -04:00
PikalaxALT
03eba6a62c
Merge pull request #1116 from GriffinRichards/doc-slotmachine
Document slot machine
2020-08-01 09:56:44 -04:00
GriffinR
b22709ee3d More slot machine data documentation 2020-07-28 14:29:44 -04:00
DizzyEggg
11c2207839 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-27 14:54:32 +02:00
GriffinR
36a4764a78 Document some slot machine data 2020-07-26 02:15:59 -04:00
GriffinR
aca50c87be Continue new contest documentation 2020-07-24 00:14:53 -04:00
GriffinR
52a4428ba6 Begin new contest documentation 2020-07-23 17:55:40 -04:00
GriffinR
4a42e2a710
Merge branch 'master' into doc-overworld 2020-07-23 10:31:52 -04:00
Eduardo Quezada
6eccf019db Fixed missing changes. 2020-07-21 19:32:33 -04:00
Eduardo Quezada
f825ba875e Reverted size. 2020-07-19 21:17:32 -04:00
Eduardo Quezada
49ee0fd953 Front pic coordinates. 2020-07-19 20:54:12 -04:00
Eduardo Quezada
10c4debe31 Back pic coordinates 2020-07-19 20:37:11 -04:00
GriffinR
af09e73d67
Merge branch 'master' into doc-overworld 2020-07-18 20:24:09 -04:00
GriffinR
aba42513d3 Clean up some battle scr cmd data 2020-07-18 18:10:15 -04:00
Evan
f923f5198e add oval charm 2020-07-16 09:48:25 -06:00
DizzyEggg
e03fea84d0 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-07-11 12:46:41 +02:00
GriffinR
ebb6c4ee66
Merge branch 'master' into doc-overworld 2020-07-08 15:51:58 -04:00
GriffinR
1ce929157f Clean up field effect doc 2020-07-02 05:05:13 -04:00
GriffinR
abdf7cbf02 Label fishing effect functions 2020-06-29 16:53:38 -04:00
GriffinR
4ea6992172 Continue documenting overworld/field effects 2020-06-29 01:26:29 -04:00
GriffinR
18d57a3802 Document some overworld and field effects 2020-06-23 15:48:53 -04:00
Eduardo Quezada
0be261cc74 Fixed Eviolite description. 2020-06-21 04:25:08 -04:00
GriffinR
2859900ea9 Second pass on documenting union room 2020-06-10 17:30:59 -04:00
GriffinR
4fe507e453 Document union_room.c 2020-05-31 13:11:18 -04:00
LOuroboros
705743a10e
Fix the secondaryId of the Ice and Fighting Gems (#382)
Addresses #378
2020-05-24 10:18:07 +02:00
AsparagusEduardo
179d84dcd7 Using ability constants for OLD_UNOWN stats 2020-05-16 18:08:56 -04:00
AsparagusEduardo
f6932518b0 Ordered OLD_UNOWN in the same way as the other base stats. 2020-05-03 00:00:01 -04:00
DizzyEggg
f86282f423 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-29 08:47:51 +02:00
GriffinR
09b39527ff Generalize oamtable names 2020-04-28 19:59:08 -05:00
GriffinR
ecd4824f67 Index heal location data, use better names 2020-04-28 19:59:08 -05:00
LOuroboros
32bb717bf1
Implemented missing TMs/HMs type palettes (#327)
* Implemented palettes for Bug type and Fairy type TMs/HMs thanks to Ghoulslash

* Actually added the Bug and Fairy type TM/HM sprite palettes now
2020-04-16 09:27:13 +02:00
DizzyEggg
09dcff81f8 Merge branch 'master' of https://github.com/DizzyEggg/pokeemerald into item_expansion 2020-04-15 13:28:10 +02:00
GriffinR
8d3b7bd0b1 Use metatile labels for decor gfx 2020-04-13 14:43:50 -04:00
GriffinR
96958ba5e9 Drop unnecessary decor prefix 2020-04-13 13:04:22 -04:00
GriffinR
2615a6838e Label unknown anims 2020-04-09 19:24:47 -04:00
PikalaxALT
7a059c75a6
Merge pull request #968 from GriffinRichards/doc-regionmap
Document some pokenav and region map
2020-03-17 10:38:20 -04:00