PhallenTree
fadf472157
Adds RNG tags and tests for Moody and Starf Berry ( #6718 )
2025-05-01 10:16:15 +02:00
Pawkkie
1a2cd5645a
Fix roll handling in AI party damage calcs ( #6733 )
2025-05-01 10:15:19 +02:00
Pawkkie
4b1789ab1e
Fix Wonder Guard potential double switching ( #6737 )
2025-04-30 18:16:48 -04:00
Alex
55f9f6adea
Refactor battler flee and watch options + clean up ( #6724 )
2025-04-30 11:54:42 -04:00
Alex
4ff2f3de42
Centralizes non volatile status effect checks ( #6533 )
...
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
2025-04-30 11:34:19 -04:00
Hedara
0eeba00d1b
Merge branch 'master' into master-upcoming-2025-04-30
...
Conflicts:
include/battle.h
include/constants/expansion.h
include/graphics.h
src/battle_bg.c
src/battle_util.c
src/data/graphics/battle_terrain.h
src/data/graphics/pokemon.h
src/pokeblock_feed.c
src/pokemon_sprite_visualizer.c
2025-04-30 15:22:37 +02:00
Cafe
b451bc3606
New Lurantis animation ( #6725 )
2025-04-30 12:45:29 +02:00
Alex
afcba8d9cd
Fixes Stomping Tantrum not doubling power if asleep or frozen ( #6719 )
2025-04-29 23:25:56 +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
Pawkkie
ab6a97d20d
remove predictedScore
2025-04-28 21:47:17 -04:00
Pawkkie
787a8a0d9d
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
2025-04-28 13:23:33 -04:00
Bivurnum
49ae82c679
changed remove check from objId to localId for npc followers
2025-04-28 10:58:35 -05: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
Pawkkie
96a8035dec
Fix party data assignment ( #6712 )
2025-04-28 08:48:21 +02:00
Pawkkie
7a3cf5d3a3
Improve AI's defense against Focus Punch ( #6713 )
2025-04-28 08:34:09 +02:00
Pawkkie
38c90909eb
WORKS, still needs work :D
2025-04-28 00:56:03 -04:00
Pawkkie
4970b3bd95
Merge remote-tracking branch 'upstream/upcoming' into move-prediction
2025-04-28 00:33:42 -04:00
Eduardo Quezada
c1b9ed5dcf
Fixed upcoming not compiling in gcc 11.4.0 ( #6710 )
2025-04-27 23:11:03 -04:00
hedara90
67f3405864
Fix pc mon pic ( #6709 )
...
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-27 15:19:46 -04:00
hedara90
5dfbdf56da
27/04/25 Master to upcoming merge ( #6701 )
2025-04-27 18:01:50 +02:00
Eduardo Quezada
fc872b481e
Fix FORM_CHANGE_ITEM_HOLD bug manifested during givemon ( #6702 )
2025-04-27 15:27:21 +02:00
Bivurnum
47723c34e5
Follower NPCs (follow-me) ( #6500 )
...
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-27 14:56:18 +02:00
AlexOn1ine
19fb962173
remove more unused
2025-04-27 14:56:03 +02:00
AlexOn1ine
1c5d9b4708
unused var
2025-04-27 10:03:31 +02:00
AlexOn1ine
e246b20e72
27/04/25 Master to upcoming merge
2025-04-27 09:50:25 +02:00
Alex
87bd59b6f4
Fixes Z and Max moves dmg reduction against side protection - upcoming ( #6698 )
2025-04-26 23:37:15 +02:00
hedara90
d1aa49cca3
Remove compressed palettes ( #6455 )
2025-04-26 22:58:40 +02:00
Alex
1cd4d23969
Fixes Z and Max moves dmg reduction against side protection ( #6697 )
2025-04-26 21:46:41 +02: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
Pawkkie
8f5b2fddf7
Fix bracket typo in AI_CheckBadMove conditional ( #6695 )
2025-04-26 09:46:10 +02: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
Pawkkie
9737850eea
Keep Steven Multi Debug Option at the Bottom Forever ( #6694 )
...
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-04-25 19:57:22 +02:00
PCG
f661f3b3ac
Pokedex Plus HGSS move configs ( #6687 )
2025-04-24 19:34:37 +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
Estellar
dd70446db5
Added constant in Birch speech dialogue
2025-04-23 18:46:11 -04:00
Ruby
2a762cbbed
Removes vestigial EWRAM variable from debug menu. ( #6686 )
2025-04-23 20:03:58 +02:00
Ruby
aba34015db
Time menu for RTC in debug menu. ( #6634 )
...
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-23 19:34:37 +02:00
khbsd
971a595e4a
Evolution Refactor ( #6556 )
...
Co-authored-by: Eduardo Quezada <eduardo602002@gmail.com>
2025-04-23 16:01:33 +02:00
Alex
20799d5835
Remove misleading comment ( #6684 )
2025-04-23 14:24:25 +02:00
Alex
d3fe5c4640
Some Me First tests plus minor clean up ( #6678 )
2025-04-23 12:18:57 +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
Alex
c6521e06ad
Fix party access in NoAliveMonsForBattlerSide ( #6677 )
2025-04-22 21:00:08 +02:00
Alex
72839fc002
Fixes Bug Bite eaten berry not ignoring Unnerve ( #6666 )
2025-04-22 00:38:39 +02:00
