pokediamond

pret/pokediamond

Fork 0

mirror of https://github.com/pret/pokediamond.git synced 2026-10-02 23:45:22 -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

1b13290db2 bit of work on mod 63 red031000 2020-06-27 00:34:51 +01:00
2c7afe3a37 module 6 fully shiftable red031000 2020-06-26 21:47:45 +01:00
c7a27c1883 Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work PikalaxALT 2020-06-26 09:09:16 -04:00
42afbf282d Some more renaming PikalaxALT 2020-06-26 08:36:38 -04:00
adfe0b0dd1 Annotate some overlays in arm9.lsf PikalaxALT 2020-06-25 17:30:35 -04:00
8c34579a17 Refactor sdat.h structs and name some routines PikalaxALT 2020-06-25 15:26:31 -04:00
981bf953cb Merge pull request #189 from red031000/master Cleverking2003 2020-06-25 22:01:58 +03:00
512e864e3b Merge branch 'master' into master Cleverking2003 2020-06-25 21:45:38 +03:00
a2f8c35e86 few general use pointers red031000 2020-06-25 19:39:11 +01:00
4ab0428663 Split out sndlib.s PikalaxALT 2020-06-25 13:36:56 -04:00
80ce402f5f Merge pull request #190 from PikalaxALT/pikalax_work Revo 2020-06-25 13:29:06 -04:00
f61b7cc024 sound.c PikalaxALT 2020-06-25 13:17:06 -04:00
b00d33850b module 4 fully shiftable red031000 2020-06-25 17:25:37 +01:00
40c3f6e85a Merge pull request #188 from Cleverking2003/master Revo 2020-06-25 01:30:36 -04:00
e34791ca4a Remove duplicates Egor Ananyin 2020-06-24 20:40:02 +03:00
2f08757512 Shared things Egor Ananyin 2020-06-24 20:31:49 +03:00
60d9344c63 eof Egor Ananyin 2020-06-24 20:20:23 +03:00
ea1fc9a0c3 OS_tick done Egor Ananyin 2020-06-24 20:19:35 +03:00
ce09e79eb9 Merge pull request #187 from PikalaxALT/pikalax_work Revo 2020-06-24 11:28:03 -04:00
9a773792e9 Remove temporary struct definition PikalaxALT 2020-06-24 11:04:05 -04:00
1eb08c70e1 Decompile unk_02034710.s PikalaxALT 2020-06-24 10:38:59 -04:00
d28df0e7c8 Merge pull request #181 from red031000/master Cleverking2003 2020-06-24 09:33:28 +03:00
e8b207b4a7 Merge branch 'master' into master Cleverking2003 2020-06-24 08:54:37 +03:00
b071ca4b3d Merge pull request #186 from PikalaxALT/pikalax_work Revo 2020-06-23 22:34:29 -04:00
4ce2e0748a few pointer replacements red031000 2020-06-24 02:29:29 +01:00
4abf6cffe4 Merge branch 'master' into master red031000 2020-06-24 01:28:42 +01:00
5ce948ab4a Rename module_01.cpp to module_01.c PikalaxALT 2020-06-23 19:48:39 -04:00
0059e88fb1 Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work PikalaxALT 2020-06-23 19:25:33 -04:00
615c6579c8 Merge pull request #185 from red031000/nitrogfx PikalaxALT 2020-06-23 19:24:10 -04:00
18840a132f Merge branch 'master' into nitrogfx red031000 2020-06-23 23:23:17 +01:00
6b457a1a31 formatting red031000 2020-06-23 23:22:26 +01:00
c82f923bb0 Merge branch 'master' into master red031000 2020-06-23 23:18:29 +01:00
64595272f9 module 5 fully shiftable red031000 2020-06-23 23:16:59 +01:00
7716dbd13d Some random data type fixing PikalaxALT 2020-06-23 16:39:43 -04:00
54f468e883 Move this array to its parent file PikalaxALT 2020-06-23 16:11:04 -04:00
291f2d27d3 Merge pull request #184 from PikalaxALT/pikalax_work Cleverking2003 2020-06-23 22:48:39 +03:00
718adb157d mapsec constants PikalaxALT 2020-06-23 15:33:12 -04:00
aabb240e8c Resolve (map-related?) structs in unk_02034710 PikalaxALT 2020-06-23 15:09:02 -04:00
bd5894c54f Move this Makefile comment PikalaxALT 2020-06-23 13:44:23 -04:00
0a4315909d Use HOLD_EFFECT consts in GetArceusTypeByHeldItemEffect PikalaxALT 2020-06-23 10:55:08 -04:00
582fefc54b Match MoveItemSlotInList PikalaxALT 2020-06-23 10:48:28 -04:00
0d9e2c1286 More ASCII strings in module 13 PikalaxALT 2020-06-22 20:32:30 -04:00
21c7537c55 These are ASCII strings PikalaxALT 2020-06-22 20:02:38 -04:00
35c3fb0319 021F7910 red031000 2020-06-23 00:36:07 +01:00
b26996818d First pass autogen data labels in most other overlays PikalaxALT 2020-06-22 19:29:15 -04:00
a020757391 to 021F786C red031000 2020-06-22 22:04:33 +01:00
01c45ca2e9 Data labels in module_06 PikalaxALT 2020-06-22 16:49:11 -04:00
e68b19bef9 Rename all NARC members that are NCLR/NCGR PikalaxALT 2020-06-22 13:34:40 -04:00
49a400ceeb nitrogfx NCGR support red031000 2020-06-22 18:34:26 +01:00
6ec8f5ace7 Hold effect constants PikalaxALT 2020-06-22 10:43:24 -04:00
b15a8c8e74 Name some fields in itemdata struct PikalaxALT 2020-06-22 08:56:04 -04:00
c9a26fd84f NCGR extracting red031000 2020-06-22 01:37:06 +01:00
1af603cdb9 Name itemtool methods and data PikalaxALT 2020-06-21 17:39:00 -04:00
b207354025 Most of itemtool.c; draft of that first item slot function PikalaxALT 2020-06-21 15:04:16 -04:00
d2710751ca Merge pull request #183 from martmists/new-dockerfile red031000 2020-06-20 22:56:18 +01:00
b3e9ab4563 021F7564 to 021F765C red031000 2020-06-20 22:52:47 +01:00
7e6562f747 Merge branch 'master' into master red031000 2020-06-20 21:25:34 +01:00
863b09f18d 021F683C to 021F7564 red031000 2020-06-20 21:24:27 +01:00
7903fbec80 Create docker-image.yml PikalaxALT 2020-06-20 15:24:02 -04:00
e9e192ce20 Merge pull request #174 from RoastVeg/master Cleverking2003 2020-06-20 22:02:33 +03:00
5592251a94 Merge branch 'master' into master Cleverking2003 2020-06-20 21:57:17 +03:00
998591274b Moved Docker to contrib Louis Hampton 2020-06-20 19:57:54 +01:00
b64e629432 Merge pull request #182 from PikalaxALT/pikalax_work PikalaxALT 2020-06-20 14:24:42 -04:00
3cf5ef0a66 Merge branch 'master' of https://github.com/roastveg/pokediamond Louis Hampton 2020-06-20 19:01:00 +01:00
59f6bdfa9a Newline Louis Hampton 2020-06-20 18:57:08 +01:00
0276df552d Make __cplusplus check explicit again for Alpine's sake PikalaxALT 2020-06-20 13:47:29 -04:00
b7b4779502 Remove explicit __cplusplus test PikalaxALT 2020-06-20 13:28:06 -04:00
c3ef2ae6c9 Fix String struct PikalaxALT 2020-06-20 13:15:58 -04:00
6298426d9a Merge branch 'master' into master RoastVeg 2020-06-20 17:57:41 +01:00
b1aec20540 Merge branch 'master' into master Cleverking2003 2020-06-20 19:14:29 +03:00
16b091058e Merge pull request #179 from PikalaxALT/pikalax_work Revo 2020-06-20 12:13:15 -04:00
e979db22a6 021F67C8 to 021F683C red031000 2020-06-20 16:54:21 +01:00
02b9900219 021F6608 to 021F67C8 red031000 2020-06-20 16:25:05 +01:00
625e56c4b0 021F64EC to 021F6608 red031000 2020-06-20 15:10:22 +01:00
ae9380cad0 Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work PikalaxALT 2020-06-20 09:48:40 -04:00
01c4d4b185 Merge pull request #180 from Cleverking2003/master PikalaxALT 2020-06-20 09:47:54 -04:00
faad0fa286 unk_0201B8B8.c PikalaxALT 2020-06-20 09:39:29 -04:00
448adae329 Fix warnings in nutdata PikalaxALT 2020-06-20 09:23:37 -04:00
a16371f513 Merge branch 'pikalax_work' of github.com:PikalaxALT/pokediamond into pikalax_work PikalaxALT 2020-06-20 09:19:42 -04:00
1386f29730 Name methods in msgdata.c and unk_02021934.s aka string16.s PikalaxALT 2020-06-20 09:18:15 -04:00
da26db5983 start module_05 rodata splitting red031000 2020-06-20 14:09:41 +01:00
3e4a9b1e3d We don't need this Egor Ananyin 2020-06-20 11:10:42 +03:00
9fba6d2b34 OS_mutext done! Egor Ananyin 2020-06-20 11:00:20 +03:00
abd2d1e164 conflicts Egor Ananyin 2020-06-20 09:18:43 +03:00
70556fc300 Begin decompiling OS_mutex Egor Ananyin 2020-06-20 09:14:40 +03:00
0c8b5417ce Merge branch 'master' into pikalax_work Revo 2020-06-19 23:07:18 -04:00
b138e415a2 Finish msgdata.c PikalaxALT 2020-06-19 22:26:26 -04:00
669fafdcf6 through FUN_0200A76C PikalaxALT 2020-06-19 19:32:35 -04:00
06a7bf4c8c msgdata.c through DecryptMessageDirect PikalaxALT 2020-06-19 16:57:44 -04:00
53ac396de4 Merge branch 'master' into master Cleverking2003 2020-06-19 22:27:30 +03:00
12c1794860 Merge pull request #178 from red031000/master Cleverking2003 2020-06-19 22:25:19 +03:00
e19270f9b3 arm7 OS_thread red031000 2020-06-19 19:07:34 +01:00
1c13e2f57b Merge pull request #177 from PikalaxALT/pikalax_work Revo 2020-06-19 11:45:40 -04:00
b133ba8ceb Fix symbols.csv for mac PikalaxALT 2020-06-19 11:16:40 -04:00
73d7f3cc5e Define gender ratio as floats in personal.json PikalaxALT 2020-06-19 10:58:09 -04:00
6f0dba80ac Name growth rates in personal.json PikalaxALT 2020-06-19 10:44:15 -04:00
83f33bf8bf Annotate NARC IDs in unk_0206E5B4.s PikalaxALT 2020-06-19 10:37:34 -04:00
d57baf0c22 nutdata.c PikalaxALT 2020-06-19 10:06:32 -04:00
cc273a871d Merge branch 'master' into pikalax_work PikalaxALT 2020-06-18 19:38:34 -04:00
5d533911cd MOVEATTR enums; silence return value warning PikalaxALT 2020-06-18 19:37:11 -04:00

... 20 21 22 23 24 ...