Hedara
|
0a876b46ec
|
Merge branch 'master' into master-to-upcoming
Conflicts:
data/battle_scripts_1.s
include/constants/expansion.h
src/field_control_avatar.c
src/ow_abilities.c
|
2026-05-02 21:15:57 +02:00 |
|
FosterProgramming
|
57f3f4a0b6
|
Safari fixes (#9882)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2026-05-01 16:46:02 +02:00 |
|
Alex
|
cfb4f864e9
|
Fixes Ruin abilities / gastro acid interaction (#9880)
|
2026-05-01 14:18:43 +01:00 |
|
Bivurnum
|
10ae7f9f54
|
Overworld Encounters (#8434)
Co-authored-by: HashtagMarky <143505183+HashtagMarky@users.noreply.github.com>
Co-authored-by: luuma <31407427+luuma@users.noreply.github.com>
Co-authored-by: FosterProgramming <jamiefosterandco@gmail.com>
|
2026-04-29 19:36:14 +02:00 |
|
Kasenn
|
c1eaced09e
|
Fix contact damage message printing (#9856)
|
2026-04-26 16:34:16 +01:00 |
|
AlexOn1ine
|
3f119597f1
|
fix tests
|
2026-04-25 17:55:58 +02:00 |
|
AlexOn1ine
|
ba209b9733
|
25/04/26 Master to upcoming merge
|
2026-04-25 16:26:29 +02:00 |
|
GGbond
|
4b8a6accab
|
Fix Neutralizing Gas end-of-effect handling for Core Enforcer and Baton Pass Gastro Acid transfer (#9829)
|
2026-04-25 15:17:15 +02:00 |
|
Linathan
|
1079577272
|
Add Held Berry Animation (#9168)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
|
2026-04-15 23:09:51 +02:00 |
|
Frank DeBlasio
|
057a4095bd
|
Created macros for fist and foot animations (#9676)
|
2026-04-15 10:06:01 +02:00 |
|
AlexOn1ine
|
679b0930b3
|
Master to upcoming merge 14/04/26
|
2026-04-14 20:14:27 +02:00 |
|
GGbond
|
91a2ea03af
|
Fix Fling using White Herb or Mental Herb incorrectly removing the target’s held item (#9782)
|
2026-04-14 14:25:10 +02:00 |
|
FosterProgramming
|
2b9bffd8ce
|
Properly cancel move relearner NPC after refusing to learn a move (#9774)
|
2026-04-14 14:17:42 +02:00 |
|
PhallenTree
|
f3443efd9b
|
Adds queued switches for EndTurn switches (#9717)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-04-13 15:13:39 +02:00 |
|
Marky
|
15f00c8dbd
|
Allow STR_VAR_# arguments in bufferlivemonnickname (#9752)
|
2026-04-11 10:55:28 +01:00 |
|
FosterProgramming
|
1c723ee942
|
Reworked event evolution tryspecialevo (#7573)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-04-10 05:24:20 -07:00 |
|
Alex
|
1606fa912d
|
Slight restructure for Defog and Tidy Up (#9714)
|
2026-04-08 16:40:23 +01:00 |
|
FosterProgramming
|
780805f169
|
Move relearner refactor (#9006)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-04-06 11:18:15 -07:00 |
|
PhallenTree
|
611ed45952
|
Make End Turn events use BattleScriptCall (return instead of end2) (#9680)
|
2026-04-06 19:26:41 +02:00 |
|
Pawkkie
|
c17a1f1a7f
|
Merge remote-tracking branch 'upstream/master' into master-merge-20260406
|
2026-04-06 11:44:33 -04:00 |
|
Alex
|
c532ceac79
|
Magic Bounce / Magic Coat/ Snatch refactor (#9674)
|
2026-04-06 13:37:11 +01:00 |
|
Linathan
|
32fcd64868
|
Refactor Battle Messages (#9655)
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
|
2026-04-03 20:27:54 +02:00 |
|
PhallenTree
|
fdea5d56ee
|
Gen 5+ Uproar with config (#9616)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-04-02 21:34:21 +02:00 |
|
Frank
|
03508b9cd2
|
Replaced loopsewithpan magic numbers
|
2026-04-01 16:46:34 -04:00 |
|
Frank
|
dd8648c2e2
|
Replaced sound effect magic numbers
|
2026-04-01 16:40:03 -04:00 |
|
Frank
|
989491080d
|
Converted 0 to SOUND_PAN_MIDDLE
|
2026-04-01 16:34:06 -04:00 |
|
Frank
|
1cbdd35880
|
Converted 0 to SOUND_PAN_MIDDLE
|
2026-04-01 16:32:45 -04:00 |
|
Frank
|
7977ec6dfb
|
Converted 63 to SOUND_PAN_TARGET
|
2026-04-01 16:30:36 -04:00 |
|
Frank
|
394e9a5c96
|
Converted 192 to SOUND_PAN_ATTACKER
|
2026-04-01 16:29:45 -04:00 |
|
mudskip
|
02943cb4fc
|
feat (shopMenu): conditional item appearances (#9425)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-03-31 14:33:35 +02:00 |
|
BluSunrize
|
130600ef46
|
Fix timing and structure of Apricorn Tree messages (#9650)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
|
2026-03-29 20:10:55 +02:00 |
|
Eduardo Quezada
|
9dfe7c4340
|
Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge20260328
|
2026-03-28 19:25:08 -03:00 |
|
Meister-anon
|
f13b73ee6d
|
identified deprecated values (#9578)
CI / build-emerald (push) Has been cancelled
CI / build-firered (push) Has been cancelled
CI / build-leafgreen (push) Has been cancelled
CI / release (push) Has been cancelled
CI / test (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
CI / build (push) Has been cancelled
Co-authored-by: Meister-anon <user@DESKTOP-TQ65PS9>
|
2026-03-24 23:09:30 +01:00 |
|
PhallenTree
|
bede100c3e
|
Adds queued switches for Move End switches (#9494)
|
2026-03-24 20:00:25 +01:00 |
|
Alex
|
124009500d
|
Bide Refactor (#9532)
|
2026-03-24 18:48:31 +00:00 |
|
PhallenTree
|
e16cc7a1f2
|
Makes Poltergeist and Fling messages into a pre attack effect (#9610)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-03-23 20:20:29 +01:00 |
|
Frank DeBlasio
|
7da42d1a95
|
Fix Kanto object event graphic names (#9537)
|
2026-03-22 19:48:24 +01:00 |
|
grintoul
|
5fb688bf27
|
Corrects music for FRLG maps and some functions (#9606)
|
2026-03-22 19:43:10 +01:00 |
|
Nephrite
|
47cac73a61
|
gBerries refactor + untangling berry indices from item IDs (#7305)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-03-21 21:30:09 +01:00 |
|
Hedara
|
85d3de7561
|
Merge branch 'master' into master-merge
Conflicts:
docs/tutorials/mon_generation.md
src/battle_ai_main.c
src/pokemon_sprite_visualizer.c
test/battle/ai/ai_switching.c
|
2026-03-20 22:48:44 +01:00 |
|
Frank DeBlasio
|
48bf615a67
|
Converts move animation hex numbers to decimal (#9172)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-03-19 14:55:04 +01:00 |
|
Pawkkie
|
137670bed2
|
GenConfig naming cleanup (#9529)
|
2026-03-19 00:54:39 +01:00 |
|
Frank DeBlasio
|
070f31e384
|
Fixed Stuff Cheeks animation (#9564)
|
2026-03-18 15:46:36 +01:00 |
|
Alex
|
0843a70986
|
Fix SafeguardProtected script (#9559)
|
2026-03-18 11:39:19 +01:00 |
|
FosterProgramming
|
77fa8e086b
|
Version specific tweaks of post whiteout script (#9521)
CI / build-emerald (push) Waiting to run
CI / build-firered (push) Waiting to run
CI / build-leafgreen (push) Waiting to run
CI / release (push) Waiting to run
CI / test (push) Waiting to run
CI / build (push) Blocked by required conditions
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Bassoonian <iasperbassoonian@gmail.com>
|
2026-03-16 13:17:35 +01:00 |
|
PhallenTree
|
3bbcc63258
|
SetMoveEffect cleanup (#9514)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
|
2026-03-16 12:26:21 +01:00 |
|
Eduardo Quezada
|
730d0a1fe8
|
Merge branch '_RHH/master' into _RHH/pr/upcoming/masterMerge
|
2026-03-14 15:45:44 -03:00 |
|
hedara90
|
947874ae49
|
Remove loadspritegfx (#8497)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Hedara <hedara90@gmail.com>
|
2026-03-12 14:43:25 +00:00 |
|
Alex
|
c114dfbc84
|
Refactor Sky Drop and rampage confusion (#9249)
CI / build (push) Has been cancelled
CI / docs_validate (push) Has been cancelled
CI / allcontributors (push) Has been cancelled
|
2026-03-10 16:12:28 +00:00 |
|
hedara90
|
913aaae7e7
|
Move animation call depth increase (#9473)
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Hedara <hedara90@gmail.com>
|
2026-03-08 20:43:33 +01:00 |
|