Commit Graph

12887 Commits

Author SHA1 Message Date
Alex
baf5be2035
Replace: moveId -> move, moveIdx -> moveIndex (#2134)
Some checks failed
CI / build (push) Has been cancelled
2025-05-09 16:33:23 +01:00
Eduardo Quezada
392d662c12
Rename GetPartyBattlerData to GetBattlerMon (#6800) 2025-05-09 15:14:09 +02:00
Alex
2044bea883
Rename battlerId to battler for consistency (#2126) 2025-05-09 12:43:23 +01:00
Pawkkie
04cebed982
Fix AI function table to match new u64 flags (#6796) 2025-05-09 12:32:22 +02:00
Alex
9060d401c9
Adds partyState to BattleStruct (#6783) 2025-05-09 12:29:54 +02:00
Pawkkie
92fe602694 missed one 2025-05-08 16:48:03 -04:00
Pawkkie
c7ee329433 Full functionality 2025-05-08 16:45:10 -04:00
Eduardo Quezada
f3113eb865
Add missing uses of IsBattlerAlly (#6793) 2025-05-08 21:18:51 +02:00
Pawkkie
b48d0c387d Throw out unnecessary functions 2025-05-08 14:49:49 -04:00
Pawkkie
da047dfd22
Add AI for Zero to Hero Palafin (#6791) 2025-05-08 20:33:27 +02:00
Pawkkie
83b7732fae Store predictingMove, config for chance 2025-05-08 14:19:43 -04:00
spindrift64
5e190d0782
Fix gems activating for moves that don't deal type damage (#6789) 2025-05-08 20:17:32 +02:00
Pawkkie
63ffe603be merge fixes 2025-05-08 14:04:27 -04:00
Pawkkie
1e57670b34 Merge remote-tracking branch 'upstream/upcoming' into move-prediction 2025-05-08 13:58:18 -04:00
Eduardo Quezada
5820cc99f6
battle_main enum cleanup (#6788) 2025-05-08 13:34:33 +02:00
i0brendan0
8cc289ef35
Fix rerolls overwriting Fixed Personality (#6774) 2025-05-08 11:28:00 +02:00
Eduardo Quezada
addebea4d6
Better handling of battle coords (#6787) 2025-05-07 22:25:10 +02:00
hedara90
b6b6e91959
A lot of tests (#6734)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-07 16:50:12 +02:00
Alex
6a548a6034
Document battler side in anim code (#6780) 2025-05-07 11:05:01 +02:00
Alex
7c4fb512a1
Fixes Symbiosis not triggering when a weakness berry was consumed (#6782) 2025-05-07 11:04:11 +02:00
Alex
6fe5f6530a
General MoveEnd clean up and Fell Stinger adjustments (#6674) 2025-05-07 00:30:43 +02:00
Alex
1871d16ffa
Refactor battler message ids (#6765) 2025-05-07 00:24:10 +02:00
Eduardo Quezada
f12c321845
InitSpritePosToAnimAttacker documentation (#6781) 2025-05-06 21:51:26 +02:00
Eduardo Quezada
15e39339b9 InitSpritePosToAnimAttacker documentation 2025-05-06 15:11:38 -04:00
Eduardo Quezada
1f23fe0dd3
Use GetPartyBattlerData where appropiate (#6779) 2025-05-06 17:13:50 +02:00
Eduardo Quezada
76b9a6918e
Use missing constants with GetBattlerSpriteCoord (#6778) 2025-05-06 14:54:28 +02:00
Alex
4e7b1f2a97
Fixes Stomping Tantrum not boosting damage when missed due to Accuracy (#6762) 2025-05-06 12:07:01 +02:00
Pawkkie
c8fa4442d9
Adjust switch AI based on move scoring (#6615) 2025-05-06 00:39:44 +02:00
GriffinR
c39ef1a030
Merge pull request #2125 from DavidJCobb/battle-link-re
Some checks failed
CI / build (push) Has been cancelled
Battle link reverse-engineering
2025-05-05 18:17:28 -04:00
spindrift64
0742741dd3
Fix Life Orb inflicting self damage when using status moves (#6767) (#6773) 2025-05-04 22:26:12 +02:00
Pawkkie
3f5335c4ba
Refactor AI flags to u64 (#6753)
Co-authored-by: DizzyEggg
2025-05-04 17:16:34 +02:00
PCG
904b399a81
Added Egg Moves for Basculin White Striped (#6769) 2025-05-04 11:43:57 +02:00
Eduardo Quezada
96650ffd27
Add "Move Item" option in party menu (#6758) 2025-05-04 11:40:31 +02:00
hedara90
fe2d7442af
Remove old slide workaround (#6754)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-03 10:54:49 +02:00
AlexOn1ine
40bf9ae087 conflicts 2025-05-03 10:26:07 +02:00
hedara90
68d9c0e456
Fix the Move Item option in the PC still expecting compressed palettes (#6739)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-02 21:43:24 +02:00
Alex
9259b7ee69
Bugfixes batch (#6750) 2025-05-02 20:14:27 +02:00
hedara90
ccda2308a3
Add AI_FLAG_PP_STALL_PREVENTION (#6743)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-05-02 11:30:09 -04:00
DavidJCobb
0f17e70371 Shorter names for engine/controller communication enum members 2025-05-02 00:01:15 -04:00
DavidJCobb
d83b0671f7 Battle anims, ice: ARRAY_COUNT works if used with a cast 2025-05-01 23:49:05 -04:00
AlexOn1ine
9a14bb2dd3 removed aiFlags prefix 2025-05-01 20:22:11 +02:00
AlexOn1ine
182d42642d Move out ai struct out of BattleResources 2025-05-01 11:27:48 +02:00
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
Alex
dfb1cd2ec0
Refactor hit escape moves to use moveend (#6671) 2025-04-21 22:52:55 +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
Ruby
b7b1308d44
Remove vestigial AdvanceScript function used for testing (#6664) 2025-04-21 17:13:50 +02:00
AlexOn1ine
e2e012c3a9 conflicts 2025-04-21 15:50:57 +02:00
hedara90
7d4de15d9d
Change HasTwoFramesAnimation to take into account species with 1 frame (#6655)
Co-authored-by: Hedara <hedara90@gmail.com>
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-21 11:09:20 +02:00
cawtds
0069ec1f0c
Fix captivate-oblivious interaction and related test (#6653) 2025-04-21 11:01:01 +02:00
Alex
db7e45f1d6
Sky Drop clean up and tests (#6218)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-20 23:07:46 +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
Eduardo Quezada
c650199909
Added missing gMovesInfo encapsulation (#6656) 2025-04-20 22:36:27 +02:00
khbsd
6b8e680139
Remove hardcoded values from wild_encounter.h generation (#6640)
Co-authored-by: Moos Toet <moostoet@hotmail.com>
2025-04-20 22:27:36 +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
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
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
grintoul1
ec2aef2eff
Battle Transition: mugshots for multibattles (#6567)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-17 16:18:20 +02:00
AlexOn1ine
fd0766c7fa 17-04-25-master-merge 2025-04-17 14:14:37 +02:00
hedara90
7a35f35352
Make generated files match the current formatting (#6636) 2025-04-17 13:38:30 +02:00
Bassoonian
1c3d346d4f
Make form change methods into enum + type checking (#6631) 2025-04-16 23:45:41 +02:00
Bassoonian
cca969b04d
Adds move effect type checking (#6618) 2025-04-16 00:08:57 +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
Bassoonian
512368fd03
Add type checking for hold item effects (#6619) 2025-04-15 23:33:00 +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
ghoulslash
81ed774c00
EndTurnEffectOrder Refactor (#6224) 2025-04-14 10:57:34 -04:00
AlexOn1ine
99bd3dba4a revert BS_UpdateDynamax 2025-04-14 16:20:07 +02:00
GriffinR
f11bddf854
Fixes for Mirage Tower graphics (#2120)
Some checks failed
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
GriffinR
709cfa1c9a
Merge pull request #2014 from Bassoonian/battleterrain
Some checks are pending
CI / build (push) Waiting to run
Rename battle terrain to environment
2025-04-13 19:32:06 -04:00
Alex
a4bfbea3cb
Revert wrongly done Embody Aspect fix (#6607) 2025-04-14 00:17:10 +02:00
hedara90
3236ea62aa
Fixed DNS off config sometimes breaking palettes on map change (#6603)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-13 21:04:21 +02:00
Alex
f3c76e866b
Fix potential compile error caused by sTeraIndicatorDataPtrs (#6599) 2025-04-13 19:06:44 +02:00
hedara90
21e8e0d44f
Fix declaration after label for Psywave switch (#6595)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-13 17:04:03 +02:00
AlexOn1ine
a55bbb6352 documentation 2025-04-13 16:22:33 +02:00
Alex
caa878002a
Remove redundant bit for Throat Spray (#6593) 2025-04-13 16:22:04 +02:00
Bassoonian
6a70f4f390
Turn battle string ids into enums (#6594) 2025-04-13 16:12:30 +02:00
Bassoonian
d62205f2fc
Converts some defines to enums (#6592) 2025-04-13 13:39:20 +02:00
hedara90
6a881f918a
Fix dynamax message (#6589)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-13 11:22:44 +02:00
cawtds
ee911ffbae
FakeRtc datetime and ResetRtcScreen day increments (#5695)
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
2025-04-12 13:17:58 -07:00
Pawkkie
540744024d
"Aerilate"-esque Ability Tests and Config (#6313) 2025-04-12 14:48:58 -04:00
Bassoonian
40419505f7
Add clarification for underlying math in EV caps (#6580) 2025-04-12 12:55:31 -04:00
Hedara
9afd8800f3 Merge branch 'upcoming' into merrps-dns 2025-04-12 16:33:02 +02:00
Bassoonian
d86aedfd32 Merge branch 'master' of https://github.com/rh-hideout/pokeemerald-expansion into mastertoupcoming12apr 2025-04-12 14:59:06 +02:00
psf
e146940f25
Add B_LEVEL_UP_NOTIFICATION to improve player QoL when performing multiple level ups (#4901)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-12 10:23:48 +02:00
Hedara
51c3709a56 Review comments 2025-04-12 08:58:23 +02:00
agsmgmaster64
1344d8e9dd
Type Effectiveness Indicators when selecting moves (#6559) 2025-04-12 01:03:45 +02:00
wiz1989
3d8b912087
Ability imposter (#6552) 2025-04-12 00:01:29 +02:00
psf
1ade433028
Added call to ItemId_GetDescription (#6582) 2025-04-11 23:59:43 +02:00
Hedara
66a6e92417 Fixed unused variables 2025-04-11 22:15:47 +02:00
Hedara
fff6bd3ed8 Removed legacy handling, fix if statment argument style 2025-04-11 21:27:49 +02:00
Hedara
3c2cc35158 Match expansion formatting for some preproc 2025-04-11 21:17:52 +02:00
Hedara
11df205d89 Merge branch 'nemo-merrp-fix' into merrps-dns 2025-04-11 18:50:24 +02:00
Bassoonian
3c8d5d1a57
Add hold effects for PLA Origin Trio items (#6578) 2025-04-11 16:38:08 +02:00
hedara90
a186ce1bff
Animation fixes from lucky adapted to expansion (#6452)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-11 13:15:13 +02:00
Hedara
301ef288f5 Review comments 2025-04-11 11:37:36 +02:00
Bassoonian
708bb4a831 Merge branch 'master' of https://github.com/pret/pokeemerald into pretmerge10apr 2025-04-10 23:57:57 +02:00
hedara90
cf98d764ad
Gimmick Indicator refactor (#6553)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-10 23:56:26 +02:00
Hedara
d78afca94f More shadow options and documentation 2025-04-10 22:41:38 +02:00
khbsd
c1ad43b1cc
Adds SHOW_TYPES_SEEN to the B_SHOW_TYPES option (#6561) 2025-04-10 21:43:21 +02:00
Hedara
b075163c57 Cleanup and config options 2025-04-10 21:17:20 +02:00
khbsd
8bdad34211
fix: missing break statement (#6572) 2025-04-10 19:27:44 +02:00
Alex
4aca2fdcd3
Refactor fixed damage moves (#6449)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 15:01:02 +02:00
psf
17d851e1f9
Add B_RUN_TRAINER_BATTLE - players can run from Trainer Battles (#6456)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-10 14:59:58 +02:00
wiz1989
60a4e191ae
fixed damage calculations in CanTargetFaintAiWithMod() (#6446)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2025-04-10 14:56:49 +02:00
Martin Griffin
2a0d3fd070
Merge pull request #2118 from cawtds/linkdirection-range-x-access
Some checks failed
CI / build (push) Has been cancelled
Make linkDirection more robust to member reordering
2025-04-10 06:47:06 +01:00
Pawkkie
89da80b9d1
Ability access cleanup for #6550 (#6565) 2025-04-09 09:37:59 -04:00
pokemonmasteraaron
d890436b2a Fixed a compilation error if using AGBPrint as your log handler, misnamed AGBPrintfInit should be AGBPrintInit 2025-04-09 09:06:20 -04:00
cawtds
1672d99060 make linkDirection more robust to member reordering 2025-04-09 13:40:39 +02:00
Hedara
e419606a10 Merge branch 'upcoming' into merrps-dns 2025-04-09 12:48:18 +02:00
Hedara
c8f227903f Merge branch 'upcoming' into upcoming-master 2025-04-09 11:25:01 +02:00
Hedara
c57d21b7b2 Merge branch 'master' into upcoming-master 2025-04-09 11:22:07 +02:00
Alex
f364cf9e71
Alcremie Evolution clean up follow up (#6557) 2025-04-09 11:18:07 +02:00
Eduardo Quezada
8cf8de1344
Fixed Behemoth Blade/Bash handler not using form change tables (#6558) 2025-04-09 11:09:27 +02:00
Hedara
2210e2d410 Merge branch 'master' into upcoming-master 2025-04-09 11:06:38 +02:00
Hedara
08a2ad2c98 Merge branch 'upcoming' into merrps-dns 2025-04-09 10:01:51 +02:00
khbsd
26f28103ec
Add Time-Based Encounters (#6454) 2025-04-09 09:49:09 +02:00
Eduardo Quezada
2b417bfeed
Implemented Alcremie Evolution Method (#6530)
Co-authored-by: khbsd <khb.dev@gmail.com>
2025-04-08 19:50:21 +02:00
Pawkkie
54928726cb
AI smarter status handling (#6550) 2025-04-08 17:47:45 +02:00
psf
69f2f9f151
Add OW_DEFOG_FIELD_MOVE to allow players to clear overworld Fog (#6477) 2025-04-08 16:21:32 +02:00
Alex
7bf156be0e
Refactors Move absorb / block function calls to remove redundancy (#6490)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-08 14:26:18 +02:00
Pawkkie
11d26af7a8 Initial attempt, doesn't see move effectiveness / damage 2025-04-08 00:15:28 -04:00
Pawkkie
d7a6e0bea8 Initialize move scores 2025-04-07 23:22:01 -04:00
SundayMoonday
bbe8bbc45b
Replaced Blue Sky background for Rock Field (#6516) 2025-04-07 11:04:21 +02:00
PhallenTree
f24173974c
Fixes Thermal Exchange not curing existing burn (#6545) 2025-04-07 10:48:27 +02:00
AlexOn1ine
b94e3298fc dynamax fix 2025-04-06 15:25:12 +02:00
AlexOn1ine
e8cc3c81f8 conflicts 2025-04-06 14:59:12 +02:00
Eduardo Quezada
a3075325a0
GENDER_COUNT in sPlayer/RivalAvatarGfxIds (#2117)
Some checks failed
CI / build (push) Has been cancelled
2025-04-05 20:18:07 -04:00
Pawkkie
9cb96235f9
Add basic Unaware check bad move scoring (#6524) 2025-04-02 18:18:33 -04:00
Alex
5b9077e207
Refactor / Simlify Cmd_adjustdamage and remove redundancy (#6499) 2025-04-02 23:52:54 +02:00
Alex
1e38c36912
Fixes transformed mon being able to use tera on Terapagos (#6528) 2025-04-02 23:51:45 +02:00
hedara90
ff8bf967d4
Added AI switch display to the battle debug (#6529)
Co-authored-by: Hedara <hedara90@gmail.com>
2025-04-02 23:44:09 +02:00
Alex
c1f18d0765
Refactor protect to allow at least 126 different types of protect eff… (#6506) 2025-04-02 17:26:05 +02:00
Alex
ae62c80d0f
Refactors faint target abilities and adds Battle Bond config (#6519)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
2025-04-02 16:00:23 +02:00
Alex
edb196e851
Fixes Red Card against Dynamaxed mons (#6526) 2025-04-02 14:28:53 +02:00
AlexOn1ine
0c35879e02 conflicts 2025-04-01 19:11:55 +02:00
hedara90
4f0caf8199
Fixes Tera Type not being carried over to during form change / evolution (#6502) 2025-04-01 16:52:40 +02:00
AlexOn1ine
abfabb9699 revert fallback 2025-04-01 15:57:04 +02:00
Alex
02ec421606
Fix using items to heal partner in battle (#6517) 2025-04-01 13:21:12 +02:00
Hedara
881d924cf3 Fix using items to heal partner in battle 2025-04-01 10:38:12 +02:00
aronson
692f7968fc
Use non-preproc guards on AI frame count
Co-authored-by: hedara90 <90hedara@gmail.com>
2025-03-31 12:06:12 -05:00
AlexOn1ine
ccebebf64f 31-03-25 Master merge 2025-03-31 18:23:46 +02:00
AlexOn1ine
d767211c4a helper function to get the species type based on personality 2025-03-31 14:49:40 +02:00
Isaac Aronson
926a7437da
Add AI thinking cycle count display to frame count 2025-03-30 17:24:36 -05:00
Isaac Aronson
6f4a5ce1a0
Mark RTC/Flash save hint string as used 2025-03-30 14:14:40 -05:00
Alex
093e265515
Fixes Destiny Bond against Dynamax no failing (#6501) 2025-03-30 14:18:21 +02:00
AlexOn1ine
3b9b24312a Fixes Tera Type not being carried over to during form change / evolution 2025-03-30 13:31:27 +02:00