pokediamond

pret/pokediamond

Fork 0

mirror of https://github.com/pret/pokediamond.git synced 2026-10-02 07:40:05 -04:00

Commit Graph

Select branches

Hide Pull Requests

assets/workflow

cleverking

master

script_commands

#10

#100

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#308

#309

#31

#310

#312

#313

#314

#315

#316

#317

#318

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#345

#346

#347

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#374

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#384

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#41

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#431

#432

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#447

#448

#449

#45

#450

#451

#452

#453

#454

#455

#456

#457

#458

#459

#46

#460

#461

#463

#464

#465

#466

#470

#471

#472

#473

#474

#475

#476

#477

#478

#479

#48

#480

#481

#482

#483

#484

#485

#486

#487

#488

#489

#49

#490

#492

#493

#494

#495

#496

#497

#498

#499

#5

#50

#500

#501

#502

#503

#504

#505

#506

#507

#508

#509

#51

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#53

#530

#531

#533

#534

#535

#536

#537

#538

#539

#54

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#55

#550

#551

#552

#553

#554

#555

#556

#557

#558

#56

#560

#561

#562

#563

#564

#565

#566

#567

#568

#569

#57

#570

#571

#572

#573

#574

#575

#576

#577

#578

#579

#58

#581

#582

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#9

#90

#91

#92

#93

#94

#95

#96

#97

#99

199df8377c More pokemon.s method names; annotate species imms in FUN_02068C00 PikalaxALT 2020-06-11 16:02:17 -04:00
e2d7f9f796 Merge pull request #158 from red031000/master Revo 2020-06-11 15:26:48 -04:00
01a4752a7e Merge branch 'master' into master Cleverking2003 2020-06-11 22:05:55 +03:00
eff79df215 Merge pull request #157 from PikalaxALT/pikalax_work Revo 2020-06-11 15:05:23 -04:00
00203d228f Merge branch 'master' into pikalax_work Cleverking2003 2020-06-11 21:54:54 +03:00
3614b5a702 arm7 OS_alloc red031000 2020-06-11 19:52:48 +01:00
5106f9a218 Fixup pokemon substructs and fill out MON_DATA_ defines PikalaxALT 2020-06-11 14:31:58 -04:00
c0793478b0 Merge remote-tracking branch 'upstream/master' Egor Ananyin 2020-06-11 20:36:44 +03:00
e6fd096191 Merge pull request #156 from red031000/master Cleverking2003 2020-06-11 20:28:49 +03:00
8cd7c04103 arm7: finish splitting dtcm.s rename remaining dtcm files to wram files red031000 2020-06-11 18:21:51 +01:00
c8c88744e6 Merge remote-tracking branch 'upstream/master' Egor Ananyin 2020-06-11 19:24:42 +03:00
877cfc467b WIP MON_DATA defines PikalaxALT 2020-06-11 12:18:29 -04:00
7e447c68f5 Name more funcs in pokemon.s PikalaxALT 2020-06-11 09:00:55 -04:00
6a1f6122b5 Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work PikalaxALT 2020-06-10 20:11:37 -04:00
9ef47bdd27 Further fill in base stats and pokemon data structs PikalaxALT 2020-06-10 19:56:50 -04:00
688b3bcd67 Merge pull request #155 from red031000/master Cleverking2003 2020-06-10 17:28:41 +03:00
e23bf78c54 Merge branch 'master' into master Cleverking2003 2020-06-10 17:23:51 +03:00
81afcebd41 Merge pull request #154 from PikalaxALT/pikalax_work Cleverking2003 2020-06-10 17:23:33 +03:00
39a9d39fcd Merge branch 'pikalax_work' of github.com:PikalaxALT/pokediamond into pikalax_work PikalaxALT 2020-06-10 09:35:08 -04:00
1b973b17c2 Preliminary base stats struct; name pokemon.s encryption funcs PikalaxALT 2020-06-10 08:56:58 -04:00
70d1600ef2 arm9 OS_thread red031000 2020-06-10 02:25:43 +01:00
70d51296ca Species constants PikalaxALT 2020-06-09 19:59:05 -04:00
caba103123 Merge pull request #152 from PikalaxALT/pikalax_work Cleverking2003 2020-06-09 22:37:08 +03:00
912f95b5d5 Merge branch 'master' into pikalax_work Cleverking2003 2020-06-09 22:30:09 +03:00
130c1e3e08 Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work PikalaxALT 2020-06-09 12:53:10 -04:00
c8f98c38d5 Merge pull request #153 from red031000/master PikalaxALT 2020-06-09 11:04:48 -04:00
3e4c87f220 distribute bss red031000 2020-06-09 15:17:30 +01:00
bd44b2f997 Merge branch 'master' into master red031000 2020-06-09 02:23:48 +01:00
07655aabe8 arm7 OS_arena red031000 2020-06-09 02:15:17 +01:00
f58a454f54 Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work PikalaxALT 2020-06-08 21:04:58 -04:00
a3089a04a4 Turn grow2bin into a CSV parser PikalaxALT 2020-06-08 21:02:53 -04:00
a33dcba598 Merge pull request #151 from AsparagusEduardo/readmePokeemerald PikalaxALT 2020-06-08 19:55:48 -04:00
bf166d65fe Added missing pokeemerald github link in README.md Eduardo Quezada 2020-06-08 19:47:00 -04:00
1a24d1dbc5 Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work PikalaxALT 2020-06-08 15:37:47 -04:00
5c81c47e15 Merge pull request #150 from red031000/master Revo 2020-06-08 15:34:40 -04:00
061abd9893 split arm7 MI EXI PAD SND red031000 2020-06-08 20:11:50 +01:00
80c6cbc844 Fix order of target declaration PikalaxALT 2020-06-08 13:38:59 -04:00
e05e121ca0 Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work PikalaxALT 2020-06-08 12:23:05 -04:00
863e1d40a4 Merge pull request #146 from red031000/master Revo 2020-06-08 12:18:23 -04:00
63b108234e Move filesystem rules to filesystem.mk; stub rule invoking makerom PikalaxALT 2020-06-08 11:36:15 -04:00
5bd65c61af Merge branch 'master' into master Cleverking2003 2020-06-08 17:07:26 +03:00
5c0506f114 Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work PikalaxALT 2020-06-08 09:58:38 -04:00
7594546ee9 Merge pull request #149 from mid-kid/master Revo 2020-06-08 09:47:57 -04:00
d0b478e833 Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work PikalaxALT 2020-06-08 09:46:34 -04:00
43fc22bcac Quotes are important sometimes I guess mid-kid 2020-06-08 15:03:30 +02:00
672325017c Pass down host variables mid-kid 2020-06-08 14:57:36 +02:00
59508fe7f8 Merge branch 'master' into master Cleverking2003 2020-06-08 15:51:55 +03:00
a9a1e08aca Merge pull request #148 from kr3nshaw/master Cleverking2003 2020-06-08 15:51:28 +03:00
1dd31333cf Changed first line of knarc makefile kr3nshaw 2020-06-08 22:42:54 +10:00
f162b8beba Changed = to := in main makefile kr3nshaw 2020-06-08 22:29:57 +10:00
dd04f2ba09 Merge remote-tracking branch 'upstream/master' kr3nshaw 2020-06-08 20:46:44 +10:00
9243be03ab Changed g++-9 to g++ in knarc makefile kr3nshaw 2020-06-08 20:41:34 +10:00
a7b3fd6036 Amended knarc makefile so as not to conflict with devkitARM kr3nshaw 2020-06-08 20:36:34 +10:00
fb938eada9 Name more routines in pokemon.s PikalaxALT 2020-06-07 21:09:35 -04:00
8baf7924fc finally finish OS_reset and stop git being stupid red031000 2020-06-07 22:33:50 +01:00
5dfe344038 Merge pull request #142 from red031000/master PikalaxALT 2020-06-07 16:21:48 -04:00
5f9e55a24b Merge branch 'master' of https://github.com/martmists/pokediamond red031000 2020-06-07 21:00:20 +01:00
c5a0d49cba Merge pull request #144 from kr3nshaw/master Cleverking2003 2020-06-07 22:59:16 +03:00
19d0c085f7 Added preprocessor macros to switch experimental on and off kr3nshaw 2020-06-08 05:54:51 +10:00
fce2c89d6e more efficient gfx.c red031000 2020-06-07 20:34:43 +01:00
61df5c9cad Merge pull request #7 from PlatinumMaster/patch-5 kr3nshaw 2020-06-08 05:31:08 +10:00
6e113814ff Revert .travis.yml. PlatinumMaster 2020-06-07 15:26:42 -04:00
19f7d55504 too -> to red031000 2020-06-07 20:24:53 +01:00
550c03c212 cleanup and address issues red031000 2020-06-07 20:18:30 +01:00
d20e69e76f Changed filesystem to experimental/filesystem kr3nshaw 2020-06-08 05:17:22 +10:00
4513e52798 Fixed indentation error kr3nshaw 2020-06-08 05:09:40 +10:00
78af155b6c Readded .travis.yml kr3nshaw 2020-06-08 05:04:18 +10:00
a6c4e1cf03 .travis.yml needs to be recommitted kr3nshaw 2020-06-08 05:03:33 +10:00
4d7019cdaa Merge pull request #5 from PlatinumMaster/patch-3 kr3nshaw 2020-06-08 04:52:13 +10:00
98a0ac436c Update Makefile. PlatinumMaster 2020-06-07 14:49:52 -04:00
3c8f606c61 Add test repository and bump to gcc9. PlatinumMaster 2020-06-07 14:48:27 -04:00
1aade2794c Merge pull request #4 from PlatinumMaster/patch-2 kr3nshaw 2020-06-08 04:42:48 +10:00
79de470b79 Update .travis.yml PlatinumMaster 2020-06-07 14:40:46 -04:00
539a438924 Merge pull request #3 from PlatinumMaster/patch-1 kr3nshaw 2020-06-08 04:35:55 +10:00
7860c28c3f Force g++-8 usage. PlatinumMaster 2020-06-07 14:34:31 -04:00
36a3f6f46f cleanup red031000 2020-06-07 19:33:50 +01:00
ff60ecd00a Merge pull request #2 from PlatinumMaster/patch-1 kr3nshaw 2020-06-08 04:30:12 +10:00
aae365a639 Update .travis.yml PlatinumMaster 2020-06-07 14:25:02 -04:00
095ec67481 Update .travis.yml PlatinumMaster 2020-06-07 14:24:49 -04:00
24764e2481 Change order of linked files. PlatinumMaster 2020-06-07 14:24:18 -04:00
2efa529b4d Added &gcc9 addon kr3nshaw 2020-06-08 03:57:08 +10:00
e80bd72182 Changed GCC 9 back to GCC 8 and added fs flag kr3nshaw 2020-06-08 03:44:31 +10:00
dda7198000 Changed GCC 8 to GCC 9 kr3nshaw 2020-06-08 03:41:19 +10:00
80d13d2c57 Try fix Travis Egor Ananyin 2020-06-07 20:27:09 +03:00
e6cf189c30 My turn to try and fix Travis kr3nshaw 2020-06-08 03:26:25 +10:00
f83d48acf5 Try fix Travis Egor Ananyin 2020-06-07 20:23:12 +03:00
bc4f89e2ba Merge pull request #1 from PlatinumMaster/master kr3nshaw 2020-06-08 03:18:50 +10:00
4ea325263f Try fix Travis Egor Ananyin 2020-06-07 20:16:17 +03:00
f1bc71afe2 Merged with upstream kr3nshaw 2020-06-08 03:16:03 +10:00
cafc25c1fe Attempt to fix travis. PlatinumMaster 2020-06-07 13:07:05 -04:00
0eb4920e8e Update Makefile to support g++8. PlatinumMaster 2020-06-07 13:05:55 -04:00
6bd0b1970c bit of cleanup red031000 2020-06-07 17:34:32 +01:00
1c7bd60010 Merge branch 'master' of https://github.com/martmists/pokediamond red031000 2020-06-07 17:28:17 +01:00
c2d3d0fb11 Merge pull request #143 from PikalaxALT/pikalax_work Cleverking2003 2020-06-07 19:27:06 +03:00
d419d521b3 Added .gitignore for compiled binary kr3nshaw 2020-06-08 02:12:10 +10:00
696862b1a3 Replaced narccomp with knarc kr3nshaw 2020-06-08 02:03:41 +10:00
292a0f16f5 cleanup ncpr handling red031000 2020-06-07 17:00:13 +01:00
76e1f0cc3a capitalisation red031000 2020-06-07 16:50:56 +01:00
34aa56f33a ncpr to nclr red031000 2020-06-07 16:49:06 +01:00
28bffae5bc ncpr palette support red031000 2020-06-07 16:46:28 +01:00

... 22 23 24 25 26 ...