Bassoonian
c8e978c3d5
Pret merge 2025-04-29 ( #6722 )
2025-04-29 23:24:12 +02:00
Hedara
4873589c65
Merge remote-tracking branch 'pret/master' into new-pret-merge
...
Conflicts:
asm/macros/battle_script.inc
data/battle_anim_scripts.s
include/battle.h
include/battle_controllers.h
include/battle_setup.h
include/constants/battle.h
src/battle_anim_normal.c
src/battle_anim_utility_funcs.c
src/battle_bg.c
src/battle_controllers.c
src/battle_main.c
src/battle_script_commands.c
2025-04-29 20:27:33 +02:00
Eduardo Quezada
9c6fa49671
Use correct define for moves in test runner ( #6711 )
2025-04-28 12:09:47 -04:00
DavidJCobb
35b33a46e9
Identified task and sprite fields related to battle weather animations
...
Named task and sprite fields related to the animations for Hail, Rain Dance, and Sandstorm.
2025-04-28 05:39:52 -04:00
Eduardo Quezada
fc872b481e
Fix FORM_CHANGE_ITEM_HOLD bug manifested during givemon ( #6702 )
2025-04-27 15:27:21 +02:00
Alex
1cd4d23969
Fixes Z and Max moves dmg reduction against side protection ( #6697 )
2025-04-26 21:46:41 +02:00
DavidJCobb
7ee3043c58
Update battle_controllers.h
...
typo
2025-04-26 11:47:48 -04:00
DavidJCobb
2864408060
Tweaks to documentation comments
2025-04-26 11:40:14 -04:00
DavidJCobb
b4ee45f3e8
Renamed BATTLELINKMSGTYPE_ to BATTLELINKCOMMTYPE_
...
I want to avoid the word "message" since PRET has already chosen "battle message" as the term for predefined strings usable in the battle scripts and UI.
I was considering the term "battle link packet" instead, but the library for wireless communications already uses the word "packet" even though GBATEK does not. I'm going with "battle link communication type" instead. For this particular context, I don't think we need a compound noun ("X type"); the singular noun "type" is fine enough.
2025-04-26 11:37:20 -04:00
DavidJCobb
d8721b668e
Fixed find-and-replace mistake
...
Functions were using the wrong constant.
2025-04-26 10:54:22 -04:00
DavidJCobb
8f5c1a452d
Update battle_controllers.h
...
Simplified macros.
2025-04-26 01:33:17 -04:00
DavidJCobb
2738d11b0f
Additional fixes to last few commits
...
ROM now compiles, but it's not comparing as equal...
2025-04-26 01:00:16 -04:00
DavidJCobb
bab9f0cfef
gBattleControllerExecFlags macro in MarkAllBattlersForControllerExec
...
whoops, missed one
2025-04-26 00:46:06 -04:00
DavidJCobb
a4370ffcde
gBattleControllerExecFlags bits now identified via helper macros
...
Created "exposition" macros to describe operations performed on gBattleControllerExecFlags. Updated the battle engine internals to use them, to more clearly document how battle link communications actually work.
2025-04-26 00:45:03 -04:00
DavidJCobb
9dc48899d3
BUFFER_A/B -> BATTLELINKMSGTYPE; link send/recv. task data names
...
Replaced the BUFFER_A and BUFFER_B constants with the BATTLELINKMSGTYPE enum, which also identifies the "controller becoming idle" message type.
Named the task data for the link send task and the link receive task. Added macros to functions related to those tasks, for legibility.
2025-04-26 00:13:42 -04:00
Bassoonian
d53c616e06
Adds a whole bunch of new tests ( #6685 )
2025-04-24 20:13:03 +02:00
hedara90
5cd7bd77b3
Fix various Toxic Spikes interactions ( #6690 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-04-24 17:06:47 +02:00
PhallenTree
34e91dd96f
Fixes Unburden doubling speed when affected by Neutralizing Gas ( #6691 )
2025-04-24 15:26:23 +02:00
Martin Griffin
66c07f9c33
Merge pull request #2123 from estellarc/birch-dialog-box
...
CI / build (push) Has been cancelled
Missing constant in Birch speech dialogue
2025-04-24 09:04:03 +01:00
Estellar
dd70446db5
Added constant in Birch speech dialogue
2025-04-23 18:46:11 -04:00
Alex
20799d5835
Remove misleading comment ( #6684 )
2025-04-23 14:24:25 +02:00
hedara90
6fdb6a9e34
Fixed broken palette load for shiny followers in the sprite visualizer ( #6683 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-23 12:17:54 +02:00
Alex
71cfab6477
Fixes Magician Life Orb interaction ( #6676 )
2025-04-22 21:01:00 +02:00
PhallenTree
91fc406b0a
Fixes Mirror Armor stat drops not being stopped by Substitute ( #6675 )
2025-04-22 19:54:04 +02:00
Alex
72839fc002
Fixes Bug Bite eaten berry not ignoring Unnerve ( #6666 )
2025-04-22 00:38:39 +02:00
PhallenTree
007d7e712e
Fixes Neutralizing Gas activating again after switch-in ( #6667 )
2025-04-21 19:14:53 +02:00
Alex
d220459a01
Fixes Intimidate / Eject Pack interaction ( #6645 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-21 17:33:29 +02:00
Eduardo Quezada
4e7fa359ef
Fixed LGPE move test fail with B_UPDATED_MOVE_DATA to GEN_7 ( #6657 )
2025-04-21 14:48:49 +02:00
Alex
c4edfd2988
Fix gBattlerTarget OOB for Gravity and Perish Song ( #6662 )
2025-04-21 13:53:04 +02:00
cawtds
0069ec1f0c
Fix captivate-oblivious interaction and related test ( #6653 )
2025-04-21 11:01:01 +02:00
Alex
86969f9919
Remove HitmarkerSwapAttackerTarget ( #6627 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:52 +02:00
Alex
fedbce510b
Fixes commander activation on a fainted mon ( #6632 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:49:18 +02:00
Alex
5c02abb101
Test for Freeze vs Scald thaw ( #6658 )
...
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 22:36:50 +02:00
Eduardo Quezada
c650199909
Added missing gMovesInfo encapsulation ( #6656 )
2025-04-20 22:36:27 +02:00
PhallenTree
bd64ab599b
Fixes Ally Switch cancelling partner's moves targeting that side of the field ( #6647 )
2025-04-19 20:24:00 +02:00
Bivurnum
d342b373f0
Fix no eligible mons when only the partner wins in multi battle ( #6626 )
2025-04-19 14:15:13 +02:00
hedara90
17b992bec5
Fixes some moves trying to load too much VRAM ( #6633 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-18 17:16:46 -04:00
Alex
6b09480912
Fixes some restore issues ( #6629 )
2025-04-18 16:57:04 -04:00
Alex
37f72bb237
Fix Mirror Armor and Obstruct interaction ( #6630 )a
2025-04-18 16:21:57 -04:00
Alex
2a03f881d4
Fixes Big Root Leech Seed heal amount ( #6638 )
2025-04-18 16:07:18 -04:00
hedara90
031fd4d363
Fixed Color Change test referring to the wrong mon ( #6644 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-18 16:06:22 -04:00
hedara90
ae95f2c4a1
Fixes Gulp Missile freezing the game if when attacker fainted ( #6639 )
2025-04-17 21:32:56 +02:00
AlexOn1ine
4e2c60ece7
remove wrong check
2025-04-17 19:56:08 +02:00
AlexOn1ine
2d1b2f28c4
Fixes Gulp Missile freezing the game if when attacker fainted
2025-04-17 19:46:16 +02:00
hedara90
4528bbe01d
Fix VRAM load for Black Hole Eclipse ( #6635 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-17 15:42:25 +02:00
hedara90
7a35f35352
Make generated files match the current formatting ( #6636 )
2025-04-17 13:38:30 +02:00
hedara90
747bf4b7f6
Capped Exp from Daycare to level cap ( #6622 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-15 23:53:46 +02:00
PhallenTree
3b05d7934f
Fixes wrong battler's Illusion wearing off when the Attacker faints and fixes Illusion tests ( #6596 )
2025-04-14 18:17:24 +02:00
hedara90
40c5ad5043
Fix Magma Storm getting stuck ( #6605 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-14 17:07:59 +02:00
GriffinR
f11bddf854
Fixes for Mirage Tower graphics ( #2120 )
...
CI / build (push) Has been cancelled
* Add documentation for CreateCeilingCrumbleSprites
* Combine mirage tower graphics
* Add comment about mirage tower / player palette
2025-04-14 08:12:45 +02:00
