Commit graph

668 commits

Author SHA1 Message Date
GriffinR
42d2fefe02
Merge branch 'master' into tag-none 2021-09-24 10:17:34 -04:00
GriffinR
a6ab2eb883
Merge branch 'master' into trailingSpaces 2021-09-23 21:39:21 -04:00
Eduardo Quezada D'Ottone
f9d1375451
Merge pull request #1375 from ExpoSeed/PE/form-change-table
Form change table
2021-09-22 00:04:26 -03:00
LOuroboros
afc55994a9 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into gen5_2nd_frames 2021-09-21 20:45:17 -03:00
Eduardo Quezada D'Ottone
08d3c31abe
Merge pull request #1584 from Blackforest92/pokemon_expansion
Port missing Gen8 icons from DPE
2021-09-20 22:48:57 -03:00
GriffinR
f8f7617946 Add TAG_NONE 2021-09-14 13:14:14 -04:00
BuffelSaft
db928a1329 Data entry for new sprites
Add sprite defines, entries to gender tables, etc.
2021-09-11 14:12:41 +12:00
GriffinR
cbf8863e5b Clean up Lilycove Lady 2021-09-09 15:24:34 -04:00
DizzyEggg
b0a1153a2b
Merge pull request #1600 from LOuroboros/gen6_footprints
Added footprints for Gen. 6 species
2021-09-06 10:36:46 +02:00
LOuroboros
554210c5e3 Removed trailing spaces in the most relevant files
Command used for the job:
egrep -rl ' $' --include *.c --include *.h --include  *.s --include  *.inc --include  *.txt *  | xargs sed -i 's/\s\+$//g'

Credits to Grant Murphy from Stack Overflow.
2021-08-24 19:59:32 -03:00
LOuroboros
87461db04d Added missing 2nd frames for Gen. 5 species
Also made certain Pokémon such as Zebstrika or Galvantula use their 2nd frame.
2021-08-23 08:28:58 -03:00
LOuroboros
5c1d7e52dc Added footprints for Gen. 6 species 2021-08-23 06:28:10 -03:00
LOuroboros
a0a888698e Corrected Bronzor's evo level 2021-08-22 23:19:26 -03:00
ultima-soul
76a7a2720d Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-08-16 16:10:59 -07:00
GriffinR
e01ae55c13 Start more link_rfu_2 documentation 2021-08-15 15:13:42 -04:00
GriffinR
28a8fe191a Document item menu 2021-08-10 22:13:02 -04:00
Blackforest92
3bd81d347d Add missing Gen8 icons 2021-07-31 14:48:55 +07:00
LOuroboros
e55fe62d59 Assigned dummy anims to the front sprite of each Pikachu and Pichu special form 2021-07-15 13:42:51 -03:00
ultima-soul
45fb16c40a
Merge pull request #1494 from LOuroboros/feathers_PE
Corrected the Wings/Feathers #2
2021-06-02 22:56:39 -07:00
ExpoSeed
22478b857b
Add {FORM_CHANGE_END} to Silvally and Genesect 2021-05-28 19:24:44 -05:00
MandL27
2d92f23240
Merge pull request #1514 from pineapplemachine/pokemon_expansion_evo_fix
Fixes to pokemon_expansion species evolution data: Galarian Ponyta, Tranquill, and Kubfu
2021-05-28 11:31:25 -04:00
Sophie Kirschner
1a4c6d3490 Fixes to species evolution data 2021-05-28 18:16:52 +03:00
ultima-soul
eedd374a5f
Merge pull request #1420 from Blackforest92/pokemon_expansion
Added missing gen8 battle sprites and available icons and various fixes
2021-05-24 21:13:12 -07:00
Blackforest92
d74492b591 Returning Alcremie back to monkey 2021-05-25 10:57:06 +07:00
Blackforest92
2dccce7675
Erased Eternamax comment in src/data/pokemon_graphics/enemy_mon_elevation.h
Co-authored-by: ultima-soul <33333039+ultima-soul@users.noreply.github.com>
2021-05-25 09:17:50 +07:00
Eduardo Quezada D'Ottone
5fd4c35483
Merge pull request #1412 from amiosi/noFlip
restore and add noFlip values
2021-05-21 11:44:11 -04:00
LOuroboros
41bc603110 Wings -> Feathers 2021-05-17 22:06:31 -03:00
ultima-soul
50c2514267
Merge pull request #1469 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
2021-05-13 20:56:29 -07:00
ultima-soul
cf0fd961b9 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 23:56:58 -07:00
ultima-soul
0da3f74a7e Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-28 18:58:38 -07:00
GriffinR
6c38837b26
Merge pull request #1420 from GriffinRichards/doc-dataanims
Document battler affine anims, default pokeball throw
2021-04-28 13:56:42 -04:00
GriffinR
18f85b5cf0
Merge pull request #1415 from GriffinRichards/doc-contestutil
Some Contest clean up
2021-04-27 02:29:41 -04:00
GriffinR
c0aedf8df4
Merge pull request #1410 from GriffinRichards/doc-tradedata
Document trade sequence animation, some trade cleanup
2021-04-26 13:26:12 -04:00
GriffinR
e40f89b175 Move unknown data table, reference with species 2021-04-25 02:19:01 -04:00
GriffinR
bc9fc38254 Misc contest cleanup 2021-04-22 15:51:04 -04:00
GriffinR
dbe24f0baa Clean up contest_painting 2021-04-21 20:04:12 -04:00
GriffinR
04af378904 Document trade sequence animation, some trade cleanup 2021-04-20 05:50:39 -04:00
GriffinR
52495e889f Doc storage - cleanup 2021-04-18 01:44:25 -04:00
ExpoSeed
f922d42988 Refactor hidden abilities 2021-04-16 23:38:35 -05:00
GriffinR
838a452363 Doc storage - choose box menu, move wallpaper gfx 2021-04-15 18:46:20 -04:00
GriffinR
a1ed59450e Doc storage - wallpaper and titles 2021-04-15 16:09:41 -04:00
GriffinR
09a9efd5c5
Merge pull request #1398 from GriffinRichards/doc-field
Document field
2021-04-10 13:05:51 -04:00
Kurausukun
3e725272fc standardize "grey" to "gray" 2021-04-09 22:39:34 -04: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
LOuroboros
bd802ce976 Update species_names.h 2021-04-06 09:53:21 -03: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
GriffinR
806abe2999 Document some objev anims, make objevgfx info static 2021-04-05 19:52:35 -04:00
ExpoSeed
afb97abba0
Merge pull request #1425 from LOuroboros/nature_names
Decapped nature names
2021-04-04 15:11:12 -05:00
ExpoSeed
cf9d5f8563 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into PE/form-change-table 2021-04-04 01:11:32 -05:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -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
56a1cab314 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-03-23 15:21:19 -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
LOuroboros
dea69a48ef Decapped nature names 2021-03-18 08:31:38 -03:00
Blackforest92
badf8945d8 Added missing gen8 battle sprites and available icons - Fix Arceus, Palkia, Kyurem White and Black - Implement 1 tile 10 palettes system for Alcremie 2021-03-14 18:31:24 +07:00
ExpoSeed
3655fe52f3 Prison Bottle and Reveal Glass don't exist yet 2021-03-09 11:54:56 -06:00
ExpoSeed
dd73d8fc06 Fix wrong comment 2021-03-03 16:47:31 -06:00
ExpoSeed
6f64c1b2b9 Implement GetFormChangeTargetSpecies 2021-03-03 13:07:50 -06:00
ExpoSeed
aac7028703 Add newline at end of file 2021-03-02 14:21:29 -06:00
ExpoSeed
6db5a98ad9 Delete old form change table 2021-03-02 14:20:39 -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
amiosi
d7d8c62753 restore and add noFlip values
sources: vanilla emerald, pokediamond, hgss/bw2 overworlds, oras/usum menu sprites.
missing: bw2 & oras data
2021-02-22 16:04:55 -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
amiosi
11e6298a05 tmhm and tutor spacing 2021-02-03 15:08:53 -05:00
amiosi
762dcb8a7c cry fixes, type null 2021-02-03 14:10:39 -05:00
amiosi
b84f952f32 mistaken MrRime change 2021-02-03 13:09:09 -05:00
amiosi
663cc5b15c oricorio... 2021-02-03 13:02:13 -05:00
amiosi
418da6158b last of the cries 2021-02-03 12:57:56 -05:00
amiosi
e62f53b13e fix spacing i missed on tutors and expand to all species
plus reorder kyurem forms to match the rest of the repo
2021-02-02 15:18:45 -05:00
amiosi
0798ba22a6 fix tmhm spacing i missed, extend to all species 2021-02-02 15:10:45 -05:00
amiosi
a021204389 oricorio pau constants 2021-02-02 14:49:01 -05:00
amiosi
032f8ac834 tapus pls 2021-02-02 14:43:12 -05:00
amiosi
248e0b50d7 Merge remote-tracking branch 'upstream/pokemon_expansion' into mime_jr 2021-02-02 14:24:36 -05:00
amiosi
9c2c337e6f tapu case 2021-02-02 14:24:15 -05:00
amiosi
f700004188 proper CamelCase 2021-02-02 14:21:00 -05:00
amiosi
dba1383d55 Merge remote-tracking branch 'upstream/pokemon_expansion' into dex-decap 2021-02-02 13:33:06 -05:00
amiosi
42ea6f482b more dex entry spacing 2021-02-02 13:32:55 -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
ExpoSeed
f93bd60c93
Merge pull request #1371 from LOuroboros/keldeo_resolute
Fixed Keldeo Resolute's animation
2021-02-02 11:18:23 -06:00
ExpoSeed
2d1384e88f
Merge pull request #1370 from LOuroboros/deoxys
Fixed Deoxys Attack Form's animation
2021-02-02 11:17:25 -06:00
ghoulslash
47f89de53b
Merge pull request #1384 from ultima-soul/pokemon_expansion_sync
Pokemon Expansion Upstream Sync
2021-02-02 09:48:21 -07: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
amiosi
940ca8dc19 category decap and length 2021-02-01 15:25:53 -05:00
amiosi
102285d464 mons/moves 2021-02-01 14:37:48 -05:00