LOuroboros
|
3c30e6bdc3
|
Implemented Sharpness' effect
|
2022-12-06 05:23:30 -03:00 |
|
LOuroboros
|
4dc44150c5
|
Implemented Wind Rider's effect
|
2022-12-06 05:23:29 -03:00 |
|
Eduardo Quezada
|
2d694a84e3
|
Trying to fix remote reference
|
2022-12-05 21:57:28 -03:00 |
|
Bassoonian
|
06ab4fc842
|
Update move flags
|
2022-12-04 21:56:40 +01:00 |
|
Bassoonian
|
c14fa82f43
|
Fix Headlong Rush description
|
2022-12-04 18:14:27 +01:00 |
|
Bassoonian
|
051ad7bf69
|
Update src/data/text/move_descriptions.h
Co-Authored-By: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2022-12-04 00:26:05 +01:00 |
|
LOuroboros
|
653364fd71
|
Added the basic data for the Gen. 9 Abilities
|
2022-12-02 23:01:22 -03:00 |
|
Eduardo Quezada
|
4bac880042
|
Removed Unown hack
|
2022-11-25 16:55:53 -03:00 |
|
Eduardo Quezada
|
e858b4e709
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221124
# Conflicts:
# include/battle.h
# src/battle_ai_script_commands.c
# src/battle_ai_switch_items.c
# src/battle_dome.c
# src/battle_main.c
# src/battle_pike.c
# src/battle_script_commands.c
# src/battle_tower.c
# src/data/pokemon/species_info.h
# src/pokemon.c
|
2022-11-24 15:36:00 -03:00 |
|
Eduardo Quezada
|
7999220361
|
Fixed modern compile
|
2022-11-22 18:37:38 -03:00 |
|
Eduardo Quezada
|
7327be6f9e
|
Made Types and Egg Groups into arrays
|
2022-11-22 17:05:25 -03:00 |
|
Bassoonian
|
4ac1e4fc61
|
Power Shift is now a clone of Power Trick
|
2022-11-19 13:41:56 +01:00 |
|
GriffinR
|
4736b4b14d
|
Merge pull request #1810 from AsparagusEduardo/pret/pr/baseStatsRename
Renamed gBaseStats to gSpeciesInfo
|
2022-11-18 17:45:23 -05:00 |
|
Bassoonian
|
4da9ecbcea
|
Prepare FLAG_SLICING_MOVE for merger with abilities branch
|
2022-11-18 22:37:31 +01:00 |
|
Bassoonian
|
4034f18c0e
|
Update PLA descriptions
|
2022-11-18 22:30:40 +01:00 |
|
Bassoonian
|
739680e425
|
Victory Dance effect
|
2022-11-18 22:23:34 +01:00 |
|
Bassoonian
|
29ae22183b
|
Mystical Power effect
|
2022-11-18 22:17:08 +01:00 |
|
Bassoonian
|
9512b3a57a
|
Implement Double Shock functionality with temporary string
|
2022-11-18 22:12:26 +01:00 |
|
Bassoonian
|
a250341e6c
|
Forgot to reset Wicked Torque effect rate
|
2022-11-18 22:00:46 +01:00 |
|
Bassoonian
|
3ac3cb249e
|
Wicked Torque effect
|
2022-11-18 22:00:21 +01:00 |
|
Bassoonian
|
d4c92a0a19
|
Fix Bitter Malice's effect
|
2022-11-18 21:54:46 +01:00 |
|
Bassoonian
|
ed33f2b9ce
|
Change PLA moves to SV effects
|
2022-11-18 20:56:25 +01:00 |
|
Bassoonian
|
e279185152
|
Update move data to GEN9 (with config)
|
2022-11-18 12:22:15 +01:00 |
|
Bassoonian
|
f7d1a12d2d
|
Data entry for gen9 moves
|
2022-11-18 12:15:44 +01:00 |
|
LOuroboros
|
7260478c54
|
Uncommented level up moves
|
2022-11-11 01:31:22 -03:00 |
|
Eduardo Quezada
|
f2d0e547ac
|
Merge branch 'RHH/upcoming' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
# src/rom_header_gf.c
|
2022-11-09 19:54:44 -03:00 |
|
GriffinR
|
e434b0047f
|
More missing constant usage
|
2022-11-09 15:53:47 -05:00 |
|
GriffinR
|
1d1c2d41bb
|
Add list menu cursor constants
|
2022-11-09 15:16:46 -05:00 |
|
GriffinR
|
b3e75138da
|
Sync wireless improvements
|
2022-11-09 15:14:18 -05:00 |
|
BuffelSaft
|
1da4eb3b14
|
Merge pull request #2428 from AsparagusEduardo/RHH/pr/feature/DarkVoid
Config for Dark Void being only usable by Darkrai
|
2022-11-05 22:42:51 +13:00 |
|
Eduardo Quezada
|
44bf4a15e3
|
Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald
# Conflicts:
# include/constants/battle_config.h
# include/constants/battle_move_effects.h
|
2022-11-04 12:19:40 -03:00 |
|
Eduardo Quezada
|
d23b5c95c9
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/monAnimations
# Conflicts:
# src/data/pokemon_graphics/front_pic_anims.h
# src/pokemon.c
|
2022-11-03 23:31:20 -03:00 |
|
Eduardo Quezada
|
edf4e45c4d
|
Config for Dark Void being only usable by Darkrai
|
2022-11-03 21:36:12 -03:00 |
|
Eduardo Quezada D'Ottone
|
b8371500d3
|
Merge pull request #1676 from BuffelSaft/multistrike
Multi-hit refactor and Parental Bond
|
2022-11-01 21:16:04 -03:00 |
|
ghoulslash
|
53061c7d62
|
Merge pull request #2391 from AsparagusEduardo/RHH/pr/sugardoodoodoodoodoodooaahhoneyhoney
Implemented Honey's Sweet Scent functionality
|
2022-11-01 20:09:30 -04:00 |
|
Eduardo Quezada
|
14e85249d1
|
Review changes
|
2022-10-30 17:12:13 -03:00 |
|
Eduardo Quezada
|
d02fc43703
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
|
2022-10-30 13:38:25 -03:00 |
|
GriffinR
|
d90132842a
|
Update gitignore/spacing for new region map data
|
2022-10-30 12:22:41 -04:00 |
|
Eduardo Quezada
|
e4a439aa46
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pretmerge_20221030
# Conflicts:
# src/data/bard_music/moves.h
# src/data/bard_music/pokemon.h
|
2022-10-30 12:30:38 -03: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 |
|
GriffinR
|
c76beed989
|
Merge pull request #1807 from pret/porymap-5
Update for Porymap 5.0.0
|
2022-10-30 11:01:37 -04:00 |
|
Eduardo Quezada
|
85c0d2dac8
|
Review changes
|
2022-10-27 11:26:09 -03:00 |
|
Eduardo Quezada
|
85ce30b1d6
|
Created macros for Bard Sounds
|
2022-10-25 14:33:02 -03:00 |
|
Eduardo Quezada
|
3ed485632f
|
Renamed gBaseStats to gSpeciesInfo
|
2022-10-24 17:01:48 -03:00 |
|
BuffelSaft
|
6035c5a280
|
Merge branch 'upcoming' of https://github.com/rh-hideout/pokeemerald into multistrike
|
2022-10-22 14:31:13 +13:00 |
|
GriffinR
|
3e8baa5b04
|
Merge branch 'master' into porymap-5
|
2022-10-18 22:54:25 -04:00 |
|
Eduardo Quezada D'Ottone
|
1607291982
|
Implemented Honey's Sweet Scent functionality
|
2022-10-16 20:20:13 -03:00 |
|
LOuroboros
|
8a1a561b80
|
Uncommented evo moves for each species
|
2022-10-14 11:28:15 -03:00 |
|
GriffinR
|
bd023b1c6c
|
Merge pull request #1796 from GriffinRichards/tilesets-c
Convert tilesets.s to C
|
2022-10-10 12:47:47 -04:00 |
|
GriffinR
|
65d3944a93
|
Give tileset palettes proper type, name compressed secret base tiles
|
2022-10-08 02:02:12 -04:00 |
|
Eduardo Quezada
|
77f24d42e4
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/reworkScald
# Conflicts:
# include/constants/battle_config.h
|
2022-10-07 15:39:02 -03:00 |
|
Eduardo Quezada
|
44754f8ca7
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/feature/palleteConversion2
# Conflicts:
# include/constants/pokemon_config.h
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
|
2022-10-07 15:27:16 -03:00 |
|
Eduardo Quezada
|
68b474c0f0
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20221007
# Conflicts:
# include/constants/items.h
# src/battle_interface.c
|
2022-10-07 14:52:32 -03:00 |
|
Eduardo Quezada
|
9b977486fe
|
Merge remote-tracking branch 'RHH_origin/upcoming' into RHH/pr/pokemonConfig
# Conflicts:
# src/data/pokemon/base_stats.h
|
2022-10-07 14:05:45 -03:00 |
|
ghoulslash
|
441586f23f
|
Merge pull request #2293 from AsparagusEduardo/RHH/pr/pokemonFlags
4 new species flags
|
2022-10-07 10:55:43 -04:00 |
|
ghoulslash
|
1e04c80dfa
|
Merge pull request #2367 from AsparagusEduardo/RHH/pr/feature/MewTeach
Special handling for Mew's Teachable moveset
|
2022-10-07 10:39:56 -04:00 |
|
ghoulslash
|
923046c993
|
Merge pull request #2359 from AsparagusEduardo/RHH/pr/pretmerge_20220925
I don't have any Sunday memes (pret merge 2022-09-25)
|
2022-10-07 10:25:59 -04:00 |
|
GriffinR
|
e293986fbb
|
Merge pull request #1793 from GriffinRichards/clean-shop
Clean up shop.c
|
2022-10-06 17:24:53 -04:00 |
|
GriffinR
|
1f225286d5
|
Use window constants in party_menu
|
2022-09-29 12:55:31 -04:00 |
|
Eduardo Quezada
|
90ad11278d
|
Sorry Mewtwo ^^;
|
2022-09-28 09:17:10 -03:00 |
|
Eduardo Quezada
|
d24899369f
|
Special handling for Mew's Teachable moveset
|
2022-09-28 09:04:31 -03:00 |
|
GriffinR
|
6db489e2d5
|
Use constants for overworld object palette slots
|
2022-09-27 20:16:48 -04:00 |
|
GriffinR
|
4f407a1066
|
Convert tilesets.s to C
|
2022-09-27 17:23:26 -04:00 |
|
Eduardo Quezada
|
ecad6ff0db
|
Merge remote-tracking branch 'RHH_origin/breaking' into RHH/pr/breaking/palleteConversion2
|
2022-09-27 10:46:49 -03:00 |
|
Eduardo Quezada
|
fb9105f8ac
|
Added Mega Evolution flag
|
2022-09-27 10:21:26 -03: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
|
dfdfb72365
|
Separate config for updated move types
|
2022-09-26 07:50:43 -03:00 |
|
GriffinR
|
f0744641d1
|
Merge pull request #1651 from garakmon/entry_json
use json for region map sections
|
2022-09-25 21:56:09 -04:00 |
|
GriffinR
|
171367d66c
|
Merge pull request #1643 from cbt6/object-event-graphics-info
Format object event graphics info
|
2022-09-25 21:55:22 -04:00 |
|
GriffinR
|
56c28fb2dd
|
Move region map gitignore to existing data gitignore
|
2022-09-25 18:15:16 -04:00 |
|
GriffinR
|
e473aaf783
|
Merge branch 'master' of https://github.com/pret/pokeemerald into entry_json
|
2022-09-25 18:10:04 -04:00 |
|
GriffinR
|
7223dbd62f
|
Merge branch 'master' into rme-update
|
2022-09-25 11:56:57 -04:00 |
|
Eduardo Quezada
|
f969effd36
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220925
|
2022-09-25 12:51:39 -03:00 |
|
Eduardo Quezada D'Ottone
|
d59d8b92af
|
Merge branch 'dev' into AI
|
2022-09-24 11:07:09 -03:00 |
|
GriffinR
|
1107ff954d
|
Clean up shop.c
|
2022-09-22 15:08:17 -04:00 |
|
GriffinR
|
9bcc36fe08
|
Merge pull request #1767 from GriffinRichards/trainer-pals
Generate trainer pic palettes from image
|
2022-09-22 11:34:03 -04:00 |
|
Eduardo Quezada D'Ottone
|
681ad8c7a9
|
Merge remote-tracking branch 'RHH_origin/dev_1.x' into RHH/pr/pokemonConfig
# Conflicts:
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/form_change_tables.h
# src/data/pokemon/form_species_table_pointers.h
# src/data/pokemon_graphics/back_pic_coordinates.h
# src/data/pokemon_graphics/front_pic_coordinates.h
|
2022-09-18 18:25:05 -03:00 |
|
Eduardo Quezada
|
720cb249d6
|
Merge remote-tracking branch 'RHH_origin/dev' into RHH/pr/reworkScald
# Conflicts:
# include/constants/battle_config.h
|
2022-09-16 12:06:06 -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
|
77696ca686
|
Rolled EFFECT_SCALD into EFFECT_BURN_HIT with a config for its Gen6+ change
|
2022-09-16 10:31:02 -03:00 |
|
ghoulslash
|
6616c89451
|
Merge pull request #2303 from Blackforest92/RHH-PR-Branch
Tidying graphics - Trio Weather
|
2022-09-15 18:01:43 -04:00 |
|
ghoulslash
|
6cfacb396e
|
Merge pull request #2307 from AsparagusEduardo/RHH/pr/debugMapCount
Automated creation of MAP_GROUP_COUNT for the debug menu
|
2022-09-15 18:01:05 -04:00 |
|
Eduardo Quezada
|
41d11b0708
|
Restored filename format for gendered species
|
2022-09-14 11:13:42 -03:00 |
|
Eduardo Quezada
|
ee628de82f
|
Config to turn off Hippopotas' and Hippowdon's female icons
|
2022-09-13 21:42:53 -03:00 |
|
Eduardo Quezada
|
0caf79f702
|
Merge remote-tracking branch 'blackforest/pokemon_expansion' into RHH/pr/palleteConversion2
# Conflicts:
# graphics/pokemon/cherrim/anim_front.png
# graphics/pokemon/scyther/anim_front.png
# graphics/pokemon/scyther/front.png
# graphics/pokemon/shinx/anim_front.png
# src/data/pokemon_graphics/back_pic_table.h
# src/data/pokemon_graphics/front_pic_table.h
# src/data/pokemon_graphics/palette_table.h
# src/data/pokemon_graphics/shiny_palette_table.h
# src/pokemon_icon.c
|
2022-09-13 20:44:49 -03:00 |
|
Eduardo Quezada
|
de32940fdf
|
Further removed trailing whitespaces
|
2022-09-13 16:26:36 -03:00 |
|
Eduardo Quezada
|
1d7e8bd730
|
Merge remote-tracking branch 'pret/master' into RHH/pr/pretmerge_20220909
# Conflicts:
# asm/macros/battle_ai_script.inc
# asm/macros/battle_script.inc
# data/battle_ai_scripts.s
# include/link_rfu.h
# src/pokemon.c
# src/pokemon_summary_screen.c
# src/sound.c
|
2022-09-13 16:22:42 -03:00 |
|
Eduardo Quezada
|
2d78ac0192
|
Implemented Lures using the same vars as repels
|
2022-09-12 10:21:49 -03:00 |
|
Eduardo Quezada
|
65108c3192
|
Cleaned trailing whitespace
|
2022-09-11 14:14:49 -04:00 |
|
Eduardo Quezada
|
69f01d73cd
|
Added missing uses of Fairy type for Union Room and Battle Factory
|
2022-09-11 12:41:56 -04:00 |
|
Jaizu
|
0daeee83f3
|
Fix Lure prices
This change reflects the original prices used in Pokémon let's go pikachu/eevee
|
2022-09-11 18:06:05 +02: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
|
a462db5e69
|
Automated creation of MAP_GROUP_COUNT for the debug menu
|
2022-09-09 23:34:05 -04:00 |
|
Eduardo Quezada
|
5e399955d5
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/monAnimations
|
2022-09-09 17:37:23 -04:00 |
|
LOuroboros
|
12fee71008
|
Merged FORM_ITEM_USE_TIME into FORM_ITEM_USE
|
2022-09-09 15:39:48 -03:00 |
|
Eduardo Quezada D'Ottone
|
69d3fafdcf
|
Merge pull request #2273 from LOuroboros/zazaForms
Introduced FORM_BATTLE form changes
|
2022-09-09 14:15:53 -04:00 |
|
Blackforest92
|
431cb6fa7c
|
Tidying graphics - Trio Weather
|
2022-09-09 21:57:40 +07:00 |
|
Eduardo Quezada
|
8449f237c2
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/pr/pokemonFlags
# Conflicts:
# src/pokemon.c
|
2022-09-09 09:02:35 -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
|
1fa9bc1b5c
|
Adjusted style of coords tables
|
2022-09-08 18:32:01 -04:00 |
|