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 |
|
Frank DeBlasio
|
ca575f2701
|
Added Gen 6 contest combos (#8251)
|
2025-11-14 18:24:33 +01:00 |
|
Frank DeBlasio
|
1683b1ff59
|
Converted options text into COMPOUND_STRINGs (#8248)
|
2025-11-14 18:23:33 +01:00 |
|
Alex
|
0384b573d2
|
Moves name box configs into a new file (#8250)
|
2025-11-14 18:21:59 +01:00 |
|
Frank DeBlasio
|
6d09eb2402
|
Added contest config and cleaned up contest category variables (#8178)
|
2025-11-13 11:29:38 +01:00 |
|
Martin Griffin
|
12b65b565b
|
DamageContext: chosenMove (#8224)
|
2025-11-11 21:59:18 +01:00 |
|
FosterProgramming
|
44d4e0c1de
|
Refactor random functions to be runner specific (#7816)
|
2025-11-11 20:48:41 +00:00 |
|
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
|
f8509c3e65
|
Sets instant text speed flag to false by default (#8179)
|
2025-11-09 10:14: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 |
|
FosterProgramming
|
2467584af5
|
Prevent EXPECT functions from casting negative numbers into unsigned (#7866)
|
2025-11-07 18:32:15 +01:00 |
|
FosterProgramming
|
cab4ec29da
|
Add additional comment explaing map name popup transparency side-effects (#8117)
|
2025-11-07 10:05:50 +01:00 |
|
FosterProgramming
|
97b115d572
|
Adds an auto-generated include file of script commands (#8156)
|
2025-11-06 21:10:42 -08:00 |
|
FosterProgramming
|
be7646b67a
|
Allow vs seekers to work with script not starting with trainerbattle (#8062)
Co-authored-by: pkmnsnfrn <pkmnsnfrn@gmail.com>
|
2025-11-06 10:16:19 -08:00 |
|
Alex
|
fbaaf2d338
|
Increase number of additional move effects (#8149)
|
2025-11-06 00:18:12 +00:00 |
|
Bassoonian
|
be4ce5901f
|
Fix Kyurem typo in swap move tables (#8139)
|
2025-11-05 14:48:53 +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 |
|
Alex
|
be5f6d4801
|
Fixes hacky SetMoveEffect script calls (#7987)
|
2025-11-04 17:47:35 +00:00 |
|
ghostyboyy97
|
3c72ca1158
|
fix (AI scoring): shield dust considerations, IsMoveEffectInMinus self effect edge case, hitsToKO zero-case consideration (#8126)
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
|
2025-11-04 09:35:43 +01: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 |
|
Hedara
|
dd17524fc9
|
Merge commit '7fd0029ed7b9a245f866b6a7467f6d0bd7c0f717' into pret-merge
sha1sum changed
Conflicts:
include/global.h
include/overworld.h
include/pokemon.h
src/map_name_popup.c
src/pokedex_area_screen.c
src/pokemon.c
|
2025-11-01 15:09:20 +01:00 |
|
Hedara
|
67e30c96c0
|
Merge commit '0965dffe70bb7d4bc229e24e4bc0266a6be6b8c8' into pret-merge
Conflicts:
include/item_menu.h
|
2025-11-01 14:56:09 +01:00 |
|
Hedara
|
8c4d1269a0
|
Merge commit 'f2cf20ce9bdf4a9f6cd0300a005ca3ec6ae89e3c' into pret-merge
Conflicts:
INSTALL.md
include/battle.h
include/save.h
src/wild_encounter.c
|
2025-11-01 14:51:14 +01:00 |
|
AlexOn1ine
|
d4e7e7ad36
|
10/11/25 Master to upcoming merge
|
2025-11-01 11:54:17 +01:00 |
|
FosterProgramming
|
6c3f87e74e
|
Fix bug when a captured pokemon replaces a party member who changed forms (#8091)
|
2025-10-31 17:50:29 +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 |
|
Estellar
|
fd84adc421
|
Minor clean up in menu.c (#8060)
|
2025-10-30 17:15:15 +01:00 |
|
Eduardo Quezada
|
8de86ba243
|
Fixed Belly Drum/Contrary interaction at max Attack (#8078)
|
2025-10-30 17:14:07 +01:00 |
|
PhallenTree
|
9d06a4fb55
|
Emergency Exit on hazards activation + fix end of turn activation (#8075)
|
2025-10-30 17:01:13 +01:00 |
|
FosterProgramming
|
44dc720260
|
Fix namebox bug when reloading the map mid-script (#8073)
|
2025-10-30 09:13:22 +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 |
|