Eduardo Quezada
18aff2db3b
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_anim_script.inc
# data/battle_anim_scripts.s
# include/constants/battle_anim.h
# src/battle_anim.c
# src/data/battle_anim.h
2024-07-27 16:26:37 -04:00
Eduardo Quezada
bb471746d6
Renamed EVO_DEFEAT_WITH_ITEM to EVO_DEFEAT_THREE_WITH_ITEM ( #5046 )
2024-07-27 21:41:05 +02:00
Eduardo Quezada
1e8773356c
Changed EVO_OVERWORLD_STEPS to use an EWRAM variable ( #5047 )
...
* Changed EVO_OVERWORLD_STEPS to use an EWRAM variable
* Fixed PC swapping not resetting the follower steps
2024-07-27 20:48:59 +02:00
Eduardo Quezada
1cf2592a9b
Pret Merge (27th of July) ( #5045 )
2024-07-27 10:17:07 -04:00
Bassoonian
c603e11310
Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge27july
2024-07-27 12:01:39 +02:00
Martin Griffin
30f8ccfe6e
Merge pull request #2017 from PokemonSanFran/numSnowflakeSpritesConstant
...
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-27 07:26:40 +01:00
pkmnsnfrn
91b48a10d4
Added constant for NUM_SNOWFLAKE_SPRITES
2024-07-26 21:57:42 -07:00
luckytyphlosion
7316e54161
Merge pull request #2016 from luckytyphlosion/master
...
Fix WSL1 install instructions
2024-07-26 19:22:58 -04:00
DizzyEggg
e82e3b4198
Allow flags in trigger scripts ( #4900 )
2024-07-26 23:46:33 +02:00
Pawkkie
3c1fbbb06e
Fixes cantBeSurpressed ability check for breakable abilities ( #5043 )
2024-07-26 15:57:01 -04:00
AlexOn1ine
5dd10a4af1
forgot abilityShield check
2024-07-26 21:34:20 +02:00
AlexOn1ine
dfd63fd34f
func CanBreakThroughAbility
2024-07-26 21:30:41 +02:00
AlexOn1ine
89563cb9b1
check for breakable ability
2024-07-26 21:11:16 +02:00
AlexOn1ine
8b2774e07d
Fixes cantBeSurpressed ability check for breakable abilities
2024-07-26 20:19:58 +02:00
hedara90
b0b63f66b9
Added Ivy Cudgel Animation ( #5034 )
...
* Added Ivy Cudgel Anim, changed Ogerpon palettes, added jumpifmovetypeequals command
* Make the 20 year old compiler not complain
* Maybe better cudgel
* Moved animation
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 18:06:44 +02:00
Eduardo Quezada
cc00446eb8
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/data/graphics/pokemon.h
# src/data/pokemon/species_info/gen_9_families.h
2024-07-26 09:42:52 -04:00
hedara90
3d65141db8
Fixed Sandile sprite ( #5038 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-26 00:07:43 +02:00
kittenchilly
a16448c081
Update and clean up Battle Debug ( #4643 )
...
* Update battle debug with new stuff
* Fix status not showing up
* Update hold effects as well
* Update battle_debug.c
* Update battle_debug.c
2024-07-26 00:07:11 +02:00
hedara90
a372035fc8
Trainerproc: Support Ogerpon ( #5035 )
2024-07-25 19:46:14 +02:00
psf
c69107a14a
Fix fishing minigame ( #5031 )
...
Fixed issue from #4343 where `GEN_3` minigame was not correctly working.
2024-07-25 08:37:02 -07:00
Martin Griffin
5b251b614c
trainerproc: Support Ogerpon
2024-07-25 14:50:32 +01:00
Pawkkie
062856cc6c
Add Memento to Risky AI flag ( #5032 )
2024-07-25 13:57:42 +02:00
cawtds
7ae6b1d22a
fix fishing minigame
2024-07-25 00:58:21 +02:00
kittenchilly
7f6ddcf9d9
Update all level up learnsets to Indigo Disk ( #5023 )
...
* Update all movesets to Indigo Disk
* Also update past gens for gen 9 mons
* Update gen_1.h
2024-07-24 22:53:37 +02:00
sneed
298ee34097
fix givemon not giving Cherish Ball ( #5022 )
2024-07-24 20:37:46 +02:00
PhallenTree
7b2914c046
Fix Mold Breaker-like abilities, AI Move Accuracy function, Fury Cutter with Parental Bond ( #5030 )
...
* Fix GetBattlerAbility not checking correct battler's action
* Fix Fury Cutter counter being incorrectly incremented on 2nd hit of Parental Bond + test
* Fix AI_SetMoveAccuracy only using attacker's ability
* Review
2024-07-24 19:36:55 +02:00
luckytyphlosion
3d2b861436
Fix WSL1 install instructions
2024-07-23 17:53:19 -04:00
hedara90
3f4b4adae5
Updated reference to config location to new location ( #5026 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-23 14:09:32 -04:00
hedara90
7a4df80f89
Added Ogerpon Tera Sprites ( #4996 )
...
* Added Ogerpon Tera Sprites
* Updated references to Ogerpon Tera forms
* Fixed back sprite offsets and color indices for Hearthflame Tera
* Removed Ogerpon data duplicates
---------
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-23 11:55:07 -04:00
Eduardo Quezada
ae48293806
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# src/battle_ai_util.c
2024-07-22 23:06:44 -04:00
tertu
305c1ba55e
Fix random IVs for givemon ( #5021 )
2024-07-22 15:05:23 -05:00
hedara90
84e249f98a
Some tera tests ( #5020 )
...
* Added tests for Terapagos/tera interactions
* Fixed missed things
* Fixed Terapagos Stellar boost (by Alex)
---------
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-22 20:43:17 +02:00
cawtds
30ff2fa337
fix givemon random ivs
2024-07-22 17:18:22 +02:00
ghoulslash
67551dba04
Fixes AI not being aware during calcs ( #4992 )
2024-07-22 08:20:16 -04:00
kittenchilly
0bcd6a5435
Make Snow Warning description respect config ( #5018 )
...
* Make Snow Warning description respect config
* Update src/data/abilities.h
---------
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2024-07-22 13:39:32 +02:00
PhallenTree
aac6ebd3d7
Fixes Sleep Talk, Toxic Debris and Jaboca/Rowap Berry issues; Adds Sleep Talk tests ( #5009 )
...
* Fix Sleep Talk failing with choice item; Added some Sleep Talk tests
* Fix Jaboca, Rowap berries recording Rocky Helmet Effect; Fix Toxic Debris not checking side's toxic spikes count properly in Doubles
2024-07-21 21:24:05 +02:00
sneed
3fa6bf46db
Test battlers always have their forced abilities ( #4707 )
...
* Test battlers always have their forced abilities
* indentation
2024-07-21 21:20:39 +02:00
Eduardo Quezada
0b02527e5c
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# test/test_runner.c
2024-07-21 13:36:07 -04:00
hedara90
7e509c440b
Added Terapagos Stellar Sprite ( #5008 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2024-07-21 08:17:31 +02:00
Eduardo Quezada
01831a30b9
Temporarely revert regional form inheritance ( #5004 )
2024-07-20 18:23:47 +02:00
Eduardo Quezada
9d5e253867
Improved Test Runner Summary ( #4641 )
...
* Filename in list (no proper sorting yet)
* Line number and message in error list + removed sorting
* Style adjustment
* Added missing file/line number to "expected N passes/successes"
* Fixed Known Failing Passing test list
* Separated test list from totals
* Assumption fails list
* Better names
* Filename for KNOWN_FAILINGs passing
* Moved total back to the bottom
* Spaces correction
* Fixed test list count
* Source file for Alloc fails on tests
* Moved sourceLine from BattleTest to Test struct
* Fixed assumptions failed "and more" counter
* Fixed ASSUMPTION block not printing their line numbers
* Fixed when stopLine is printed
* Renamed stopLine to failedAssumptionsBlockLine
2024-07-20 18:22:40 +02:00
tertu
5ccf3e2688
Fix chain fishing shiny rolls ( #4906 )
2024-07-19 09:48:14 -05:00
Eduardo Quezada
98eb4e5027
Merge branch '_RHH/master' into _RHH/upcoming
...
# Conflicts:
# asm/macros/battle_script.inc
# include/constants/battle_string_ids.h
# src/battle_ai_switch_items.c
# src/battle_main.c
# src/battle_script_commands.c
# src/battle_util.c
# src/frontier_util.c
# test/battle/ai/ai.c
2024-07-19 09:20:05 -04:00
Bassoonian
f2311b4c97
Add trainer class ball test ( #4999 )
2024-07-19 12:30:06 +02:00
Bassoonian
296bd05f53
Fix tests not compiling outside of CI ( #4998 )
2024-07-19 11:58:42 +02:00
Bassoonian
9ff30ee87a
Fix frontier ineligibility fix ( #4997 )
2024-07-19 11:46:25 +02:00
Alex
552e2768da
Fixes to Opportunist and Mirror Herb adjustments ( #4928 )
...
* Replace Opportunist todo tests with proper tests
* add failing test
* desc
* Fixes to Opportunist and Mirror Herb adjustments
* more tests
* some fixes
* first turn events switch
* simple enum + revert test desc
2024-07-19 11:01:46 +02:00
Bassoonian
93ee3a9197
Fix Psycho Shift Frostbite interaction ( #4995 )
2024-07-18 21:51:21 +02:00
Alex
62640456e7
Fixes residual damage order. #4945 Follow up. ( #4993 )
2024-07-18 12:48:23 +02:00
Alex
b21ffa1f9b
Changes score adjustments to tempScore increases ( #4987 )
2024-07-17 23:36:15 +02:00
