Leahnaya/pokediamond
1
0
Fork 0
mirror of https://github.com/pret/pokediamond.git synced 2026-09-30 20:36:48 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
867 Commits 4 Branches 0 Tags
70d1600ef2607ecb112ca270f5982b4829e44c19
Commit Graph

867 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
red031000
70d1600ef2 arm9 OS_thread 2020-06-10 02:25:59 +01:00
Cleverking2003
caba103123 Merge pull request #152 from PikalaxALT/pikalax_work 
Some cleanup; grow2bin is now a general purpose csv2bin converter for integers
 2020-06-09 22:37:08 +03:00
Cleverking2003
912f95b5d5 Merge branch 'master' into pikalax_work 2020-06-09 22:30:09 +03:00
PikalaxALT
c8f98c38d5 Merge pull request #153 from red031000/master 
arm7 OS_arena
 2020-06-09 11:04:48 -04:00
red031000
3e4c87f220 distribute bss 2020-06-09 15:17:30 +01:00
red031000
bd44b2f997 Merge branch 'master' into master 2020-06-09 02:23:48 +01:00
red031000
07655aabe8 arm7 OS_arena 2020-06-09 02:15:17 +01:00
PikalaxALT
f58a454f54 Merge branch 'master' of https://github.com/martmists/pokediamond into pikalax_work 2020-06-08 21:04:58 -04:00
PikalaxALT
a3089a04a4 Turn grow2bin into a CSV parser 2020-06-08 21:02:53 -04:00
PikalaxALT
a33dcba598 Merge pull request #151 from AsparagusEduardo/readmePokeemerald 
Added missing pokeemerald github link in README.md
 2020-06-08 19:55:48 -04:00
Eduardo Quezada
bf166d65fe Added missing pokeemerald github link in README.md 2020-06-08 19:47:00 -04:00
Revo
5c81c47e15 Merge pull request #150 from red031000/master 
split arm7 MI EXI PAD SND
 2020-06-08 15:34:40 -04:00
red031000
061abd9893 split arm7 MI EXI PAD SND 2020-06-08 20:11:50 +01:00
PikalaxALT
80c6cbc844 Fix order of target declaration 2020-06-08 13:38:59 -04:00
PikalaxALT
e05e121ca0 Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work 2020-06-08 12:23:05 -04:00
Revo
863e1d40a4 Merge pull request #146 from red031000/master 
finally finish OS_reset and stop git being stupid
 2020-06-08 12:18:23 -04:00
PikalaxALT
63b108234e Move filesystem rules to filesystem.mk; stub rule invoking makerom 2020-06-08 11:36:15 -04:00
Cleverking2003
5bd65c61af Merge branch 'master' into master 2020-06-08 17:07:26 +03:00
PikalaxALT
5c0506f114 Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work 2020-06-08 09:58:38 -04:00
Revo
7594546ee9 Merge pull request #149 from mid-kid/master 
Pass down host variables
 2020-06-08 09:47:57 -04:00
PikalaxALT
d0b478e833 Merge branch 'master' of github.com:martmists/pokediamond into pikalax_work 2020-06-08 09:46:34 -04:00
mid-kid
43fc22bcac Quotes are important sometimes I guess 2020-06-08 15:03:30 +02:00
mid-kid
672325017c Pass down host variables 2020-06-08 14:57:36 +02:00
Cleverking2003
59508fe7f8 Merge branch 'master' into master 2020-06-08 15:51:55 +03:00
Cleverking2003
a9a1e08aca Merge pull request #148 from kr3nshaw/master 
Fixed knarc makefile conflict with devkitARM
 2020-06-08 15:51:28 +03:00
kr3nshaw
1dd31333cf Changed first line of knarc makefile 2020-06-08 22:42:54 +10:00
kr3nshaw
f162b8beba Changed = to := in main makefile 2020-06-08 22:29:57 +10:00
kr3nshaw
dd04f2ba09 Merge remote-tracking branch 'upstream/master' 2020-06-08 20:46:44 +10:00
kr3nshaw
9243be03ab Changed g++-9 to g++ in knarc makefile 2020-06-08 20:41:34 +10:00
kr3nshaw
a7b3fd6036 Amended knarc makefile so as not to conflict with devkitARM 2020-06-08 20:36:34 +10:00
PikalaxALT
fb938eada9 Name more routines in pokemon.s 2020-06-07 21:09:35 -04:00
red031000
8baf7924fc finally finish OS_reset and stop git being stupid 2020-06-07 22:35:13 +01:00
PikalaxALT
5dfe344038 Merge pull request #142 from red031000/master 
nitrogfx nclr (palette) support
 2020-06-07 16:21:48 -04:00
red031000
5f9e55a24b Merge branch 'master' of https://github.com/martmists/pokediamond 2020-06-07 21:00:20 +01:00
Cleverking2003
c5a0d49cba Merge pull request #144 from kr3nshaw/master 
Replaced narccomp with knarc
 2020-06-07 22:59:16 +03:00
kr3nshaw
19d0c085f7 Added preprocessor macros to switch experimental on and off 2020-06-08 05:54:51 +10:00
red031000
fce2c89d6e more efficient gfx.c 2020-06-07 20:34:43 +01:00
kr3nshaw
61df5c9cad Merge pull request #7 from PlatinumMaster/patch-5 
Revert .travis.yml.
 2020-06-08 05:31:08 +10:00
PlatinumMaster
6e113814ff Revert .travis.yml. 2020-06-07 15:26:42 -04:00
red031000
19f7d55504 too -> to 2020-06-07 20:24:53 +01:00
red031000
550c03c212 cleanup and address issues 2020-06-07 20:18:30 +01:00
kr3nshaw
d20e69e76f Changed filesystem to experimental/filesystem 2020-06-08 05:17:22 +10:00
kr3nshaw
4513e52798 Fixed indentation error 2020-06-08 05:09:40 +10:00
kr3nshaw
78af155b6c Readded .travis.yml 2020-06-08 05:04:18 +10:00
kr3nshaw
a6c4e1cf03 .travis.yml needs to be recommitted 2020-06-08 05:03:33 +10:00
kr3nshaw
4d7019cdaa Merge pull request #5 from PlatinumMaster/patch-3 
GCC 9.
 2020-06-08 04:52:13 +10:00
PlatinumMaster
98a0ac436c Update Makefile. 2020-06-07 14:49:52 -04:00
PlatinumMaster
3c8f606c61 Add test repository and bump to gcc9. 2020-06-07 14:48:27 -04:00
kr3nshaw
1aade2794c Merge pull request #4 from PlatinumMaster/patch-2 
Update .travis.yml.
 2020-06-08 04:42:48 +10:00
PlatinumMaster
79de470b79 Update .travis.yml 2020-06-07 14:40:46 -04:00