Eduardo Quezada
8d94c58cac
Shows exp when leveling up with Exp Candies
2022-08-31 21:54:27 -04:00
Eduardo Quezada D'Ottone
399a0c9d6f
Merge pull request #2142 from AgustinGDLV/exp_candy
...
Gen 8 EXP Candies
2022-08-25 23:03:24 -04:00
Eduardo Quezada
afcc1178b2
Merge remote-tracking branch 'pret/master' into MergedBranchUltimate
...
# Conflicts:
# data/battle_ai_scripts.s
# data/battle_scripts_1.s
# include/battle_controllers.h
# include/battle_script_commands.h
# include/battle_util.h
# include/constants/battle_script_commands.h
# include/constants/global.h
# include/decompress.h
# src/battle_anim_effects_1.c
# src/battle_anim_normal.c
# src/battle_anim_poison.c
# src/battle_anim_water.c
# src/battle_arena.c
# src/battle_controller_link_opponent.c
# src/battle_controller_link_partner.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_recorded_player.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/berry.c
# src/data/trainers.h
# src/decompress.c
# src/field_effect.c
# src/hall_of_fame.c
# src/overworld.c
# src/pokeball.c
# src/pokemon.c
# src/pokemon_icon.c
# src/pokemon_storage_system.c
# src/scrcmd.c
2022-08-22 20:30:45 -04:00
GriffinR
2df6cc1820
Merge pull request #1730 from GriffinRichards/sync-naming-screen
...
Clean up naming screen graphics
2022-08-12 11:05:55 -04:00
GriffinR
bfdbbad468
Split naming screen palettes/graphics, use correct image palettes, clean up
2022-08-09 09:27:28 -04:00
ghoulslash
c7c7a76608
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
2022-08-04 19:06:29 -04:00
GriffinR
06dc93fc2f
Clean up field_poison.c
2022-07-06 21:04:54 -04:00
AgustinGDLV
bd008e4c80
fixed softlocks / messages
2022-05-16 15:25:13 -07:00
TheXaman
b2601f043b
added the ability to check out all data (base stats, moves, abilities etc) for the forms implmeneted in the RHH pokemon_expansion
2022-01-03 21:38:59 +01:00
TheXaman
9446ad112a
added the ability to directly open evolutions from the EVO page
2022-01-03 16:48:50 +01:00
ghoulslash
6f6ed0a25c
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
2021-11-28 15:01:19 -05: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
57bf1c7824
Merge branch 'master' of github.com:pret/pokeemerald into pokemon_expansion_sync
2021-11-21 10:41:12 -08:00
TheXaman
111555132f
Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss
2021-11-18 16:48:49 +01:00
GriffinR
ecb13cdbf7
Merge pull request #1550 from GriffinRichards/doc-pokenav
...
Document Pokénav
2021-11-17 14:47:34 -05:00
GriffinR
f5152094a9
Finish pokenav conditions doc
2021-11-12 11:01:22 -05:00
GriffinR
684f599a44
Label remaining battle_interface symbols
2021-11-08 16:03:44 -05:00
ghoulslash
222d1d3194
merge with pret
2021-10-26 13:21:50 -04:00
Katelyn Gigante
347a173402
Prevent text glitch if a pokemon has an unspecified custom evolution
2021-10-25 13:24:48 +11:00
TheXaman
475bb8a624
added preEvolutions to the EvoScreen!
2021-10-24 16:31:19 +02:00
ultima-soul
78d2215196
Improve and refactor some form change code. Separated out ability checks into their own methods. Change FORM_ITEM_USE_TIME to specify time of day instead of hardcoding.
2021-10-03 10:16:09 -07: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
ghoulslash
03fa4939ff
merge with pret
2021-08-18 20:22:03 -06:00
GriffinR
28a8fe191a
Document item menu
2021-08-10 22:13:02 -04:00
TheXaman
6b8f40b3b1
new layout for evo screen and new buttons for the PE version
2021-06-14 17:29:42 +02:00
TheXaman
2d4a91f0b4
added Decapped version of the button prompts
2021-06-14 15:00:26 +02:00
TheXaman
d0012305c0
stats page new navigation button prompts
2021-06-14 14:55:55 +02:00
TheXaman
1530da10a0
changed catch rate to words
2021-06-13 01:17:47 +02:00
TheXaman
537a17714c
EV Arrows now close to stats
2021-06-13 00:35:38 +02:00
TheXaman
13256b856e
Egg groups now in one line (if 2 different one),
...
changed where the bg is cleared
2021-06-12 23:38:08 +02:00
TheXaman
6bbdc79f5a
EVs represented by Arrows instead of numbers, also now in 1 line
2021-06-12 21:55:02 +02:00
TheXaman
73cc40fd03
Egg cycles now with icons insteat of numbers
2021-06-12 19:52:43 +02:00
TheXaman
74e562da33
friendship now emoji based
2021-06-12 15:29:01 +02:00
ghoulslash
0c14ec4b78
Merge branch 'master' of https://github.com/pret/pokeemerald into dexnav
2021-06-11 12:22:15 -06:00
ExpoSeed
3ed06c2cc2
Remove remaining grey and replace with gray
2021-06-10 11:36:10 -05:00
ghoulslash
3c4bf808f1
merge with pret
2021-05-18 09:31:34 -06:00
GriffinR
8c820878bf
Document Battle Pyramid Bag
2021-04-23 15:07:36 -04:00
ghoulslash
5e948e746b
add dexnav
2021-04-02 12:28:00 -06:00
GriffinR
22e2c0a47c
Document Berry Crush
2021-03-18 15:18:23 -04:00
TheXaman
1b3b717248
Added Forms screen for PokemonExpansion (rhh)
2021-02-11 17:55:53 +01:00
TheXaman
fbbc604848
Added evolution screen! Improved BE compatibility
2021-02-04 13:48:32 +01:00
GriffinR
0bf49198f6
Resume factory screen doc
2020-12-30 13:28:15 -05:00
TheXaman
abf5d238c2
PokedexPlus with HGSS styled UI by TheXaman
...
more ui, BROKEN atm
type icons in info screen
working topbar
dpad for switching and white mon name
initial working stats screen
additional stats, proper move list array
Working stats screen, all infos in, all icons in, buggy when switching
Fixed sprite bug, proper sprite destruction, works with old compiler
new navigation: info>area>stats
power+accuracy text, change of positions
layout for stats screen, other screen visually broken
new stats layout properly working plus toggle infos
show lvl of LevelUpMove and TM/HM of TMHM_Move
3 dashes for EggMoves and CORRECT icon for TM/HMs pog
improved layout and contest move data!
TutorMoves now available
hold dpad to scroll, pure relieve
search by move code working
6evs, 16 character move names, tripple digit moves, new eduardo layout
working tileset, info screen no correct xy layout for elements yet
new list menu start
new layout working, only missing stats bars
new list, new search
fixed area screen change and fixed "new caught" bug (type icons)
2020-11-08 00:49:14 +01:00
GriffinR
22c1bf965a
Finish documenting berry blender
2020-08-24 17:06:55 -04:00
GriffinR
8b95e1964b
Merge pull request #1121 from GriffinRichards/doc-roulette
...
Document roulette
2020-08-10 17:18:09 -04:00
GriffinR
b40cee540e
Continue documenting roulette
2020-08-02 14:52:05 -04:00
GriffinR
36a4764a78
Document some slot machine data
2020-07-26 02:15:59 -04:00
GriffinR
50e48898d2
Merge pull request #1088 from GriffinRichards/doc-starterchoose
...
Document starter_choose.c
2020-07-17 16:02:10 -04:00
GriffinR
431c60c92c
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-confetti
2020-07-08 15:45:31 -04:00
GriffinR
43c48d95c2
Document starter_choose.c
2020-07-06 17:26:25 -04:00
