ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-17 03:57:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,308 Commits 1 Branch 0 Tags 235 MiB
44abbae60b
Commit Graph

1308 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DizzyEggg
44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
Diegoisawesome
224fdbf026
Merge pull request #138 from Diegoisawesome/master 
Rename some symbols and add languages
 2017-12-15 00:38:21 -06:00
Diegoisawesome
e3c366df64 Merge remote-tracking branch 'pret/master' 2017-12-15 00:08:48 -06:00
Cameron Hall
c9f196cdfe
Merge pull request #137 from camthesaxman/constants_headers 
move constants to C headers
 2017-12-11 12:45:08 -06:00
camthesaxman
9525fdd54d convert more constants 2017-12-11 12:41:13 -06:00
camthesaxman
c681b482c2 convert more constants 2017-12-11 12:27:51 -06:00
camthesaxman
19fbf024ff fix merge conflicts 2017-12-05 12:42:30 -06:00
camthesaxman
00896cb3b5 rename rng.c to random.c and rom4.c to overworld.c 2017-12-05 12:27:33 -06:00
Cameron Hall
fd75493bc6
Merge pull request #129 from DizzyEggg/dumb_naming 
Name some battle labels
 2017-12-05 12:05:06 -06:00
Cameron Hall
7597433af6
Merge pull request #130 from DizzyEggg/decompile_pokeball 
Decompile pokeball
 2017-12-05 11:57:54 -06:00
camthesaxman
caa13f8777 convert some constants to C headers 2017-12-05 11:55:48 -06:00
DizzyEggg
ddcf52bcae get rid of ball pal files 2017-12-04 23:22:48 +01:00
DizzyEggg
790df7159e more battlescript labels 2017-12-03 00:47:21 +01:00
DizzyEggg
e10aea9a51 give some more labels to battle struct fields 2017-12-02 23:31:58 +01:00
DizzyEggg
ce6e97fa0b sprite data fields to array 2017-12-02 21:44:50 +01:00
DizzyEggg
2fe25da65a move pokeball data to rom 2017-12-02 21:27:00 +01:00
DizzyEggg
c2fdde3a49 pokeball file is decompiled 2017-12-02 20:38:26 +01:00
DizzyEggg
c27f7a8131 start working on pokeball 2017-12-02 19:39:07 +01:00
DizzyEggg
d75e7ace1d label battle stuff 2017-12-02 14:08:55 +01:00
DizzyEggg
273474d57a give names to some battlescripts 2017-12-02 00:03:46 +01:00
DizzyEggg
039c9f4bd8 merge with master 2017-12-01 21:27:29 +01:00
DizzyEggg
646664ff29 battle setup file is decompiled 2017-12-01 21:25:13 +01:00
Diegoisawesome
0250aefb73
Merge pull request #118 from PikalaxALT/field_poison 
Decompile field poison
 2017-12-01 11:32:01 -06:00
DizzyEggg
e8ecb01ab2 more work on battle setup 2017-11-29 19:54:15 +01:00
PikalaxALT
921011592c unsigned -> unsigned int; create header 2017-11-29 08:30:18 -05:00
PikalaxALT
10068b0345 Merge branch 'master' into field_poison 2017-11-29 08:19:54 -05:00
Diegoisawesome
8e9428c482 Add languages to enum 2017-11-29 00:53:18 -06:00
Diegoisawesome
70743f4b95 Merge branch 'master' of https://github.com/pret/pokeemerald 2017-11-29 00:52:32 -06:00
DizzyEggg
10470ef536 start working on battle setup 2017-11-28 23:02:09 +01:00
Diegoisawesome
54da963091
Merge pull request #122 from PikalaxALT/unk_81BAD84 
Unk 81 bad84
 2017-11-28 10:11:49 -06:00
Diegoisawesome
de00b4aeec
Merge pull request #121 from PikalaxALT/coins 
Coins
 2017-11-28 10:00:55 -06:00
PikalaxALT
b9d08ed83b Merge branch 'master' into unk_81BAD84 2017-11-27 20:08:34 -05:00
PikalaxALT
1ac177723d Merge branch 'master' into field_poison 2017-11-27 20:07:33 -05:00
PikalaxALT
41eb2ed59e Merge branch 'master' into coins 2017-11-27 20:06:38 -05:00
Diegoisawesome
18c6b8efc2
Merge pull request #120 from PikalaxALT/unk_text_util 
Decompile asm/unk_text_util.s
 2017-11-27 18:39:50 -06:00
Diegoisawesome
db87e2db4c
Merge pull request #117 from ProjectRevoTPP/load_save 
finish load_save.c
 2017-11-27 15:19:08 -06:00
Diegoisawesome
877ad22711
Merge pull request #127 from DizzyEggg/make_it_compile 
EMERGENCY PULL REQUEST
 2017-11-27 15:08:26 -06:00
DizzyEggg
7275585d56 its flavour, not flavor 2017-11-27 21:54:15 +01:00
DizzyEggg
7144b3b7af fix flavour flavor not building, fuccing americans 2017-11-27 21:24:34 +01:00
ProjectRevoTPP
e6bcfee668 Encyprtion 2017-11-27 15:20:10 -05:00
Cameron Hall
6e317c6463
Merge pull request #124 from DizzyEggg/dump_battlescripts 
Dump Battle Scripts
 2017-11-27 14:00:29 -06:00
Diegoisawesome
64e6480988
Merge pull request #116 from DizzyEggg/decompile_berry_blender 
Decompile berry blender
 2017-11-27 13:34:15 -06:00
DizzyEggg
237261e193 berry blender review changes 2017-11-27 20:03:41 +01:00
DizzyEggg
77a6c30bd4 make various macros 2017-11-26 21:04:00 +01:00
DizzyEggg
b0657350a4 berry blender fix merge conflicts 2017-11-26 19:21:51 +01:00
DizzyEggg
d48392e677 change battle variables names 2017-11-26 18:07:00 +01:00
DizzyEggg
59f64c622b name more battlescripts 2017-11-26 17:26:11 +01:00
DizzyEggg
1bb5b1fd07 more battle labels 2017-11-26 17:15:28 +01:00
DizzyEggg
8c30c42c36 more labelling and changes 2017-11-26 14:17:02 +01:00
DizzyEggg
9886eeb5d8 fix, rename, label battle labels and battlescripts 2017-11-26 13:26:58 +01:00