pokerogue

Commit Graph

Select branches

Hide Pull Requests

battle-stats

dialogue-rework

hyun/fullscreen

main

nuzlocke-mode

promise-rework

revert-750-thomas-t-huynh/bugfix/roost-doesnt-ground-correctly

#1

#10

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#136

#137

#138

#139

#14

#140

#142

#143

#145

#146

#147

#148

#149

#150

#151

#152

#153

#154

#155

#156

#157

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#17

#171

#172

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#190

#191

#192

#193

#194

#195

#196

#197

#199

#2

#20

#200

#201

#202

#203

#204

#205

#205

#206

#209

#21

#210

#211

#212

#213

#214

#215

#216

#218

#219

#22

#221

#223

#225

#226

#227

#228

#229

#230

#231

#232

#232

#233

#234

#235

#235

#236

#238

#239

#24

#240

#240

#241

#242

#243

#243

#244

#245

#246

#246

#248

#249

#249

#250

#251

#252

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#265

#266

#268

#269

#27

#270

#271

#272

#272

#274

#274

#275

#276

#277

#277

#279

#279

#28

#280

#280

#281

#281

#282

#283

#284

#285

#285

#286

#287

#288

#289

#290

#291

#292

#293

#294

#295

#296

#298

#298

#299

#3

#30

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#311

#313

#314

#314

#315

#317

#318

#319

#319

#32

#320

#320

#322

#323

#324

#325

#326

#327

#328

#33

#330

#331

#332

#333

#333

#334

#335

#336

#337

#338

#34

#340

#341

#341

#342

#343

#343

#344

#345

#346

#347

#348

#349

#35

#350

#350

#351

#352

#352

#353

#354

#355

#356

#357

#359

#36

#360

#361

#362

#363

#364

#365

#365

#367

#369

#37

#370

#371

#372

#373

#373

#374

#375

#376

#378

#379

#38

#380

#381

#381

#382

#383

#383

#384

#384

#385

#386

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#403

#405

#405

#406

#406

#407

#408

#409

#41

#410

#410

#412

#414

#415

#416

#417

#418

#419

#42

#420

#420

#421

#422

#423

#426

#427

#428

#428

#429

#43

#430

#431

#432

#432

#433

#433

#434

#436

#437

#438

#439

#44

#440

#440

#441

#443

#445

#446

#447

#448

#449

#45

#451

#451

#453

#455

#456

#457

#457

#458

#459

#46

#460

#462

#462

#463

#464

#465

#466

#467

#468

#468

#469

#47

#470

#471

#472

#473

#474

#475

#476

#478

#479

#48

#480

#482

#484

#485

#486

#488

#49

#490

#492

#492

#494

#495

#496

#497

#498

#499

#5

#500

#501

#502

#502

#504

#504

#505

#507

#508

#509

#51

#510

#511

#512

#512

#513

#514

#515

#516

#519

#52

#526

#526

#529

#53

#530

#531

#532

#533

#538

#538

#539

#542

#542

#543

#544

#544

#545

#547

#549

#549

#55

#550

#552

#553

#556

#557

#558

#558

#559

#560

#562

#563

#564

#565

#566

#567

#568

#568

#569

#57

#571

#572

#572

#573

#574

#575

#578

#58

#583

#586

#590

#590

#592

#593

#593

#596

#597

#597

#598

#599

#6

#60

#600

#600

#601

#603

#604

#605

#606

#607

#607

#608

#608

#609

#61

#610

#610

#611

#612

#614

#615

#617

#619

#619

#62

#622

#625

#626

#628

#628

#631

#632

#633

#633

#634

#635

#636

#637

#639

#640

#641

#642

#643

#643

#645

#646

#647

#647

#648

#649

#65

#650

#651

#653

#653

#655

#657

#658

#659

#661

#662

#663

#664

#665

#666

#667

#668

#668

#669

#67

#670

#671

#672

#673

#675

#675

#676

#68

#683

#685

#685

#686

#686

#687

#688

#688

#689

#69

#691

#692

#692

#693

#694

#694

#695

#695

#697

#698

#699

#7

#70

#700

#702

#703

#704

#706

#706

#709

#71

#711

#712

#714

#715

#716

#717

#718

#718

#719

#720

#722

#723

#723

#724

#724

#726

#726

#727

#727

#728

#728

#729

#729

#73

#731

#731

#734

#735

#736

#737

#737

#738

#739

#74

#741

#742

#742

#743

#744

#746

#747

#748

#748

#75

#750

#751

#751

#752

#752

#753

#754

#754

#756

#756

#758

#759

#760

#761

#761

#763

#764

#765

#766

#77

#772

#773

#774

#775

#777

#78

#780

#780

#781

#782

#782

#783

#783

#784

#785

#786

#787

#787

#79

#793

#794

#795

#797

#798

#798

#799

#8

#80

#800

#802

#804

#804

#807

#808

#81

#811

#812

#812

#813

#815

#816

#816

#817

#818

#821

#822

#823

#824

#825

#825

#826

#826

#827

#829

#831

#833

#833

#834

#835

#835

#836

#84

#840

#840

#841

#842

#844

#845

#848

#848

#849

#850

#850

#851

#857

#857

#858

#86

#860

#861

#863

#864

#864

#87

#871

#872

#872

#873

#874

#876

#879

#88

#881

#881

#882

#884

#884

#885

#887

#887

#888

#892

#892

#895

#895

#9

#90

#901

#902

#903

#904

#904

#905

#905

#907

#908

#91

#910

#911

#911

#912

#913

#915

#915

#916

#918

#918

#919

#919

#92

#920

#920

#923

#924

#924

#927

#928

#929

#929

#93

#932

#94

#95

#96

#97

#98

#98

#99

6c72291a9a Remove Debug Code Benjamin Odom 2024-05-05 03:41:37 -0500
d9a137ac6b Add Candy Progress UI to Starter Selecgt Akuma-Reiki 2024-05-05 03:26:15 -0500
1d3e223cf2 Update Item Descriptions Punctuation Benjamin Odom 2024-05-05 02:55:32 -0500
3a218eb92b

Fixed a bug where a yawned target in a semi-vulnerable state would be stuck in that state (#396) Ivan Perez 2024-05-04 22:35:47 -0700
7cdf07c050

have arena tags check their sides. (#447) Reldnahc 2024-05-05 00:27:46 -0500
dd76cbc7a2

Add Setting to Swap A and B on Gamepad (#474) Benjamin Odom 2024-05-05 00:25:57 -0500
4632f76fc2 Add comments Benjamin Odom 2024-05-05 00:23:57 -0500
f2e2310829 Add Setting to Swap A and B on Gamepad Benjamin Odom 2024-05-05 00:16:53 -0500
cd1684180f Merge branch 'main' into nuzlocke-mode Flashfyre 2024-05-05 00:04:18 -0400
85e39a3986 partially implement scrappy jbastyr 2024-05-04 23:01:21 -0500
5440c0b40c Add B2W2 Legendary Titan Theme Madmadness65 2024-05-04 22:48:23 -0500
5d82a1538c Add various missing variant sprites and icons Flashfyre 2024-05-04 23:33:45 -0400
f10cce7d3a moves: add custom fail text, fix animation issues with Guard Dog/Roar Madi Simpson 2024-05-04 20:26:14 -0700
daa6e3b3a8

Prevent Fusion Status Errors +Fix Double Battle Issue (#472) Benjamin Odom 2024-05-04 22:16:59 -0500
7ad5049001 remove unneeded const. Reldnahc 2024-05-04 21:49:24 -0500
2f5d2a8776 Update phases.ts Benjamin Odom 2024-05-04 21:34:24 -0500
480d097dd3 Reapply "Prevent Fusing Status Errors (#465)" Benjamin Odom 2024-05-04 21:33:49 -0500
e2f9d1b9e8 change how the ability is detected. Reldnahc 2024-05-04 21:26:55 -0500
41f9420c90

Added Italian translations for ability.ts and other element (#471) Alessandro Bruzzese 2024-05-05 04:00:28 +0200
88d43c09b8 Merge remote-tracking branch 'upstream/main' into feature/guard-dog Madi Simpson 2024-05-04 18:55:26 -0700
18a1c152c0 Revert "Prevent Fusing Status Errors (#465)" Madmadness65 2024-05-04 20:50:48 -0500
96d7fdd3f9

Implement Water Shuriken Battle Bond condition (#466) Madi Simpson 2024-05-04 18:50:12 -0700
2c003854e9

terrain: psychic terrain doesn't block priority moves on the user's side (#470) Madi Simpson 2024-05-04 18:45:37 -0700
40649fb4b5

Merge branch 'pagefaultgames:main' into italian-localization Alessandro Bruzzese 2024-05-05 03:43:34 +0200
6c6bda38aa Added Italian translations for ability.ts and other element Bruzzi 2024-05-05 03:42:28 +0200
15ff6f0e96 abilities: implement suction cups since it has the same effect Madi Simpson 2024-05-04 18:38:37 -0700
68eca464f7

Prevent Fusing Status Errors (#465) Benjamin Odom 2024-05-04 20:37:31 -0500
d170aeeab6

Updated Learnset of Gen2 to Indigo Disc (#469) Benjamin Odom 2024-05-04 20:27:01 -0500
d54d6d06a8 terrain: psychic terrain doesn't block priority moves on the user's side Madi Simpson 2024-05-04 18:22:09 -0700
3d0769f824

Merge branch 'pagefaultgames:main' into IndigoDiskLearnsets Benjamin Odom 2024-05-04 20:10:53 -0500
b547e85d87 Updated Learnset of Gen2 to Indigo Disc Benjamin Odom 2024-05-04 20:08:12 -0500
1792b98608 Implement Genesect's forms & Techno Blast Madmadness65 2024-05-04 19:45:07 -0500
6151ec0e49

modifiers: pp up/max now also shows pp (#467) Madi Simpson 2024-05-04 17:31:25 -0700
ce6ff44af0 modifiers: pp up/max now also shows pp Madi Simpson 2024-05-04 17:23:32 -0700
8c720eac69 missed confide oops. small format change also for charm. Reldnahc 2024-05-04 19:19:43 -0500
5b732c490f Merge branch 'main' into magic_coat Reldnahc 2024-05-04 19:13:57 -0500
8698492842 Minor translation fixes Simoninoo 2024-05-05 02:12:15 +0200
cd9064217d Revert "have arena traps check their sides." Reldnahc 2024-05-04 19:08:13 -0500
53f4646699 Revert "make sure we check the right tags layers" Reldnahc 2024-05-04 19:08:12 -0500
243151d987 rename some bounce things to magic coat. give magic coat its move text. Reldnahc 2024-05-04 19:06:06 -0500
24937819d7 Added IT move translation Simoninoo 2024-05-05 02:00:36 +0200
b2c74cfc90

Implement Opportunist (#460) Madi Simpson 2024-05-04 16:38:53 -0700
4e0bf8f5a1 Adjust Tyrogue egg move Madmadness65 2024-05-04 18:37:04 -0500
58dbefa603 fix imports Reldnahc 2024-05-04 18:36:11 -0500
c2c7a152cc moves: remove fusion checks Madi Simpson 2024-05-04 16:33:00 -0700
cd0c238085 Merge branch 'main' into magic_coat Reldnahc 2024-05-04 18:24:21 -0500
ba311f6a13 moves: water shuriken hits 3x 20bp in ash greninja forme Madi Simpson 2024-05-04 16:17:57 -0700
d4b09761ec add flag to every applicable move. Reldnahc 2024-05-04 18:12:53 -0500
8e3bf1ce15 Merge branch 'main' of github.com:Greenlamp2/pokerogue into feat/inputs_management_rework Greenlamp 2024-05-05 01:02:29 +0200
42391a8e95 abilities: rename some things to make a bit more sense Madi Simpson 2024-05-04 15:47:34 -0700
4b1f979af2 properly handle targets on mutli moves. also checks which pokemon did the bouncing. Reldnahc 2024-05-04 17:33:46 -0500
92fb8b715e

Added Candy Progress UI (#463) Akuma-Reiki 2024-05-04 17:29:48 -0500
620a92aace

Bugfix Tickle, Tearful Look, Decorate (#464) LaukkaE 2024-05-05 01:28:15 +0300
ad3a226feb GetRootSpecies rather than colors of current Species Akuma-Reiki 2024-05-04 17:27:29 -0500
e36cb6ae15 Bugfix Tickle, Tearful Look, Decorate LaukkaE 2024-05-05 01:21:32 +0300
1e28f95453 properly bounce multi targeted attacks Reldnahc 2024-05-04 17:17:49 -0500
45dd9460ca Prevent Fusing Status Errors Benjamin Odom 2024-05-04 17:12:39 -0500
31007c95d9 Added Candy Progress UI Akuma-Reiki 2024-05-04 16:42:13 -0500
4526683c5a added return type for inputs-controller Greenlamp 2024-05-04 23:13:59 +0200
9eec2c3e3a change target of phase also, check conditions using the bouncer. Reldnahc 2024-05-04 16:12:00 -0500
a84f9f89bf added return type for ui-inputs Greenlamp 2024-05-04 22:52:20 +0200
cc061509b8 Function to check status which heals when appropriate AJ Fontaine 2024-05-04 16:26:29 -0400
db2e8db11a abilities: properly ignore only opportunist on opportunist boosts Madi Simpson 2024-05-04 13:26:13 -0700
5dda2258dd abilities: make it not infinitely loop like a dummy Madi Simpson 2024-05-04 13:20:18 -0700
96fcb9ad56 Fix Protosynthesis and Quark Drive LaukkaE 2024-04-25 17:48:36 +0300
c4679b74b0 abilities: implement opportunist Madi Simpson 2024-05-04 13:09:39 -0700
53a709822d abilities: make ability bars pop in to some success Madi Simpson 2024-05-04 12:49:07 -0700
cd7de10722

Expanding force hotfix (#459) nrawicz 2024-05-04 14:28:44 -0400
2874038f9f Expanding Force Hotfix nrawicz 2024-05-04 14:18:25 -0400
37cab3309c

Merge branch 'pagefaultgames:main' into main nrawicz 2024-05-04 14:08:25 -0400
f53c699d04 Updated Learnset of Gen1 to Indigo Disc Benjamin Odom 2024-05-04 01:10:33 -0500
c6a2d98e4a fix repeating stats button + change message in event when the key is repeating Greenlamp 2024-05-04 19:08:42 +0200
bbbd55e265 have move fail if conditions are no longer met after bounce. Reldnahc 2024-05-04 12:06:00 -0500
ef6c354132 Add foundation for Nuzlocke Mode (WiP) Flashfyre 2024-05-04 12:15:45 -0400
a7af14b8e2 Fix fusion token weight at 1000 Flashfyre 2024-05-04 11:54:00 -0400
da5615eb4a

Implement Expanding Force (#417) nrawicz 2024-05-04 11:52:24 -0400
3d2f31eb4f Fix endure token weight Flashfyre 2024-05-04 11:50:15 -0400
67acb91503 ACTUALLY fixed removed commits nrawicz 2024-05-04 11:01:19 -0400
d77ae729c0 Minor Update to French battle.ts Lugiad 2024-05-04 17:00:31 +0200
28f7cac495

Minor Update to French battle.ts Lugiad 2024-05-04 17:00:31 +0200
3de4b9cd12 Minor Update to French battle.ts Lugiad 2024-05-04 16:32:59 +0200
f4bcf1141e

Minor Update to French battle.ts Lugiad 2024-05-04 16:32:59 +0200
c58a2fdee3 feat: replace steel type sprite with new version for consistency dpMelian 2024-05-04 14:41:35 +0100
7882e0f7cc feat: replace steel type sprite with new version for consistency dpMelian 2024-05-04 14:41:35 +0100
068ceec0ff Revert refactoring changes to single status healing moves innerthunder 2024-05-03 00:01:12 -0700
cfc0910faf Updated Learnset of Gen1 to Indigo Disc Benjamin Odom 2024-05-04 01:10:33 -0500
5b8418c60d abilities: fix rattled not giving the attack drop still Madi Simpson 2024-05-03 22:50:39 -0700
708020402e abilities: implement rattled's second effect, remove refs to mold breaker Madi Simpson 2024-05-03 22:15:58 -0700
035ba6e47e

Changed struggle check to use move id instead of name takeyourt1me 2024-05-03 22:13:30 -0700
d6ab5dd2d0 fix import styles Reldnahc 2024-05-04 00:01:21 -0500
08337a1b3d Revert "fix imports" Reldnahc 2024-05-03 23:55:17 -0500
a6b54c1786 abilities: implement guard dog, abilities that give intimidate immunity Madi Simpson 2024-05-03 21:45:52 -0700
6158e35b11 make sure we check the right tags layers Reldnahc 2024-05-03 23:31:21 -0500
82c1c9ebf7 make sure we check the right tags layers Reldnahc 2024-05-03 23:31:21 -0500
5b4f1da854 Fix level capped party members not gaining friendship Flashfyre 2024-05-04 00:19:50 -0400
d57c3e0b34

Merge branch 'pagefaultgames:main' into FusionItemFix Benjamin Odom 2024-05-03 23:18:20 -0500
b529eee5ac

Add Form Text to Starter UI (#446) Benjamin Odom 2024-05-03 23:02:55 -0500
c9a91b95b5 have arena traps check their sides. Reldnahc 2024-05-03 22:57:51 -0500
8b0abff838 have arena traps check their sides. Reldnahc 2024-05-03 22:57:51 -0500
5141a239ec Make Title Case Benjamin Odom 2024-05-03 22:51:52 -0500