LOuroboros
9d6953cc63
Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field ( #3243 )
...
* Deleted sTMHMMoves array, TMs/HMs read moves from their secondaryId item field now
The unused "registrability" variable has been removed in order to preserve the size of the gItems array after turning the secondaryId variable into a u16.
* Made ItemIdToBattleMoveId return ITEM_NONE if an item that is not a TM/HM is passed through it
* Renamed IsMoveHm to IsMoveHM
2023-08-21 12:49:17 +01:00
Eduardo Quezada D'Ottone
5b885a4ddb
Convert vanilla trainer data to only use the full custom trainer mon struct ( #3114 )
2023-08-17 18:19:38 -04:00
Eduardo Quezada
d3333812dd
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer
2023-08-17 17:52:28 -04:00
Eduardo Quezada
a6dbb68bac
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# data/battle_scripts_1.s
# src/battle_util.c
# src/battle_z_move.c
2023-08-17 13:42:09 -04:00
Philipp AUER
cd90fdec5d
[Critical] fix memory corruption when handling trigger sprites ( #3238 )
...
Co-authored-by: sbird <sbird@no.tld>
2023-08-16 20:21:16 -04:00
kittenchilly
dba28cf93f
Allow Z-Moves to be selected after Mega Evolution ( #3233 )
...
* Allow Z-Moves to be selected after Mega Evolution
* You cannot do Wish Mega Evolution at all if you hold a z crystal
* Rebase to master
2023-08-14 19:10:15 -04:00
LOuroboros
2d45b9b8fe
Corrected conditionals used for B_SPEED_BUFFING_RAPID_SPIN and I_GEM_BOOST_POWER ( #3232 )
2023-08-14 16:14:12 -04:00
LOuroboros
c414a0103c
Made Cmd_jumpifnopursuitswitchdmg and Cmd_pursuitdoubles use Pursuit's effect ID instead of its move ID ( #3231 )
...
* Made jumpifnopursuitswitchdmg use Pursuit's effect ID instead of its move ID
* Made Cmd_pursuitdoubles use Pursuit's effect ID too, even though it's unused
2023-08-14 08:45:37 -04:00
Eduardo Quezada
32c3c33376
Missing master merge organization
...
My bad ^^;
2023-08-13 19:01:03 -04:00
PCG
b8a22eb119
Remove soundMove from Steam Eruption and replace it with sheerForceBoost ( #3229 )
...
Co-authored-by: PCG06 <prajithgomes06@gmail.com>
2023-08-13 00:53:22 -04:00
gruxor
f493ae8c69
Fixed item sprites with palette errors ( #3222 )
2023-08-12 18:13:33 -04:00
Eduardo Quezada
09fc48461f
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# test/battle/move_flags/three_strikes.c
# test/move_flag_strike_count.c
# test/move_flag_three_strikes.c
# test/powder_moves.c
# test/status1.c
2023-08-12 16:31:44 -04:00
Eduardo Quezada D'Ottone
d62c0d6d51
Organized tests into subfolders ( #2822 )
2023-08-12 20:00:15 +01:00
Eduardo Quezada
952bacd858
Merge branch 'RHH/master' into RHH/upcoming
...
# Conflicts:
# .github/ISSUE_TEMPLATE/01_battle_engine_bugs.yaml
# .github/ISSUE_TEMPLATE/02_battle_ai_issues.yaml
# .github/ISSUE_TEMPLATE/04_other_errors.yaml
2023-08-11 17:50:28 -04:00
Eduardo Quezada D'Ottone
ada29313de
Fix for wild double battles with an in-game partner ( #3210 )
...
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-08-11 17:29:10 -04:00
Eduardo Quezada D'Ottone
1ba70a46f2
Fixed Jump Kick's recoil not happening after Spiky Shield's damage ( #3208 )
...
Co-authored-by: DizzyEggg <jajkodizzy@wp.pl>
2023-08-11 17:26:43 -04:00
Philipp AUER
59da940283
Refactor damage formula to match Gen5+ ( #3196 )
...
* [battle, damage] refactor damage formula to match gen5+
* [test] use exact values for dry skin, swarm tests
* fixup: assume stats for dry-skin, swarm tests
---------
Co-authored-by: sbird <sbird@no.tld>
2023-08-11 16:28:38 -04:00
Eduardo Quezada D'Ottone
bd7960ef21
Updated versions for issue templates ( #3220 )
2023-08-11 12:04:03 -04:00
Eduardo Quezada
f026b51b48
Merge branch 'RHH/upcoming' into RHH/pr/upcoming/cleanup/customTrainer
...
# Conflicts:
# src/battle_main.c
# src/battle_tower.c
# src/match_call.c
2023-08-11 11:41:44 -04:00
Martin Griffin
f6e6a1f383
Initialize save to empty in test runner ( #3215 )
2023-08-09 10:06:03 -04:00
Alex
42992ca5ce
Fix Teleport ending trainer battles ( #3166 )
2023-08-07 11:23:12 -04:00
DizzyEggg
1fb42e4497
Sticky web / Court Change / Mirror Armor tests + small fixes ( #3160 )
...
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
Co-authored-by: Martin Griffin <martin.griffin@algosport.co.uk>
2023-08-07 10:27:57 -04:00
Eduardo Quezada D'Ottone
fc66a8c476
Adds Mortal Spin and Population Bomb ( #3178 )
2023-08-07 08:54:18 -04:00
Alex
8ee3a3c5bb
solve conflics
2023-08-07 14:25:30 +02:00
Eduardo Quezada
d74cbca0b9
LF shenanigans
2023-08-06 21:02:16 -04:00
Eduardo Quezada
34d38bdbae
Merge branch 'RHH/master' into RHH/upcoming
2023-08-06 20:31:45 -04:00
Eduardo Quezada
833f7dd9d3
LF shenanigans
2023-08-06 20:25:23 -04:00
Eclipse
5226935857
Fixed Trainer class ball not assigned to second Pokémon ( #3203 )
2023-08-04 22:56:05 -04:00
ghoulslash
a0dd77dd41
Improve AI switching, so it doesn't get killed on switch-in ( #3146 )
2023-08-04 07:34:58 -04:00
ghoulslash
dc1d44eefd
Updated Cmd_jumpifsideaffecting ( #3200 )
2023-08-04 07:32:54 -04:00
ghoulslash
4ae6ae4de3
Reset all battler IDs at battle start ( #3111 )
...
* reset battler IDs before BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts to prevent playanimation from executing on invalid battler ids
* replace BS_SCRIPTING with BS_BATTLER_0 in BattleScript_OverworldTerrain and BattleScript_OverworldWeatherStarts
---------
Co-authored-by: ghoulslash <pokevoyager0@gmail.com>
2023-08-04 08:57:06 +02:00
DizzyEggg
e7bc42fcaf
use IsValidForBattle
2023-08-03 21:17:39 +02:00
LOuroboros
0bace94dc7
Updated Cmd_jumpifsideaffecting
2023-08-03 14:46:45 -03:00
Philipp AUER
7d8bcce9a5
Optimize sprite.c ( #3175 )
2023-08-03 15:57:04 +03:00
Martin Griffin
17555feb20
Animation script cleanup and fixes - Part 2 ( #3193 )
2023-08-02 12:28:29 +01:00
Martin Griffin
b08b6a37cb
Optimize BuildOamBuffer
2023-08-02 12:22:30 +01:00
Martin Griffin
b3295d1cfb
Reverted BattleMove power to u8 ( #3187 )
2023-08-02 12:20:11 +01:00
Martin Griffin
cd51471c96
Revamped GetTotalAccuracy ( #3182 )
2023-08-02 12:19:36 +01:00
Martin Griffin
5543c9da8b
[battle, movesets] revert bulbasaur's level up change ( #3194 )
2023-08-02 09:06:48 +01:00
sbird
1d8ad1b756
[battle, movesets] revert bulbasaur's level up change
2023-08-02 09:51:45 +02:00
Eduardo Quezada
f94efa94e1
Merge branch 'RHH/master' into RHH/upcoming
2023-08-02 01:18:07 -04:00
ghoulslash
7a814999e5
MOVE_CORROSIVE_GAS Effect ( #3152 )
...
# Conflicts:
# data/battle_anim_scripts.s
# data/battle_scripts_1.s
# include/constants/battle_move_effects.h
2023-08-02 01:05:54 -04:00
Eduardo Quezada
87050d8c08
Fix Stamina/Wind Power/Electromorphosis/Rattled issues with targets ( #3143 )
2023-08-01 23:54:04 -04:00
Philipp AUER
44eb6260cc
[battle, anim] woodhammer animation overhaul ( #3192 )
...
* [battle, anim] woodhammer animation overhaul
* squashme: timings
---------
Co-authored-by: sbird <sbird@no.tld>
2023-08-01 19:10:18 -04:00
Eduardo Quezada
e21346dd67
Fixed Rage Powder's animation not turning the user red
2023-08-01 19:05:39 -04:00
Eduardo Quezada
d0277fc04f
Cleaned: createvisualtask AnimTask_BlendColorCycle
2023-08-01 19:05:18 -04:00
Eduardo Quezada
2cf7f54a6b
Cleaned: 3 more createvisualtask
...
- AnimTask_CanBattlerSwitch
- AnimTask_BlendMonInAndOut
- AnimTask_CentredFrozenIceCube
2023-08-01 19:05:11 -04:00
Eduardo Quezada
ac519bd5d3
Cleaned: createvisualtask AnimTask_FlailMovement & AnimTask_ElectricChargingParticles
2023-08-01 19:05:04 -04:00
Eduardo Quezada
eef07a9f9f
Cleaned: createvisualtask AnimTask_HorizontalShake
2023-08-01 19:04:56 -04:00
Eduardo Quezada
5fc5e5703c
Cleaned: createvisualtask AnimTask_RockMonBackAndForth & AnimTask_PositionFissureBgOnBattler
2023-08-01 19:04:47 -04:00