ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,004 Commits 1 Branch 0 Tags 235 MiB
6382640f8a
Commit Graph

866 Commits

Author SHA1 Message Date
sneed
ef496ddb9d Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into cherrim 2022-05-19 00:54:16 +03:00
sneed
09bace2b26 fix cherrim sprite 2022-05-19 00:40:54 +03:00
sneed
8c15c5b6d7 fix castform sprite 2022-05-18 20:47:14 +03:00
GriffinR
c2dc4a5dea Some field door comments 2022-05-18 13:03:02 -04:00
GriffinR
5c8e1e81ea Color single-palette door anim graphics 2022-05-18 12:41:20 -04:00
LOuroboros
52d6c96e69 Merge branch 'master' of https://github.com/pret/pokeemerald into pePretMerge 2022-05-13 03:20:42 -03:00
LOuroboros
2263caef7a Merge branch 'master' of https://github.com/pret/pokeemerald into battle_engine 2022-05-13 03:17:31 -03:00
ghoulslash
574be40f26
Merge pull request #2099 from Greenphx9/calyrex_rider_icons 
Calyrex Rider Icons
 2022-04-27 08:43:53 -04:00
Greenphx9
b3294c60a2 Calyrex Rider Icons 2022-04-22 16:31:17 +10:00
GriffinR
fc5747f0f7
Merge pull request #1649 from GriffinRichards/clean-trainer 
Trainer hill clean up
 2022-04-20 00:20:44 -04:00
TheXaman
2fa812df26 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into rhh_master_merge 2022-04-13 20:51:35 +02:00
LOuroboros
446bcd3181 Merge branch 'master' of https://github.com/pret/pokeemerald into pePret 2022-04-11 01:23:18 -03:00
LOuroboros
b6e2945072 Merge branch 'master' of https://github.com/pret/pokeemerald into bePret 2022-04-11 01:22:10 -03:00
LOuroboros
f82c946ff3 Merge branch 'pokemon_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:26:27 -03:00
LOuroboros
af2f70e000 Merge branch 'item_expansion' of https://github.com/rh-hideout/pokeemerald-expansion into rhhmerge 2022-04-03 13:21:40 -03:00
LOuroboros
fa39dc76dc Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into HEAD 2022-04-02 18:45:18 -03:00
GriffinR
328b925a08 Move trainer hill map data to bin files 2022-03-31 14:08:31 -04:00
ExpoSeed
f50a406b18 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2022-03-22 12:56:23 -05:00
GriffinR
33c05cefe2
Merge pull request #1644 from GriffinRichards/name-jump-long-grass 
Name unknown_16.png
 2022-03-14 16:32:08 -04:00
GriffinR
0a0157b62c Name unknown_16.png 2022-03-14 15:54:47 -04:00
GriffinR
8bf7e7b6f5 Improve egg hatch documentation 2022-03-03 01:33:49 -05:00
ultima-soul
2d3ba500c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2022-03-01 15:10:19 -08:00
ultima-soul
84a7f960c8 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2022-02-28 23:37:41 -08:00
ultima-soul
86089ce935 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2022-02-28 22:13:14 -08:00
GriffinR
8b43cffe09 Move remaining region map graphics to region map folder 2022-02-22 18:43:23 -05:00
GriffinR
a0c127f72c Move region map layout to C 2022-02-22 18:13:11 -05:00
GriffinR
131ed1916e Generalize name of party slot without HP 2022-02-15 16:24:19 -05:00
GriffinR
49eca60955 Convert party menu slots to bin files 2022-02-15 16:12:54 -05:00
GriffinR
062cdbe01c
Merge pull request #1599 from GriffinRichards/fix-tilemaps 
Break up graphics/interface and graphics/misc
 2022-01-20 08:53:44 -05:00
GriffinR
bd43b905b7 Apply palettes to some field effect pngs 2022-01-14 12:51:13 -05:00
GriffinR
4dec9b83a3 Move more graphics out of misc 2022-01-14 12:29:30 -05:00
GriffinR
01af8e877f Move starter choose out of interface/misc 2022-01-11 17:49:08 -05:00
GriffinR
694aa3c65d Move balls, shop, link, map popups, and bag out of interface 2022-01-11 13:53:23 -05:00
GriffinR
d782d3544d Move pokeblock graphics out of interface 2022-01-11 11:46:58 -05:00
GriffinR
565dd24309 Move party menu graphics out of interface 2022-01-11 11:37:13 -05:00
GriffinR
7103839a61 Move summary screen graphics out of interface, fix some names 2022-01-11 11:22:45 -05:00
GriffinR
fde18b4774 Fix berry crusher graphics name 2022-01-11 10:42:00 -05:00
GriffinR
0a78cb5c9e Fix some battle dome graphics names 2022-01-11 10:04:47 -05:00
Eduardo Quezada D'Ottone
8d0548f732 Fixed Wormadam sprite. Credit to Jaizu 2022-01-08 20:26:16 -03:00
GriffinR
ca9bc34bea Clean up pokemon_storage_system graphics 2022-01-07 17:36:38 -05:00
GriffinR
577e6cc740
Merge pull request #1586 from GriffinRichards/clean-areascreen 
Clean up pokedex_area_screen
 2022-01-06 23:02:23 -05:00
Eduardo Quezada D'Ottone
221e38ff86
Merge pull request #1957 from ghoulslash/be/ability_popup 
Ability Popup Fixes + Longer Ability Names config
 2022-01-01 19:39:55 -03:00
LOuroboros
5cdfe0a9fb Fixed the Lures and adjusted 2 charms' descriptions 2022-01-01 18:03:00 -03:00
LOuroboros
74aa4f29df Corrections and additions 
-Fixed a handful of prices
-Re-added the Todo comment to the entries of the TMs 51-100 in gItemIconTable.
-Added the data and sprites of the LGPE Lures, thanks to AsparagusEduardo.
-Fixed small syntax mistakes in src/data/text/item_descriptions.h
-Slightly changed some item descriptions based on AsparagusEduardo's suggestions.
-Fixed the Exp. Charm's description, and the usage of "Exp." in the Exp. Candies' descriptions.
 2022-01-01 17:17:21 -03:00
LOuroboros
e961bdee14 Fixes 
-Used Buffel Saft's sprite for the Ability Patch.
-Fixed the Mints' descriptions.
-Fixed the Damp Mulch's palette.
-Decapped the Pokémon Box Link's name.
-Fixed the target pocket of the Key Stone and the Dynamax Band.
 2021-12-31 17:10:02 -03:00
LOuroboros
c70e73713f Added the missing items' sprites 2021-12-31 16:28:05 -03:00
GriffinR
23f5c9fd5c Clean up pokedex_area_screen 2021-12-31 00:16:56 -05:00
GriffinR
aba5264260 RGB macro use in slot_machine 2021-12-28 17:46:05 -05:00
GriffinR
4fc345fff5 Rename unused frontier pass tilemap 2021-12-28 14:54:09 -05:00
GriffinR
3acf002a9c Rename generic jp contest tilemaps 2021-12-28 13:16:40 -05:00
GriffinR
ee5e65d9ed Rename generic title screen tilemaps 2021-12-28 03:57:44 -05:00
Eduardo Quezada D'Ottone
934ffd5a7e
Merge pull request #2002 from LOuroboros/gen78footprints 
Added the footprints of all Gen. 7 and 8 species
 2021-12-23 20:28:55 -03:00
Blackforest92
76b9459e42 fix .8bpp palette + revert hippo icons 2021-12-19 17:38:01 +07:00
LOuroboros
614c0ee8d7 Added Gen. 8 footprint sprites 2021-12-18 18:24:49 -03:00
LOuroboros
834ab37b2c Added Gen. 7 footprint sprites 2021-12-18 17:48:45 -03:00
Eduardo Quezada D'Ottone
39ef356be1
Merge pull request #1935 from LOuroboros/someGenderDiffs 
Added gender differences for a couple of Gen. 4 Pokémon
 2021-12-18 13:46:23 -03:00
Eduardo Quezada D'Ottone
c3939cd32b
Merge pull request #1978 from LOuroboros/pikaPal 
Fixed the palette of Pikachu Partner Cap's back
 2021-12-18 13:28:23 -03:00
ultima-soul
18afd06f6d Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-18 00:28:18 -08:00
ultima-soul
b0b8b9bf46 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 23:51:29 -08:00
ultima-soul
4f2e3bf214 Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-12-17 21:23:54 -08:00
ExpoSeed
d6747527da Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-12-16 21:44:01 -06:00
Blackforest92
ef94c0587b Fixes several front.png sprites 2021-12-14 23:38:02 +07:00
Blackforest92
a7c9e6e230 Reverse both Hippopotas and Hippowdon icons to use male only 2021-12-09 00:24:31 +07:00
Blackforest92
55477234ef Palette conversion GEN5 2021-12-08 21:39:31 +07:00
LOuroboros
be05ff2e3b Fixed the palette of Pikachu Partner Cap's back 2021-12-04 16:32:53 -03:00
Blackforest92
2ad3c3f6be Palette Conversion GEN4 2021-12-01 19:57:50 +07:00
Blackforest92
98e5b1f031 Palette conversion GEN3 2021-11-30 23:29:44 +07:00
Blackforest92
5a197aa258 Palette conversion GEN2 2021-11-30 16:40:09 +07:00
ghoulslash
7a7c6afc39 larger ability popup, fix ability name printing/clearing, and config for longer ability names 2021-11-29 12:42:01 -05:00
Blackforest92
8668e5c833 Remove GEN1 junk files 2021-11-29 23:20:02 +07:00
Blackforest92
7ae424eac8 Palette conversion GEN1 2021-11-29 23:18:57 +07:00
SonikkuA-DatH
9d14cb3309
Add files via upload 
Teapot sprited by me. Based on this: https://cdn.discordapp.com/attachments/425852970689626123/914062336476708874/unknown.png
 2021-11-28 19:59:38 -08:00
ultima-soul
01a90ca6c2 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-27 22:17:05 -08:00
ultima-soul
d0623d7b71 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-27 21:40:08 -08:00
ultima-soul
0312c5be8b Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-27 21:38:26 -08:00
Jaizu
b7f4658077 Added Kricketot line gender difference sprites 2021-11-22 16:30:05 -03:00
LOuroboros
8373312ed7 Add gender differences for some Gen. 4 Pokémon 
Namely: Bidoof, Kricketot, Shinx, Starly, Staravia and Staraptor
Credits to CyanSMP64/Furret and Jaizu.
 2021-11-22 16:25:25 -03:00
ultima-soul
a8f9a54787 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-11-21 10:41:32 -08:00
ultima-soul
57bf1c7824 Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-11-21 10:41:12 -08:00
ultima-soul
3ed51d6d91 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-11-21 10:40:26 -08:00
GriffinR
14d78d7633 Finish match call menu doc 2021-11-15 01:20:03 -05:00
GriffinR
7e27a0746d Misc text clean-up 2021-11-14 22:21:17 -05:00
GriffinR
da5752fd0d Start match call menu doc 2021-11-12 20:17:06 -05:00
GriffinR
baeacbe2f1 Clean up pokenav general menus, organize pokenav graphics 2021-11-12 17:08:12 -05:00
GriffinR
f5152094a9 Finish pokenav conditions doc 2021-11-12 11:01:22 -05:00
GriffinR
343ac99049 Start pokenav conditions doc 2021-11-10 17:00:54 -05:00
ultima-soul
c74e19c062 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-11-09 20:58:19 -08:00
Blackforest92
76ba9d835a pulled latest RHH battle_engine 08-11-2021 2021-11-08 16:38:42 +07:00
GriffinR
17b657d83a Finish menu documentation 2021-11-04 11:52:43 -04:00
GriffinR
085f8adec6 Start remaining menu documentation 2021-11-03 17:38:08 -04:00
GriffinR
e14210ce1f
Merge pull request #1536 from GriffinRichards/clean-braille 
Add font id constants, better braille support
 2021-11-03 13:17:29 -04:00
GriffinR
0ba22ca112
Merge pull request #1534 from GriffinRichards/doc-btrans 
Document battle transition
 2021-11-03 11:26:20 -04:00
Blackforest92
b9c23f7c62 Update waterfall, trick room, & focus blast BG 2021-11-03 16:29:09 +07:00
Blackforest92
2d5ed4a1e2 Allow Giga Impact fadein background & upgrade its graphic 2021-11-02 12:53:11 +07:00
Blackforest92
9b6cd383a4 Optimized Rock Wrecker and Hurricane 2021-11-01 01:06:39 +07:00
Blackforest92
e59d0dd5cf clean Spacial Rend background 2021-10-31 22:58:43 +07:00
GriffinR
36039e1b86 Convert fonts.s to C 2021-10-31 01:44:18 -04:00
GriffinR
fdaf436960 Add font id constants 2021-10-30 19:54:15 -04:00
PikalaxALT
de23b3b04d New move tilemap bins are easier to edit 2021-10-30 11:51:22 -03:00
ghoulslash
eedd255b18
Merge pull request #1832 from Blackforest92/battle_engine 
Alternate fix to Steel Beam
 2021-10-30 09:19:54 -04:00
Blackforest92
799852ea77 Introduce alternate Steel Beam 2021-10-30 17:00:55 +07:00
BuffelSaft
da30f023e8
Revert "Ex fix move bg tilemaps" 2021-10-30 19:32:37 +13:00
BuffelSaft
378e66ee9a Fix Mega Gardevoir's front sprite 
The shiny didn't have its black "dress" due to the normal palette having duplicate colours to handle the shiny's extra colours.
 2021-10-30 13:20:18 +13:00
GriffinR
07bf225f94 Continue battle_transition documenting 2021-10-29 11:24:36 -04:00
ghoulslash
cb9f4fbb42
Merge pull request #1760 from PikalaxALT/ex_fix_move_bg_tilemaps 
Ex fix move bg tilemaps
 2021-10-29 09:12:15 -04:00
GriffinR
41ecae91f8 Label remaining symbols in graphics.c 2021-10-27 13:47:18 -04:00
BuffelSaft
adcf563ba1 Add missing berry data 
Certain gen 4+ berries were missing graphics and berry data. Adding this data allows them to be viewed and planted.
 2021-10-26 14:42:06 +13:00
GriffinR
ab80264921
Merge pull request #1519 from GriffinRichards/doc-mgift 
Document Mystery Gift
 2021-10-24 15:50:39 -04:00
LOuroboros
d31700d2ac Replaced the Red and Blue Orbs' sprites 2021-10-23 13:49:02 -03:00
Blackforest92
81011fffc3 allow builder to use anim_front of female pyroar, adjust herdier back position 2021-10-22 09:58:21 +07:00
Blackforest92
19e3eabc4c Fix HERDIER backsprite 2021-10-21 22:55:23 +07:00
Blackforest92
626aa4e754 Fixes stray pixel on magnemite backsprite 2021-10-19 19:27:01 +07:00
Blackforest92
86d4658bd3 Added anim_front.png to gen6 pokemons + fix to magnemite 2021-10-19 19:20:12 +07:00
LOuroboros
d9b8e11a9c Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into primalReversionBE 2021-10-19 07:47:42 -03:00
SonikkuA-DatH
dff6555287
Magnemite 
made highlights white
 2021-10-18 21:01:29 -07:00
SonikkuA-DatH
c84811ac20
Magnemite back 
Retweak. Shiny broke things for base, so went to source
 2021-10-18 18:02:22 -07:00
SonikkuA-DatH
377e46e2ec
For Magnemite sprite errors 
Fixing Magnemite eye to use whites
Also fix back pixel
 2021-10-18 17:49:08 -07:00
Eduardo Quezada D'Ottone
3cdf736eb8 Merge branch 'PokemonExpansion' into fix_pyroarF 
# Conflicts:
#	graphics/pokemon/pyroar/backf.png
 2021-10-17 19:38:20 -03:00
Eduardo Quezada D'Ottone
80d8e4cfd4
Revert "Fix the 'bKGD: invalid index' error" 2021-10-17 07:32:49 -03:00
GriffinR
ff594ccb82 Fix leftover icon_shadow names 2021-10-17 03:22:55 -04:00
GriffinR
356e6d7f08 Clean up mystery gift menu 2021-10-16 23:58:11 -04:00
Eduardo Quezada D'Ottone
9986591b6f Fixed Female Pyroar's sprite position 2021-10-16 17:22:24 -03:00
GriffinR
95406384f4 Start wonder card/news documenting 2021-10-14 13:24:20 -04:00
PikalaxALT
e12c7c07ac New move tilemap bins are easier to edit 2021-10-13 21:01:47 -04:00
Eduardo Quezada D'Ottone
004f705607
Merge pull request #1549 from ghoulslash/last_ball 
add last used ball
 2021-10-09 17:27:28 -03:00
GriffinR
d8e65fc4b6 More battle doc, add battle window ids 2021-10-09 03:01:10 -04:00
LOuroboros
91a68cd5db Implemented Primal Reversion 2021-10-09 00:36:41 -03:00
GriffinR
31b501e7eb Start misc battle documentation 2021-10-08 16:39:46 -04:00
LOuroboros
b520fe5d89 Tweaked Strong Winds' animation 2021-10-06 08:38:19 -03:00
LOuroboros
6b2d756829 Fixed and pngcrush'd Bastiodon's icon 
Thanks to Cynderquil for fixing it.
 2021-09-23 20:40:33 -03:00
ghoulslash
3f34fec42f change last ball graphic based on config. replace saveblock field with ewram field 2021-09-23 12:03:01 -04:00
LOuroboros
1c59586e67 Fixed the 'bKGD: invalid index' error 2021-09-21 22:06:01 -03:00
LOuroboros
8e38d72293 Fix Male Unfezant's anim_front.png 2021-09-21 20:53:18 -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
Eduardo Quezada D'Ottone
d34c311566
Merge pull request #1646 from BuffelSaft/gender-diffs 
Add sprites for major gender differences
 2021-09-20 21:43:12 -03:00
BuffelSaft
0f5444d331 Add sprites and icons for major gender differences 
Credit to MrDollSteak for the sprites - I palette swapped the hippos and made some of the icons, but everything else is MrDS!
 2021-09-11 13:52:09 +12:00
ghoulslash
4f5c98d5b1
Merge pull request #1631 from LOuroboros/milotic 
Fix Milotic's shiny palette
 2021-09-07 06:34:15 -06:00
froggestspirit
f8a24cdd6f Identify unknown healthbox GFX 2021-09-06 10:42:05 -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
7725ea0878 Fixed Milotic's shiny palette 
Credits to Jaizu.
 2021-09-06 04:13:45 -03:00
ghoulslash
03e21bb27e
Merge pull request #1591 from BuffelSaft/mienshao 
Fix Mienshao's front sprite
 2021-09-01 05:58:51 -06:00
ghoulslash
dfe59992d3 merge with be 2021-09-01 07:37:45 -04:00
LOuroboros
69b7910f47 Gave an entrance animation to Delta Stream 2021-08-31 00:15:17 -03:00
ultima-soul
5cb73a012c Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_id_revamp 2021-08-30 11:57:27 -07:00
ExpoSeed
0f99d9d4c6 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into BE/z-moves 2021-08-30 13:26:40 -05: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
4b88b99e1b Fixed Hoopa's footprint 2021-08-23 06:45:04 -03:00
LOuroboros
5c1d7e52dc Added footprints for Gen. 6 species 2021-08-23 06:28:10 -03:00
ultima-soul
4c3ed52c2f Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:39:11 -07:00
ultima-soul
988320b89a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-08-17 11:25:13 -07:00
ultima-soul
840e2bc3f9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-16 16:33:34 -07:00
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
b620349da0 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-16 15:43:27 -07:00
ultima-soul
64a48800c9 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-08-11 17:10:57 -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
ultima-soul
02c9e040df Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-08-11 16:33:10 -07:00
BuffelSaft
017a0fb693 Fix Mienshao's front sprite 2021-08-09 21:48:12 +12:00
cynderquil
757207ff84 Fix Bastiodon's second icon frame 2021-08-07 21:39:06 +01: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
ultima-soul
ad8cfda831 Add and rearrange Key Items. 2021-07-06 17:03:46 -07:00
ultima-soul
53e900a643 Rearranged rest of item ids except for Key Items. 2021-07-02 22:43:50 -07:00
GriffinR
10886a586b Clean up mirage tower 2021-07-01 23:46:15 -04:00
ghoulslash
c06029bc72 add last used ball 2021-06-25 13:37:59 -06:00
ultima-soul
425746763a Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 20:08:43 -07:00
ultima-soul
f3f4d8e608 Merge branch 'pokemon_expansion' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 19:52:20 -07:00
ultima-soul
0a87adad1a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-06-07 18:05:52 -07: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
ghoulslash
c356ffaed4 merge with be. fix null ptr check in GetBattleMoveSplit 2021-05-24 10:46:53 -06:00
LOuroboros
0bc8ed59f5 Wings -> Feathers 2021-05-17 21:58:17 -03: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
00c3f060b1 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 23:53:23 -07:00
ultima-soul
56fc420187 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-28 21:34:30 -07:00
ultima-soul
75a9fdbafa Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-28 20:50:59 -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
ultima-soul
14a0303e2f Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-27 18:36:37 -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
be7acc919a Merge branch 'battle_engine' of github.com:rh-hideout/pokeemerald-expansion into master_sync 2021-04-03 21:53:29 -07:00
ultima-soul
4a81102a46 Merge branch 'master' of github.com:pret/pokeemerald into item_expansion_sync 2021-04-02 13:57:19 -07:00
ultima-soul
b8721034ef Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync 2021-04-02 13:42:05 -07:00
ultima-soul
939608f5b8 Merge branch 'master' of github.com:pret/pokeemerald into battle_engine_sync 2021-04-02 13:16:40 -07:00