Eduardo Quezada
|
098bc118b8
|
Indexes for Type Effectiveness table
|
2023-10-03 13:31:29 -03:00 |
|
Eduardo Quezada
|
ef1073ddee
|
Merge branch 'RHH/master' into RHH/upcoming
|
2023-10-02 18:50:15 -03:00 |
|
DizzyEggg
|
a9528e7ade
|
Fix CreateNPCTrainerPartyForTrainer test failing on modern (#3367)
|
2023-10-02 18:33:47 -03:00 |
|
Eduardo Quezada D'Ottone
|
966f89eeb6
|
pret merge 2023-10-02 (#3372)
|
2023-10-02 17:37:03 -03:00 |
|
Eduardo Quezada D'Ottone
|
20e3b43f7c
|
HGSS Style Pokedex (#3288)
|
2023-10-02 17:28:37 -03:00 |
|
Eduardo Quezada
|
4febd2cf55
|
Incorporated upstream fixes
|
2023-10-02 17:20:17 -03:00 |
|
Eduardo Quezada
|
a6940c9e03
|
Merge branch 'pret_master' into RHH/pr/upcoming/pret_Merge20231002
# Conflicts:
# src/battle_ai_script_commands.c
# src/battle_controller_player.c
# src/battle_controller_recorded_opponent.c
# src/battle_controller_safari.c
# src/battle_controller_wally.c
# src/battle_controllers.c
# src/battle_gfx_sfx_util.c
# src/battle_interface.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/mystery_gift_menu.c
# src/pokemon.c
|
2023-10-02 17:17:41 -03:00 |
|
Eduardo Quezada
|
ca81aba3b6
|
Merge branch 'RHH/master' into RHH/upcoming
|
2023-10-02 14:11:24 -03:00 |
|
ghoulslash
|
3c32011d6a
|
Fix Intimidate Contrary in double battles (#3365)
|
2023-10-02 10:02:25 -04:00 |
|
DizzyEggg
|
c69d8e0960
|
Improve how AI chooses damaging moves (#3199)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-10-01 20:36:57 -03:00 |
|
DizzyEggg
|
dc119b27c2
|
Fix Intimidate Contrary in double battles
|
2023-10-01 19:06:43 +02:00 |
|
GriffinR
|
654b6380b1
|
Merge pull request #1926 from AsparagusEduardo/pret/pr2/EggWall
Solved a bunch of -Wall errors on modern
|
2023-10-01 11:57:30 -04:00 |
|
GriffinR
|
3ff27bdae0
|
Merge pull request #1928 from kittenchilly/friendship
Add friendship evo threshold constant
|
2023-10-01 11:53:03 -04:00 |
|
DizzyEggg
|
f840f7eb56
|
Fix Red Card not getting consumed after Sticky Web activation (#3364)
|
2023-10-01 10:35:12 -03:00 |
|
DizzyEggg
|
10adba3af4
|
Fixed entry hazards switch in issue (#3316)
* fix entry hazards switch in issue
* accidental known failing fix
|
2023-10-01 10:30:41 -03:00 |
|
DizzyEggg
|
093c653801
|
Fixed Berserk gene issue in double battles (#3363)
* fix berserk gene issue + tests
* Update test/battle/hold_effect/berserk_gene.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/hold_effect/berserk_gene.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* berserk gene review changes
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-10-01 10:25:04 -03:00 |
|
Bassoonian
|
8a1f166f5d
|
Updates Pokémon abilities to Gen9 (#3353)
|
2023-09-30 20:35:35 -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 |
|
DizzyEggg
|
8efc34eb7e
|
flinch tests + protect/flinch fix (#3345)
|
2023-09-30 20:30:28 -03:00 |
|
Eduardo Quezada
|
b724cfc578
|
Review comment
|
2023-09-30 18:22:38 -03:00 |
|
Eduardo Quezada
|
70ec4c4406
|
Merge branch 'RHH/master' into RHH/upcoming
|
2023-09-30 17:44:06 -03:00 |
|
Eduardo Quezada D'Ottone
|
977860f834
|
Fixed deleting PC mon by placing another one on top with B (#3360)
|
2023-09-30 20:31:11 +02:00 |
|
kittenchilly
|
9f1dbeeead
|
Pickup Table Refactor (#3351)
|
2023-09-28 17:41:42 -03:00 |
|
Eduardo Quezada D'Ottone
|
7b3f72f5ff
|
Version 1.6.0 (#3350)
|
2023-09-27 13:42:30 -03:00 |
|
Eduardo Quezada D'Ottone
|
a0e560e0ec
|
Updated README.md (#3352)
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2023-09-27 13:41:58 -03:00 |
|
DizzyEggg
|
2fcb9bbc9b
|
Wild battle tests + tests for exp points (#3342)
* Add WIld Battles to test runner + exp tests
|
2023-09-27 08:35:05 +01:00 |
|
Eduardo Quezada
|
9f60202667
|
Merge branch 'RHH/upcoming' into RHH/pr/version/1.6.0
|
2023-09-26 22:53:49 -03:00 |
|
kittenchilly
|
cc30dc06d5
|
Add friendship evo threshold constant
|
2023-09-26 16:25:15 -05:00 |
|
kittenchilly
|
baca050724
|
Allow Sliggoo to evolve during overworld fog (#3343)
|
2023-09-26 17:05:44 -03:00 |
|
GriffinR
|
3eb1fa6fcb
|
Merge pull request #1925 from AsparagusEduardo/pret/pr2/dayNightConst
Slight RTC documentation + Evolution times constants
|
2023-09-26 15:01:37 -04:00 |
|
Eduardo Quezada
|
e1d1236d0b
|
Merge remote-tracking branch 'RHH_origin/master' into RHH/upcoming
|
2023-09-26 15:55:32 -03:00 |
|
DizzyEggg
|
0fed4e8912
|
fix protect tests failing on upcoming (#3348)
|
2023-09-26 15:54:01 -03:00 |
|
Eduardo Quezada
|
f3a65c0315
|
Merge branch 'RHH/master' into RHH/upcoming
|
2023-09-26 09:12:28 -03:00 |
|
Eduardo Quezada D'Ottone
|
f35c5e2346
|
Pret merge 2023/09/26 (#3347)
|
2023-09-26 08:36:12 -03:00 |
|
Eduardo Quezada
|
2d397030fa
|
Incorporate upstream fixes
|
2023-09-26 08:22:26 -03:00 |
|
Eduardo Quezada
|
9144b36ac1
|
Merge remote-tracking branch 'pret/master' into RHH/upcoming
# Conflicts:
# include/graphics.h
# src/anim_mon_front_pics.c
# src/data/graphics/pokemon.h
# src/data/pokemon/level_up_learnsets.h
# src/data/pokemon/pokedex_text.h
# src/data/pokemon_graphics/still_front_pic_table.h
# src/wild_encounter.c
|
2023-09-26 08:13:49 -03:00 |
|
Eduardo Quezada D'Ottone
|
de577f955a
|
Greatly reduce AI lag (#3308)
|
2023-09-26 07:28:18 -03:00 |
|
DizzyEggg
|
e0e49a9933
|
Fix protect recoil issue and add tests for protect (#3321)
* fix protect recoil issue and add tests for protect
* test for #3312 and baneful bunker fix
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* more recoil moves for protect test
* Update test/battle/move_effect/protect.c
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
* rename spiky shield test
---------
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-26 07:26:23 -03:00 |
|
ghoulslash
|
0b9f12efe4
|
Adds support for placing Pokémon in the PC with the B button (#3329)
Adds support for placing Pokémon in the PC with the B button
|
2023-09-24 21:35:16 -04:00 |
|
ghoulslash
|
a2640838c9
|
Fix Seed Sower changing move targets when triggered in double battles (#3341)
Fix Seed Sower changing move targets when triggered in double battles
|
2023-09-24 21:33:29 -04:00 |
|
Eduardo Quezada
|
566ec93492
|
Merge branch 'RHH/master' into RHH/upcoming
# Conflicts:
# asm/macros/battle_script.inc
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
# include/constants/battle_script_commands.h
# include/constants/battle_string_ids.h
# src/battle_script_commands.c
# src/data/battle_moves.h
|
2023-09-24 20:32:45 -03:00 |
|
DizzyEggg
|
996bc6ba24
|
Fix order of messages in gen6 exp share (#3339)
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
|
2023-09-24 17:07:56 -03:00 |
|
DizzyEggg
|
1f1308f2f5
|
merge ghoul fix and correct test
|
2023-09-24 14:42:27 +02:00 |
|
DizzyEggg
|
ba03992abd
|
test for seed sower
|
2023-09-24 14:28:06 +02:00 |
|
DizzyEggg
|
7d9555dadb
|
change some more variables to u32
|
2023-09-24 11:06:45 +02:00 |
|
DizzyEggg
|
5d77123c50
|
merge with master
|
2023-09-24 10:52:41 +02:00 |
|
LOuroboros
|
35e76e9868
|
Fixed Ice Spinner, refactored battle terrain text string tables and ditched EFFECT_REMOVE_TERRAIN (#3247)
Co-authored-by: Alex <alexthenotes@gmail.com>
|
2023-09-24 00:01:18 -03:00 |
|
GriffinR
|
7cc75eb5b8
|
Merge pull request #1927 from Kurausukun/m4asym
Add Missing Constant Usage in m4a_1
|
2023-09-23 21:49:12 -04:00 |
|
Kurausukun
|
6eb6282c89
|
add missing constant usage in m4a_1
|
2023-09-23 17:06:12 -04:00 |
|
ghoulslash
|
b77dec1234
|
Transform updates AI_PARTY data (#3295)
* Cmd_transformdataexecution overwrite AI_PARTY data
* remove whitespace
* add RecordAllMoves
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
|
2023-09-23 10:44:30 +02:00 |
|