Alex
|
2d628aca0e
|
Move end clear bits clean up (#8354)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-11-27 17:42:16 +01:00 |
|
Alex
|
c2fba193a6
|
Fix Upper Hand failure still activating Protean (#8329)
|
2025-11-23 12:36:28 +01:00 |
|
Alex
|
8d3be426fd
|
Remove leftover scrtipt redirection (#8317)
|
2025-11-23 09:42:43 +01:00 |
|
AlexOn1ine
|
aa20b2bc0f
|
master to upcoming merge
|
2025-11-22 10:39:52 +01:00 |
|
PhallenTree
|
65a5d1e7d8
|
Fixes Neutralizing Gas displaying message when exiting with multiple users (#8318)
|
2025-11-21 19:58:02 +01:00 |
|
FosterProgramming
|
7229305ff9
|
Fix max move message against semi invulnerable target (#8313)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-11-21 15:15:01 +01:00 |
|
FosterProgramming
|
7ec0a1db9a
|
Fix bug where defiant/competitive would pass their stat change to the next target (#8312)
|
2025-11-21 11:14:25 +01:00 |
|
FosterProgramming
|
acdfa39f76
|
Make switchout abilities trigger after a pokemon has returned to its ball (#8304)
|
2025-11-20 17:19:06 +01:00 |
|
hedara90
|
cd6d293ad1
|
Fix some move animations leaking VRAM and freeing already freed tags (#7977)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-20 14:19:48 +01:00 |
|
AlexOn1ine
|
6a28506ee2
|
19/11/25 Master to upcoming merge
|
2025-11-19 18:20:30 +01:00 |
|
FosterProgramming
|
4a69268bd5
|
Make rainbow effect anim change based on side (#8269)
|
2025-11-18 23:31:47 +01:00 |
|
AlexOn1ine
|
ba74c076f6
|
pret merge
|
2025-11-16 12:01:13 +01:00 |
|
hedara90
|
f8e7a2db5f
|
Fix incorrect UBFIX checks (#2206)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-16 10:33:16 +00:00 |
|
hedara90
|
61e06cae08
|
Fix Apricorns with OW_SHOW_ITEM_DESCRIPTIONS not off (#8253)
Co-authored-by: Hedara <hedara90@gmail.com>
|
2025-11-14 22:49:47 +01:00 |
|
Zimmermann Gyula
|
772abe6e7d
|
Implement GSC berry/apricorn tree functionality. (#7777)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-11-14 20:28:55 +01:00 |
|
FosterProgramming
|
3f74d30a54
|
Make tailwind anim mirror based on side (#8249)
|
2025-11-14 18:25:27 +01:00 |
|
Frank DeBlasio
|
6d09eb2402
|
Added contest config and cleaned up contest category variables (#8178)
|
2025-11-13 11:29:38 +01:00 |
|
AlexOn1ine
|
93cc143134
|
conflicts
|
2025-11-11 13:12:00 +01:00 |
|
PhallenTree
|
649798449e
|
Powder Move blocking cleanup (#8194)
|
2025-11-10 21:01:35 +01:00 |
|
PCG
|
d2425c1468
|
Move Relearners for TMs, Tutors and Egg moves (#8040)
Co-authored-by: khbsd <khb.dev@gmail.com>
Co-authored-by: psf <77138753+pkmnsnfrn@users.noreply.github.com>
|
2025-11-09 12:54:01 -08:00 |
|
FosterProgramming
|
3e583f8add
|
Fix tera tint not applying on activation (#8135)
|
2025-11-09 18:10:44 +01:00 |
|
Alex
|
6c383fac96
|
Fixes Magician for spread moves (#8170)
|
2025-11-09 18:10:11 +01:00 |
|
FosterProgramming
|
bdaf4ae3b3
|
Fix destiny knot behavior and add tests (#8174)
|
2025-11-09 15:03:43 +01:00 |
|
FosterProgramming
|
232ddb04f4
|
porymap default settings (#8038)
|
2025-11-07 19:41:08 -08:00 |
|
grintoul1
|
c230e54678
|
Master to Upcoming merge 20251107
|
2025-11-07 22:45:57 +00:00 |
|
PhallenTree
|
b8dc1968f3
|
Fixes Receiver not immediately activating copied Soul Heart (#8162)
|
2025-11-07 19:23:00 +01:00 |
|
Martin Griffin
|
1a9fbbcfba
|
Fix copyvar with non-var argument
|
2025-11-06 14:29:09 +01:00 |
|
Alex
|
dea7d02e76
|
Adjust faint battler script (#8137)
|
2025-11-04 20:57:49 +00:00 |
|
Alex
|
41aba41838
|
Attackstring hitmarker clean up (#8136)
|
2025-11-04 18:35:48 +00:00 |
|
Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
FosterProgramming
|
4d60c9e83f
|
Fix copyvar instead of setvar causing issue with LTO (#8097)
|
2025-11-01 16:42:07 +00:00 |
|
Hedara
|
5c31b58b81
|
Merge commit 'd1d543548772cbdf087c5ccc1e0b19980aa9ad87' into pret-merge
Conflicts:
spritesheet_rules.mk
tools/mapjson/mapjson.cpp
|
2025-11-01 15:13:16 +01:00 |
|
AlexOn1ine
|
d4e7e7ad36
|
10/11/25 Master to upcoming merge
|
2025-11-01 11:54:17 +01:00 |
|
Alex
|
1c1a98ee45
|
Grudge, Destiny Bond and FaintBattler refactor (#8072)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-30 23:14:02 +01:00 |
|
Alex
|
ff557e3d0c
|
Clean up for item hold effect refactor (#8014)
|
2025-10-30 21:07:37 +01:00 |
|
Eduardo Quezada
|
8de86ba243
|
Fixed Belly Drum/Contrary interaction at max Attack (#8078)
|
2025-10-30 17:14:07 +01:00 |
|
Alex
|
c77c624e9f
|
Fixes Gooey/Tangling Hair ability pop up triggering on Clear Body (#8083)
|
2025-10-30 16:14:03 +01:00 |
|
Martin Griffin
|
d1d5435487
|
Improve undefined map assembler messages (#2196)
|
2025-10-29 21:34:03 -04:00 |
|
Hedara
|
a2ef3284dd
|
Merge branch 'master' into master-to-upcoming
Conflicts:
data/battle_scripts_1.s
include/battle_util.h
include/constants/battle.h
src/battle_script_commands.c
src/battle_util.c
|
2025-10-29 18:42:59 +01:00 |
|
Alex
|
dd875b87bc
|
Combine Simple Beam and Worry Seed into one effect (#8039)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-10-29 15:20:12 +01:00 |
|
Alex
|
ea60c32fbe
|
Fixes Liquid Ooze dmg not blocked by Magic Guard (#8036)
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2025-10-29 15:19:50 +01:00 |
|
FosterProgramming
|
fd07daf0d8
|
Fix nature power string and add support for evnvironment in tests (#8068)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-28 19:23:16 +01:00 |
|
Bivurnum
|
6ddabde582
|
New Feature: ORAS Dowsing (#7211)
|
2025-10-27 17:41:07 +01:00 |
|
PhallenTree
|
782c559a20
|
Fixes Ruin field statuses negation conditions + upcoming cleanup (#8042)
|
2025-10-26 22:41:16 +01:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
Alex
|
7ebb939cbc
|
Remove usage of gBattlerTarget for MirrorHerb/Opportunist (#8033)
|
2025-10-25 13:52:40 +02:00 |
|
FosterProgramming
|
b4041535cf
|
Fix battle dome bug (again) (#8007)
|
2025-10-24 18:55:32 +02:00 |
|
Alex
|
eb1be34d47
|
Fix Salt Cure script (#8005)
|
2025-10-24 18:53:53 +02:00 |
|
FosterProgramming
|
8c87522415
|
Fix toxic debris setting hazards on the wrong side when hit by an ally (#8026)
|
2025-10-24 11:50:19 +02:00 |
|
FosterProgramming
|
5348de4abb
|
Banned species list (#8003)
|
2025-10-23 21:29:33 +02:00 |
|