Eduardo Quezada
|
c0d4e14a61
|
Merge branch 'RHH/upcoming' into RHH/pr/feature/reworkScald
# Conflicts:
# include/config/battle.h
# include/constants/battle_move_effects.h
|
2022-12-21 12:46:09 -03:00 |
|
Eduardo Quezada
|
c03f354dca
|
Finished cleaning up the animations to the new standard
|
2022-12-16 20:58:41 -03:00 |
|
Eduardo Quezada
|
6a57dcdc4c
|
Merge remote-tracking branch 'pret/master' into RHH/pr/sync/pret_20221216
# Conflicts:
# src/data.c
# src/data/pokemon_graphics/front_pic_anims.h
|
2022-12-16 19:19:23 -03:00 |
|
ghoulslash
|
e3e0d60222
|
Merge pull request #2467 from Bassoonian/gen9moves
Generation IX Moves
|
2022-12-11 14:47:47 -05:00 |
|
Eduardo Quezada
|
2f96344cd9
|
Removed ANIM_CMD macro from unused_anims.h
|
2022-12-10 11:46:41 -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 |
|
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 |
|
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 |
|