Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,756 Commits 1 Branch 0 Tags
Commit Graph

318 Commits

Author SHA1 Message Date
Eduardo Quezada
7c7da8e176 Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/cleanConfigs 
# Conflicts:
#	src/battle_script_commands.c
 2022-09-05 14:43:04 -04:00
LOuroboros
b9a32a93f5 Update src/data/text/move_descriptions.h 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
 2022-08-31 23:39:59 -03:00
LOuroboros
7b8226a8af Added descriptions for LA's moves 2022-08-30 23:05:22 -03:00
LOuroboros
c167e2c6cc Added Legends: Arceus' move data 2022-08-30 19:32:44 -03:00
Eduardo Quezada
925384eedc Generations of Pokémon can now be disabled individually 2022-08-30 12:50:59 -04:00
Eduardo Quezada
df4c065ea6 Separated P_NEW_POKEMON into sections by generation. 
Sizes:
- GEN_3 15.690.076 bytes
- GEN_4 17.480.816 bytes
- GEN_5 19.544.944 bytes
- GEN_6 20.907.332 bytes
- GEN_7 22.233.288 bytes
- GEN_8 23.605.744 bytes
 2022-08-30 12:50:59 -04:00
Blackforest92
b209645b20 Changes Origin to Origin Forme 2022-08-29 21:33:28 +07:00
Eduardo Quezada D'Ottone
32a1017c2d
Fixed tab 2022-08-29 10:13:01 -04:00
Blackforest92
61c33f56a0 Updated to latest master branch + add PLA's data to teachable_learnsets.h 2022-08-29 21:01:31 +07:00
Eduardo Quezada
69f4c226f0 Merge remote-tracking branch 'RHH/master' into RHH_cleanConfigs 
# Conflicts:
#	src/battle_ai_main.c
#	src/battle_controller_opponent.c
#	src/battle_controller_player.c
#	src/battle_script_commands.c
#	src/pokemon.c
#	src/pokemon_summary_screen.c
 2022-08-27 02:42:22 -04:00
Blackforest92
07a07ddc8d Update to latest master branch + allow Reveal Glass to work with Enamorus 2022-08-24 15:00:48 +07:00
Eduardo Quezada
eea718cfc6 Placeholder moves can't be used in battle. 2022-08-24 00:30:49 -04:00
Eduardo Quezada
1f5adf93c7 Cleaned up use of configs be almost exclusively preproc functions 2022-08-23 21:00:08 -04:00
Eduardo Quezada
75ac960365 Introduced P_NEW_POKEMON, which will disable all Gen4+ Pokémon and Forms 2022-08-22 17:27:21 -04:00
ExpoSeed
49da2ee53f Remove all the ifdefs for BATTLE_ENGINE, ITEM_EXPANSION, and POKEMON_EXPANSION 2022-08-02 00:15:55 -05:00
Eduardo Quezada
c6cdb2a281 Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 2022-07-31 22:57:46 -04:00
Eduardo Quezada D'Ottone
22ab78e2f8 Fixed Steam Eruption's long name 2022-07-30 00:10:20 -04:00
Greenphx9
05cbd6a906 Merge branch 'battle_engine' of https://github.com/rh-hideout/pokeemerald-expansion into 16-letter-move-names 2022-07-29 18:49:25 +10:00
Eduardo Quezada
e96c9c87fa Merge remote-tracking branch 'RHH/item_expansion' into RHH_masterMerge 
# Conflicts:
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 23:38:52 -04:00
Eduardo Quezada
f3bebcd12c Merge remote-tracking branch 'RHH/battle_engine' into RHH_masterMerge 
# Conflicts:
#	include/battle_anim.h
#	include/global.h
#	include/pokemon.h
#	src/battle_message.c
#	src/battle_script_commands.c
#	src/data/pokemon/base_stats.h
 2022-07-22 22:57:02 -04:00
Eduardo Quezada D'Ottone
25397e5794 Fixed Light That Burns The Sky not using the calculated damage category 
Also:
- Modified move defines to ease with future move expansion.
- Enabled Instruct's check for Z Moves in AI_CheckBadMove.
 2022-07-21 15:13:00 -04:00
ghoulslash
6b84a9f0b3 merge w be 2022-07-17 12:40:43 -04:00
Greenphx9
4294682d8c 16-letter move names 
Move define, add spaces between comments, fix include
if TRUE -> if set to TRUE

Co-Authored-By: LOuroboros <lunosouroboros@gmail.com>
 2022-07-11 12:49:30 +10:00
LOuroboros
3c9be7c3b2
Fixed Pokéblock Case's description 2022-07-03 13:36:00 -03:00
Blackforest92
8c88e8a9b7 Legends Arceus Pokemon 95% Finished 2022-07-03 17:15:37 +07:00
sneed
5b0afffd91 popup and flower gift description fixes 2022-05-22 13:10:51 +03:00
Eduardo Quezada D'Ottone
4e7ce0b663 Merge branch 'battle_engine' into BE_configs 
# Conflicts:
#	include/constants/battle_config.h
 2022-05-07 10:25:34 -04:00
Eduardo Quezada D'Ottone
d604d99d6e Adjusted description of Glacial Lance and Astral Barrage 2022-04-03 16:54:07 -04:00
Eduardo Quezada D'Ottone
dafb5ca74d Fixed trapping moves not reflecting the configured turn config 2022-04-03 13:03:53 -04: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
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
SubzeroEclipse
d3589103b3 Fixed some move descriptions 2022-03-09 15:23:08 +01:00
SubzeroEclipse
5f33989c42 Fixed format of move descriptions' labels 2022-01-27 21:50:12 +01:00
Eduardo Quezada D'Ottone
02da6cc627 Merge remote-tracking branch 'RHH/item_expansion' into IE_noJadeOrb 
# Conflicts:
#	include/graphics.h
#	src/data/graphics/items.h
#	src/data/item_icon_table.h
#	src/data/items.h
#	src/data/text/item_descriptions.h
 2022-01-16 18:44:03 -03:00
Eduardo Quezada D'Ottone
f6b32c8d17 Fixed Anchor Shot description. 2022-01-08 20:19:53 -03: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
Eduardo Quezada D'Ottone
b25c89f8a1 Removed Redundant Key Stone item 2021-12-31 18:22:23 -03:00
Eduardo Quezada D'Ottone
313df31e7e Removed Jade Orb, since it has no use besides being a key-lock item. 2021-12-31 17:44:03 -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
d4dc672088 Filled in missing item data 2021-12-31 13:23:06 -03:00
ghoulslash
7839750d7e
Merge pull request #1926 from AsparagusEduardo/IE_itemDesc 
Update to item descriptions based on configured effect.
 2021-12-21 09:39:11 -05: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
ultima-soul
26f29a04fd Revert "Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync" 
This reverts commit ac2bcece75fa3bf5bc4018ce659e51a635d46b97, reversing
changes made to 349262ebc35abb090e51c689c74ee839713c83c6.
 2021-12-10 09:41:54 -08:00
ultima-soul
ac2bcece75 Merge branch 'item_expansion' of github.com:rh-hideout/pokeemerald-expansion into item_expansion_sync 2021-12-09 14:16:05 -08:00
LOuroboros
2e67153982 Renamed the Enigma Berries' constants 2021-12-01 22:16:38 -03:00