atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13821 commits 2 branches 40 tags 600 MiB
Commit graph

300 commits

Author SHA1 Message Date
sbird
196038eaee [pokedex_plus] refactor #if to C if 2023-10-22 03:26:24 +02:00
kittenchilly
b5f7a51351
Add Teal Mask item, move, and ability data (#3349) 2023-10-08 15:56:09 -03:00
Pawkkie
7ebaddc290
Adjust evo strings for HGSS dex (#3375) 2023-10-05 08:58:28 -03:00
Aaghat
332cc29273 Add new Evo methods 2023-09-09 10:56:45 +05:30
Aaghat
6ac16c8c2e More clean up 2023-09-09 10:16:14 +05:30
Aaghat
c4231ba860 Merge branch 'tx_pokedexPlus_hgss' of https://github.com/TheXaman/pokeemerald into PokedexPlus_Hgss 2023-09-08 18:47:26 +05:30
psf
75d06bb599
Generation 6 Experience Share (#3276) 2023-09-07 23:18:18 -03:00
Bassoonian
9c9a1fb831 Allow for healing with items 2023-04-22 19:18:10 +02:00
Bassoonian
52ce399240
Fix TM reusability shortcomings (#2930) 2023-04-19 11:01:00 -04:00
Bassoonian
d5b36c7c60
Reusable TMs (#2903) 
* Reusable TMs
* Forgot about Gen9 making TMs expendable again
* Change importance check based on Alex's suggestion
* Prevent items with importance from being bought more than once
* Change importance check to ghoul's suggestion
* Update include/config/item.h
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>

---------

Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2023-04-18 19:52:20 -04:00
Eduardo Quezada
3172273c73 Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/Lures 
# Conflicts:
#	src/pokemon.c
 2022-10-30 12:16:09 -03:00
TheXaman
933ec5ee65 Merge branch 'master' of https://github.com/pret/pokeemerald into tx_pokedexPlus_hgss 2022-10-30 15:10:32 +01:00
Eduardo Quezada
3d214f8204 Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/pokemonFlags 
# Conflicts:
#	src/pokemon.c
 2022-09-27 10:13:32 -03:00
Eduardo Quezada
6b79c7772c Merge branch 'RHH/dev' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	src/battle_interface.c
 2022-09-16 11:56:50 -03:00
Eduardo Quezada
2d78ac0192 Implemented Lures using the same vars as repels 2022-09-12 10:21:49 -03:00
Eduardo Quezada
4b1aca19cb Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909 
# Conflicts:
#	src/battle_controller_link_opponent.c
#	src/battle_controller_opponent.c
#	src/battle_controller_recorded_opponent.c
#	src/battle_controllers.c
#	src/data/pokemon_graphics/back_pic_coordinates.h
#	src/data/pokemon_graphics/front_pic_coordinates.h
#	src/pokemon.c
 2022-09-10 00:17:03 -04:00
Eduardo Quezada
21df8c279b Added SPECIES_FLAG_CANNOT_BE_TRADED 
- Also corrected Cylarex's forms not having the legendary flag
 2022-09-09 08:59:53 -04:00
Eduardo Quezada
9144779634 Removed repeated extern consts in strings.h 2022-09-09 08:49:16 -04:00
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
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
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
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
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
ExpoSeed
3ed06c2cc2 Remove remaining grey and replace with gray 2021-06-10 11:36:10 -05:00
GriffinR
8c820878bf Document Battle Pyramid Bag 2021-04-23 15:07:36 -04:00
GriffinR
22e2c0a47c Document Berry Crush 2021-03-18 15:18:23 -04:00