Alex
|
bb11d96d86
|
Merge branch 'upcoming' into 111125
|
2025-11-11 19:04:54 +01:00 |
|
Alex
|
f28abcab6a
|
Micro clean up in BattleStruct (#8177)
|
2025-11-11 17:42:27 +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 |
|
Alex
|
226fd60674
|
Fix incorrect comments (#8193)
|
2025-11-10 15:55:58 +01:00 |
|
Alex
|
59d131f599
|
Fixes wrongly assigned count for Semi Invulnerable state (#8175)
|
2025-11-10 10:40:47 +01:00 |
|
Alex
|
d9797fa01d
|
Remove redundant Future Sight flag (#8185)
|
2025-11-09 22:33:03 +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 |
|
FosterProgramming
|
43f9a78da5
|
Fix recharge moves + add recharge move tests (#8181)
|
2025-11-09 17:46:22 +01:00 |
|
khbsd
|
82a63a09fe
|
update: time-based encounters system tuneup and @cawtds' header script (#8158)
|
2025-11-07 21:25:09 -08:00 |
|
grintoul1
|
c230e54678
|
Master to Upcoming merge 20251107
|
2025-11-07 22:45:57 +00:00 |
|
khbsd
|
4d28f7be23
|
feat: adds stevebeller's instant text and MandL27's faster text printing (#8063)
|
2025-11-07 23:11:17 +01:00 |
|
Alex
|
0f14a4db57
|
Clean up ability effect hitmarker (#8138)
|
2025-11-04 21:44:57 +00:00 |
|
Bassoonian
|
473a0aa44d
|
Add Legends Z-A content (#7935)
Co-authored-by: PhallenTree <168426989+PhallenTree@users.noreply.github.com>
|
2025-11-04 22:25:33 +01:00 |
|
Alex
|
41aba41838
|
Attackstring hitmarker clean up (#8136)
|
2025-11-04 18:35:48 +00:00 |
|
Alex
|
80b5d81a9a
|
Create BattleStruct sub struct for event states (#8131)
|
2025-11-04 18:34:54 +00:00 |
|
Hedara
|
b0ccddac69
|
Merge branch 'master' into master-to-upcoming
Conflicts:
include/constants/expansion.h
|
2025-11-03 11:11:07 +01:00 |
|
Hedara
|
cfdbd19ea8
|
Start of 1.13.4 cycle
|
2025-11-01 21:51:24 +01:00 |
|
Hedara
|
f969c126b1
|
1.13.3 release version
|
2025-11-01 21:51:06 +01: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 |
|
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 |
|
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 |
|
grintoul
|
c90e6952f3
|
Fix Ally Switch being useable in Frontier Link Multi battles (#8059)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-10-28 19:26:10 +01:00 |
|
Bassoonian
|
f7cbe4853b
|
Add type enum (#8054)
|
2025-10-27 16:41:22 +00:00 |
|
Bivurnum
|
6ddabde582
|
New Feature: ORAS Dowsing (#7211)
|
2025-10-27 17:41:07 +01:00 |
|
AlexOn1ine
|
6acabd4ba2
|
Master to upcoming merge
|
2025-10-25 16:19:32 +02:00 |
|
Bassoonian
|
be23dfdf2a
|
Even more enums and documentation (#8029)
|
2025-10-25 14:37:47 +02:00 |
|
Alex
|
65244cbeb4
|
Moved usedHeldItem to Party State struct (#8006)
|
2025-10-24 18:56:16 +02:00 |
|
grintoul
|
95c2a6e2b6
|
Multibattle testing system (#7257)
Co-authored-by: hedara90 <90hedara@gmail.com>
Co-authored-by: Martin Griffin <martinrgriffin@gmail.com>
|
2025-10-24 15:00:23 +02:00 |
|
Bassoonian
|
fbd702e3a4
|
Some more documentation and cleanup (#8020)
|
2025-10-23 20:14:38 +02:00 |
|
Bassoonian
|
fb660061ab
|
Converts some defines to enums and name unnamed enums (#8019)
|
2025-10-23 18:06:29 +02:00 |
|
FosterProgramming
|
46b122c5ce
|
Revert HGSS dex and movelist changes (#8016)
|
2025-10-23 13:52:25 +02:00 |
|
FosterProgramming
|
1343ddf7c3
|
Fix badge boost not applying in gen1 and 2 (#8013)
|
2025-10-22 22:57:04 +02:00 |
|
FosterProgramming
|
eac5da89ad
|
Make movelist calculations happen during compilation instead of runtime (#7967)
|
2025-10-20 15:31:42 +02:00 |
|
Alex
|
cb0d503f66
|
Decouple passive hp updates from move damage updates (#7942)
|
2025-10-19 16:40:13 +02:00 |
|
AlexOn1ine
|
e365add4cf
|
15/10/25 Master to upcoming merge
|
2025-10-15 21:31:00 +02:00 |
|
Alex
|
2daa8f3c88
|
Remove EffectHitSetTerrain script to use moveeffect (#7938)
|
2025-10-13 15:39:10 +02:00 |
|
Alex
|
eee546df06
|
Item battle effect refactor (#7857)
|
2025-10-12 08:59:33 +02:00 |
|
Alex
|
798bf0a322
|
Removes a few redundant hitmarkers (#7915)
|
2025-10-11 15:03:23 +02:00 |
|
cawtds
|
c64c276d77
|
Fixes shininess for givemon (#7847)
|
2025-10-07 23:16:48 +02:00 |
|
AlexOn1ine
|
870b93aad9
|
06/10/25 Master to upcoming merge
|
2025-10-06 19:42:42 +02:00 |
|
FosterProgramming
|
a595696086
|
Update fishing odds to match official games (#7574)
|
2025-10-04 09:05:28 -07:00 |
|
Eduardo Quezada
|
13f392987a
|
Fix some failed and assume fail tests with GEN_LATEST = GEN_5 (#7735)
|
2025-10-02 13:27:06 +02:00 |
|
Hedara
|
d3ba08e0bd
|
Start of 1.13.3 cycle
|
2025-10-01 11:10:00 +02:00 |
|
Hedara
|
a54b343948
|
Expansion 1.13.2 release version
|
2025-10-01 11:09:29 +02:00 |
|
khbsd
|
e385c7f59f
|
feat: change defines in constants/abilities.h to an enum (#7006)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-09-29 21:35:09 +02:00 |
|