ultima-soul
|
76a7a2720d
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-08-16 16:10:59 -07:00 |
|
ultima-soul
|
3f75a58137
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-08-11 16:55:29 -07:00 |
|
BuffelSaft
|
017a0fb693
|
Fix Mienshao's front sprite
|
2021-08-09 21:48:12 +12:00 |
|
GriffinR
|
3e60a78406
|
Merge branch 'master' into doc-frontierpass2
|
2021-07-31 13:30:40 -04:00 |
|
GriffinR
|
602855ea99
|
Document frontier pass
|
2021-07-31 13:28:08 -04:00 |
|
Blackforest92
|
72dfb281e9
|
Fix DUSTOX's backsprite
|
2021-07-31 15:01:05 +07:00 |
|
Blackforest92
|
3bd81d347d
|
Add missing Gen8 icons
|
2021-07-31 14:48:55 +07:00 |
|
Blackforest92
|
365b578a66
|
Fix Arctozolt, Heliolisk, and Chespin
|
2021-07-24 13:46:02 +07:00 |
|
GriffinR
|
72bb2bd160
|
Merge pull request #1474 from GriffinRichards/clean-miragetower
Clean up Mirage Tower
|
2021-07-10 23:26:41 -04:00 |
|
GriffinR
|
10886a586b
|
Clean up mirage tower
|
2021-07-01 23:46:15 -04:00 |
|
Blackforest92
|
d1261165b8
|
Fixes to Shroomish, Popplio, Xerneas Active and Minior Meteor
|
2021-05-25 11:44:47 +07: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 |
|
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
|
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
|
dbe24f0baa
|
Clean up contest_painting
|
2021-04-21 20:04:12 -04:00 |
|
GriffinR
|
a2a9f22612
|
Clean up contest_util
|
2021-04-20 21:16:47 -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 |
|
GriffinR
|
c921994ce1
|
Doc storage - tilemap util, place change
|
2021-04-17 19:02:30 -04:00 |
|
GriffinR
|
cd2a99b7c4
|
Doc storage - misc cleanup, some item/cursor
|
2021-04-17 13:33:29 -04:00 |
|
GriffinR
|
84e1cbaaa6
|
Doc storage - misc gfx, item icons
|
2021-04-15 22:07:12 -04:00 |
|
GriffinR
|
838a452363
|
Doc storage - choose box menu, move wallpaper gfx
|
2021-04-15 18:46:20 -04:00 |
|
GriffinR
|
7645be27eb
|
Label unused move anims in anim_effects_3
|
2021-04-13 03:28:03 -04:00 |
|
ExpoSeed
|
d24ee25c94
|
Merge pull request #1431 from LOuroboros/misaligned_icons
Corrected the position of some icon sprites
|
2021-04-07 16:06:19 -05:00 |
|
GriffinR
|
0dc7ff8994
|
Minor misc field doc
|
2021-04-06 17:17:41 -04: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
|
a0b3d4df12
|
Merge pull request #1390 from GriffinRichards/doc-introcred
Document intro and credits sequences
|
2021-04-01 23:13:59 -04:00 |
|
GriffinR
|
691c680908
|
Delete unreferenced palette
|
2021-04-01 14:32:23 -04:00 |
|
GriffinR
|
f58465a274
|
Document match_call.c
|
2021-04-01 03:29:15 -04:00 |
|
GriffinR
|
5ba858d19c
|
Label missing easy chat symbols
|
2021-03-31 16:56:10 -04:00 |
|
LOuroboros
|
c81b8bdfa8
|
Corrected the position of some icon sprites
|
2021-03-31 00:50:27 -03: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
|
09ff1524b4
|
Finish documenting credits
|
2021-03-29 19:58:29 -04:00 |
|
GriffinR
|
c40fb9288c
|
Merge pull request #1378 from GriffinRichards/doc-berrycrush
Document Berry Crush
|
2021-03-29 12:38:16 -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 |
|
ultima-soul
|
56a1cab314
|
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
|
2021-03-23 15:21:19 -07:00 |
|
GriffinR
|
0f869fb266
|
Remaining labels in trainer_card
|
2021-03-22 15:30:19 -05:00 |
|
GriffinR
|
1cc0a3506f
|
Label misc field effects
|
2021-03-22 15:30:19 -05:00 |
|
GriffinR
|
22e2c0a47c
|
Document Berry Crush
|
2021-03-18 15:18:23 -04: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 |
|
GriffinR
|
b1a69d95ea
|
Document minigame countdown
|
2021-03-11 14:25:22 -05:00 |
|
GriffinR
|
b9c733495b
|
Document dodrio berry picking
|
2021-03-03 14:26:05 -05:00 |
|
GriffinR
|
031da44cab
|
Document mon markings
|
2021-02-28 17:11:46 -06:00 |
|
GriffinR
|
cbc7a72814
|
Merge pull request #1346 from GriffinRichards/doc-pokejump
Document pokemon jump
|
2021-02-28 11:19:02 -05:00 |
|
huderlem
|
10c77f1bc2
|
Merge pull request #1345 from GriffinRichards/doc-rtcscreen
Document/clean up some minor screens
|
2021-02-28 10:03:22 -06:00 |
|
Marcus Huderle
|
a85fada314
|
Document more battle anim effects
|
2021-02-28 09:54:55 -06:00 |
|
GriffinR
|
1912b0cf0a
|
Merge branch 'master' into doc-rtcscreen
|
2021-02-28 10:28:43 -05:00 |
|
GriffinR
|
3f59362397
|
Merge branch 'master' into doc-pokejump
|
2021-02-28 10:27:50 -05:00 |
|
GriffinR
|
117b90a261
|
Document pokemon jump
|
2021-02-26 17:26:39 -05:00 |
|
GriffinR
|
f09278393e
|
Document reset_rtc_screen
|
2021-02-24 14:29:33 -05:00 |
|
GriffinR
|
c6141fea83
|
Document easy chat
|
2021-02-24 11:03:45 -05:00 |
|
GriffinR
|
64fc585cc3
|
Document pokenav ribbons summary screen
|
2021-02-18 11:33:55 -05:00 |
|
GriffinR
|
15906ca143
|
Document evolution scene
|
2021-02-03 17:55:37 -05:00 |
|
amiosi
|
f700004188
|
proper CamelCase
|
2021-02-02 14:21:00 -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
|
2e0b02e491
|
Merge pull request #1322 from amiosi/pokemon_expansion
Dex colors, mawile footprint, hoopa friendship, koffing abilities, config fix
|
2021-01-21 19:16:59 -06:00 |
|
ghoulslash
|
fe7f2f18a4
|
Merge pull request #1328 from ultima-soul/add_fairy_frlg_icon_pe
Add Fairy-type FRLG Icon to Fix Fairy TM Info Icon Being Blank
|
2021-01-21 12:19:41 -07:00 |
|
GriffinR
|
e0c0143f41
|
Fix substitute back sprite
|
2021-01-04 10:14:01 -05:00 |
|
ultima-soul
|
b58a8390f3
|
Add Fairy-type icon to fix Fairy TM info icon being blank.
|
2021-01-02 21:21:52 -08:00 |
|
ExpoSeed
|
10f4b48215
|
Merge branch 'master' of https://github.com/pret/pokeemerald into HEAD
|
2021-01-01 14:14:51 -08:00 |
|
amiosi
|
6c5852c4e0
|
colors n stuff
|
2020-12-31 13:13:10 -05:00 |
|
GriffinR
|
ec85c01e7c
|
Merge branch 'master' into doc-factscreen
|
2020-12-31 00:40:45 -05:00 |
|
ghoulslash
|
a842f35428
|
Merge pull request #1301 from ultima-soul/gen_8_mon_data
Add Gen 8 Pokémon Data
|
2020-12-17 20:52:15 -07:00 |
|
ultima-soul
|
c675c92a1d
|
Add Gen 8 Pokemon data.
|
2020-12-16 12:57:36 -08:00 |
|
LOuroboros
|
c8cf0a09a0
|
Corrected the icon sprite of Mandibuzz
It was Mienfoo's, for some odd reason.
|
2020-12-14 16:19:38 -03:00 |
|
Ashley Coleman
|
0f04944b81
|
Rename graphics files for COOLTRAINER to match define
|
2020-11-26 11:05:02 -08:00 |
|
GriffinR
|
bf65c1fb25
|
Name object event pals/tags
|
2020-11-23 14:24:48 -05:00 |
|
LOuroboros
|
ab512b3d24
|
Fixed a few Pokémon icon sprites
|
2020-11-16 21:06:56 -03:00 |
|
Eduardo Quezada D'Ottone
|
d3a5921122
|
Review changes 3
|
2020-11-13 16:34:53 -03:00 |
|
Eduardo Quezada D'Ottone
|
caf6253ba3
|
Merge remote-tracking branch 'RHH/pokemon_expansion' into PE-Ultima-Forms
# Conflicts:
# src/pokemon_icon.c
|
2020-11-10 19:37:02 -03:00 |
|
Eduardo Quezada D'Ottone
|
3849f7dd5d
|
Female Eevee backsprite.
|
2020-11-06 16:45:25 -03:00 |
|
Eduardo Quezada D'Ottone
|
4d4b111327
|
Front pic gender differences for Eevee
|
2020-11-06 16:21:45 -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
|
1e283e9dbf
|
Merge pull request #551 from LOuroboros/gen5_footprints
Added footprints for the Gen. 5 species
|
2020-11-02 10:28:06 -08:00 |
|
ExpoSeed
|
3573c467e7
|
Merge pull request #552 from LOuroboros/gen4_footprints_corrections
Corrected a few Gen. 4 footprints after accidentally screwing them up
|
2020-11-01 20:59:24 -06:00 |
|
ultima-soul
|
1ec8282cd8
|
Merge pull request #545 from ExpoSeed/mega-pinsir-icon-fix
Fix Mega Pinsir Icon
|
2020-11-01 10:15:08 -08:00 |
|
LOuroboros
|
e948ffc8b7
|
Corrected a few Gen. 4 footprints after accidentally screwing them up
|
2020-11-01 12:24:34 -03:00 |
|
LOuroboros
|
7fe0e779f4
|
Review corrections
|
2020-11-01 12:01:07 -03:00 |
|
LOuroboros
|
7cf3c256cd
|
Added footprints for the Gen. 5 species, thanks to Blackforest
|
2020-11-01 09:44:05 -03:00 |
|
ExpoSeed
|
c71f0ed1b7
|
Merge pull request #547 from LOuroboros/gen4_footprints
Added footprints for the Gen. 4 species
|
2020-10-31 22:37:41 -05:00 |
|
LOuroboros
|
781b8f919e
|
Review changes
|
2020-10-30 17:41:50 -03:00 |
|
LOuroboros
|
79555e8a7e
|
Fixed Bouffalant's sprite
|
2020-10-27 15:31:59 -03:00 |
|
LOuroboros
|
480a8cc751
|
I missed Buneary's footprint
|
2020-10-27 15:16:20 -03:00 |
|
LOuroboros
|
3d117c9127
|
8bpp bad 1bpp good
|
2020-10-27 15:07:28 -03:00 |
|
LOuroboros
|
6435158742
|
Added footprints for the Gen. 4 species
|
2020-10-27 09:38:04 -03:00 |
|
ExpoSeed
|
2668f86256
|
Fixed Mega Pinsir icon. Thanks Blackforest!
|
2020-10-27 00:34:04 -05: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 |
|
Eduardo Quezada
|
92728a1875
|
Added Ultimasoul's Forms from his FromID system.
|
2020-10-23 11:44:47 -03:00 |
|
ultima-soul
|
635432a2e4
|
Merge pull request #526 from LOuroboros/tsareena
Corrected Tsareena's sprites
|
2020-10-22 18:30:10 -07:00 |
|
ExpoSeed
|
3de4df5b76
|
Merge pull request #528 from LOuroboros/magnemite
Fixed Magnemite's and Magneton's battle sprites
|
2020-10-22 20:26:48 -05: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 |
|
LOuroboros
|
d005287c50
|
Fixed Magnemite's and Magneton's battle sprites
Their normal back sprite palettes were glitchy. Discord users Jaizu and Blackforest fixed them
|
2020-10-21 10:24:03 -03:00 |
|
LOuroboros
|
5ecac6ff95
|
Corrected Tsareena's sprites
Some of its palettes were buggy as reported by Ryuhouji. This was fixed by Discord user Blackforest.
|
2020-10-21 07:29:50 -03:00 |
|
ExpoSeed
|
81ac09af0b
|
Merge branch 'master' of https://github.com/pret/pokeemerald into sync-pokemon-expansion
|
2020-10-12 12:45:42 -05:00 |
|
Evan
|
f4909b4d96
|
align pokenav task funcs and update some pokenav menu bg gfx files
|
2020-10-11 08:50:58 -06:00 |
|