Eduardo Quezada D'Ottone
|
4aa14355d7
|
Merge branch 'upcoming' into gen9-species-nomigration
|
2023-11-06 13:49:02 -03:00 |
|
Eduardo Quezada D'Ottone
|
820be61c9f
|
Merge branch 'RHH/pr/upcoming/reorderMonGraphics' into RHH/review/gen9mon-4
|
2023-11-02 21:32:23 -04:00 |
|
Eduardo Quezada D'Ottone
|
eccd2c4a65
|
Merge commit '1467ffa3d8ca71b8b91da815dcf120421759793c' into gen9-species-nomigration
|
2023-11-02 21:28:53 -04:00 |
|
kittenchilly
|
244ca0be95
|
Add custom female icon sprites for Pikachu and Wobbuffet (#3506)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-11-01 18:49:44 -03:00 |
|
Eduardo Quezada D'Ottone
|
2dfae911aa
|
Added config for Weak Armor's Gen 5-6 effect (#3498)
|
2023-10-30 17:18:00 -03:00 |
|
kittenchilly
|
c0c100d90d
|
Base friendship Gen 8+ config (#3491)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-10-30 16:45:52 -03:00 |
|
Bassoonian
|
ab25e6bfa5
|
Fixes Synchronize's OW effect and adds configs (#3480)
|
2023-10-28 23:24:20 -03:00 |
|
Bassoonian
|
0dd22305a4
|
Adds Illuminate's Gen9 effect (#3482)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-10-28 23:22:41 -03:00 |
|
Eduardo Quezada
|
ae1266e077
|
Automatically change dex number digits based on NATIONAL_DEX_COUNT
|
2023-10-28 22:15:21 -03:00 |
|
kittenchilly
|
5087095aae
|
Obedience levels now increase per badge (#3475)
|
2023-10-27 19:17:17 -03:00 |
|
leo60228
|
5f2b6f57f7
|
Merge branch 'upcoming' into gen9-species-nomigration
|
2023-10-26 17:31:31 -04:00 |
|
Eduardo Quezada
|
1137d54b61
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# asm/macros/battle_script.inc
# src/battle_script_commands.c
|
2023-10-23 17:36:42 -03:00 |
|
Bassoonian
|
5592706a71
|
Fix Synchronize devnote + Gen9 behaviour
|
2023-10-23 17:59:07 +02:00 |
|
Eduardo Quezada
|
f570d14f2d
|
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/gen9-species-nomigration
# Conflicts:
# include/constants/species.h
# sound/cry_tables.inc
# src/data/pokemon_graphics/enemy_mon_elevation.h
# src/data/pokemon_graphics/front_pic_anims.h
|
2023-10-23 09:23:32 -03:00 |
|
kittenchilly
|
3755155e9d
|
Update friendship evo threshold to gen 8+ with config (#3376)
|
2023-10-22 18:05:54 -03:00 |
|
voloved
|
ebdf14c620
|
Push B in wild battle moves to Run (#3362)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-10-21 12:45:40 -03:00 |
|
kittenchilly
|
33a0fdbbc6
|
Add new move flags and update all flags for every move (#3425)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-10-19 20:16:37 -03:00 |
|
leo60228
|
920fd481e7
|
Regional Dex numbers are always 3 digits
|
2023-10-18 14:37:28 -04:00 |
|
Eduardo Quezada
|
6cc2a1ef03
|
4 digits option for dex numbers
(cherry picked from commit 9bad51cbc6)
|
2023-10-18 14:37:28 -04:00 |
|
Eduardo Quezada D'Ottone
|
133ffc7260
|
Merge pull request #15 from Bassoonian/rhhspeciesreorder
Add gen 9 Pokémon data
(cherry picked from commit cd3e65f5c9)
|
2023-10-18 14:33:56 -04:00 |
|
Eduardo Quezada
|
c0540a3559
|
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
# include/battle.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
|
2023-10-15 00:30:00 -03:00 |
|
Martin Griffin
|
311224d32f
|
Converted most battle preproc ifs to regular ifs (#3392)
|
2023-10-12 15:28:41 +01:00 |
|
Eduardo Quezada
|
805c65b255
|
Merge branch 'RHH/master' into RHH/upcoming
|
2023-10-11 13:14:23 -03:00 |
|
Eduardo Quezada
|
482029d7ec
|
Removed Transistor from master
|
2023-10-11 13:07:16 -03:00 |
|
Eduardo Quezada
|
186884120c
|
Merge branch 'RHH/master' into RHH/upcoming
|
2023-10-11 13:02:12 -03:00 |
|
Eduardo Quezada D'Ottone
|
eedc61709d
|
Various tests + Poison Heal fix + Transistor update (#3385)
|
2023-10-11 11:34:20 -03:00 |
|
Eduardo Quezada
|
4d4d566c2b
|
Undid flag
|
2023-10-10 18:09:42 -03:00 |
|
Eduardo Quezada
|
f830b0725a
|
GMAX -> GIGANTAMAX
|
2023-10-10 18:07:12 -03:00 |
|
Eduardo Quezada
|
2fac60055f
|
Merge branch 'RHH/master' into RHH/upcoming
|
2023-10-09 22:08:32 -03:00 |
|
Eduardo Quezada
|
92301398bc
|
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/dynamax
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/battle.h
# include/battle_controllers.h
# include/battle_interface.h
# include/config/battle.h
# include/constants/battle.h
# include/constants/battle_anim.h
# include/constants/battle_move_effects.h
# include/constants/battle_string_ids.h
# include/data.h
# include/random.h
# sound/cry_tables.inc
# src/battle_anim_new.c
# src/battle_controller_opponent.c
# src/battle_controller_player.c
# src/battle_controller_player_partner.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_message.c
# src/battle_script_commands.c
# src/battle_util.c
# src/data/pokemon/form_change_table_pointers.h
# src/data/pokemon/species_info.h
# src/data/text/move_names.h
# test/test_runner_battle.c
|
2023-10-09 16:51:41 -03:00 |
|
Eduardo Quezada D'Ottone
|
9ed7fe1c94
|
Made Gen6 exp share easier to understand (#3384)
|
2023-10-09 12:15:13 +02:00 |
|
Eduardo Quezada
|
d1c672d3ce
|
Converted most battle preproc ifs to regular ifs
|
2023-10-08 21:32:15 -03:00 |
|
Petuuuhhh
|
fd19c261d2
|
Add calculation boosts for Light Ball and Sandstorm (#3387)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-10-07 22:30:16 -03:00 |
|
Bassoonian
|
cee84f0f74
|
Fix issues and add more ability tests
|
2023-10-06 15:13:26 +02:00 |
|
kittenchilly
|
ab8bc6e493
|
Add new sell value of 1/4 of an item's price, with config (#3315)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-10-05 09:14:42 -03:00 |
|
kittenchilly
|
cc1d748b47
|
Fixed Shiny Charm doing too many rerolls by default (#3327)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-30 20:34:52 -03:00 |
|
Bassoonian
|
b673738ba5
|
Add config for pressing B in the PC
|
2023-09-21 16:26:00 +02:00 |
|
kittenchilly
|
d4217739e6
|
Add type boosting held item power config (#3326)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-20 22:03:00 -03:00 |
|
kittenchilly
|
4a3ee0db7f
|
Implement Exp Charm and unevolved Exp multipliers + Exp formula fixes (#3301)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-14 15:37:57 -03:00 |
|
DizzyEggg
|
bd48cca8a2
|
ai delay timer
|
2023-09-12 10:35:05 +02:00 |
|
kittenchilly
|
7a24167b4d
|
Merge remote-tracking branch 'upstream/upcoming' into overworldsnow
|
2023-09-08 11:47:35 -05:00 |
|
psf
|
75d06bb599
|
Generation 6 Experience Share (#3276)
|
2023-09-07 23:18:18 -03:00 |
|
kittenchilly
|
9fcb1a8687
|
Merge remote-tracking branch 'upstream/upcoming' into overworldsnow
|
2023-08-31 11:56:12 -05:00 |
|
DizzyEggg
|
aae4a0970c
|
merge with upcoming
|
2023-08-30 15:46:27 +02:00 |
|
kittenchilly
|
37f6685949
|
Merge branch 'upcoming' into overworldsnow
|
2023-08-27 14:51:57 -05:00 |
|
voloved
|
2a2cd77cf4
|
Allow Cycling Through Balls in the Last Ball Used Menu (#3039)
|
2023-08-24 19:23:26 -04:00 |
|
kittenchilly
|
a79898f1b1
|
Make fog cause misty terrain
|
2023-08-20 13:51:48 -05:00 |
|
kittenchilly
|
0ad3919f22
|
Fix overworld snow weather
|
2023-08-19 01:40:31 -05:00 |
|
DizzyEggg
|
8d5ba6c6d1
|
allow ai vs ai battles
|
2023-08-09 09:15:42 +02:00 |
|
Eduardo Quezada
|
f94efa94e1
|
Merge branch 'RHH/master' into RHH/upcoming
|
2023-08-02 01:18:07 -04:00 |
|