Commit Graph

4831 Commits

Author SHA1 Message Date
FosterProgramming
1c723ee942
Reworked event evolution tryspecialevo (#7573)
Some checks are pending
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)
Some checks are pending
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)
Some checks are pending
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)
Some checks are pending
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)
Some checks are pending
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)
Some checks failed
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)
Some checks are pending
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)
Some checks are pending
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)
Some checks are pending
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)
Some checks are pending
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)
Some checks are pending
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)
Some checks are pending
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)
Some checks failed
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)
Some checks are pending
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
Frank DeBlasio
6d1fec9df3
Create functions for repeated move animations (#9142)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-03-08 10:00:17 +01:00
Linathan
57a3f18ae4
Fixes abilities that grant type immunities not outputting battle messages (#9470)
Co-authored-by: LinathanZel <linathan@DESKTOP-RVGNQ5E.localdomain>
2026-03-08 08:18:20 +01:00
Alex
0c20d91508
Refactor synchronize and cure berry timing (#9446)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-03-07 15:38:53 +00:00
Alex
78e4de61f8
Fix weatherform change when primal weather leaves the field (#9424)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-03-06 15:12:08 +00:00
Alex
c8ce8a2b28
Fixes U-turn not reseting targetsDone flag (#9411)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
2026-03-04 13:16:56 +01:00
Alex
563f5fef7c
Fling Refactor (#9176)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-03-03 10:43:00 +01:00
Alex
7cf1062976
Simplify Scale Shot effect activation (#9408)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-03-02 16:22:44 +01:00
PhallenTree
264bda387e
Simplify Scale Shot effect activation 2026-03-02 12:47:53 +00:00
Frank DeBlasio
22e55ce62b
Made moves' animation's AbsorbEffects more consistent (#9063) 2026-03-02 10:50:46 +01:00
Bassoonian
885180ff8b
27/02/26 Master to upcoming merge (#9384)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-28 15:58:05 +01:00
AlexOn1ine
0fc3ef056a 27/02/26 Master to upcoming merge 2026-02-27 23:53:24 +01:00
Bassoonian
310f746565
Fix space indentation in .s and .inc files (#9371)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
2026-02-27 12:45:00 -08:00
Alex
893563a2d5
Pret merge, 26th of February (#9362)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Docs / deploy (push) Waiting to run
Co-authored-by: Frank <fdeblasio1004@gmail.com>
Co-authored-by: GriffinR <griffin.g.richards@gmail.com>
Co-authored-by: Frank DeBlasio <35279583+fdeblasio@users.noreply.github.com>
Co-authored-by: Kildemal <206095739+izrofid@users.noreply.github.com>
Co-authored-by: Marky <143505183+HashtagMarky@users.noreply.github.com>
Co-authored-by: Hedara <hedara90@gmail.com>
2026-02-26 20:25:28 +01:00
Hedara
4dba49657a Merge remote-tracking branch 'pret/master' into pret-merge
Conflicts:
	data/battle_anim_scripts.s
	src/battle_anim_water.c
	src/event_object_movement.c
	src/field_player_avatar.c
2026-02-26 15:33:26 +01:00
FosterProgramming
e5b2492b8d
createmon uses enum Pokeball instead of Item (#9281)
Some checks are pending
CI / build (push) Waiting to run
CI / docs_validate (push) Waiting to run
CI / allcontributors (push) Waiting to run
Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com>
2026-02-25 21:10:57 +01:00