ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
1,510 Commits 1 Branch 0 Tags 235 MiB
59680b2a73
Commit Graph

1510 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diegoisawesome
0403f6eea9 Merge remote-tracking branch 'Egg/decompile_use_pokeblock' 2017-12-21 16:19:50 -06:00
DizzyEggg
bcffcb0c1c pokeblock merge conflicts 2017-12-21 23:12:36 +01:00
Diegoisawesome
eb65458b67 Fix setvaddress params 2017-12-21 16:06:12 -06:00
Diegoisawesome
2c0e5a41a2 Merge remote-tracking branch 'Shanty/script_macros' 2017-12-21 16:03:37 -06:00
Marcus Huderle
66f9d4c266 Revert initclock arg sizes 2017-12-21 16:02:42 -06:00
DizzyEggg
19c25a8f2b start dumping pokedex 2017-12-21 22:56:20 +01:00
Marcus Huderle
173761a5a1 Port generic event script macros from pokeruby 2017-12-21 13:47:52 -06:00
Diegoisawesome
a705a863d1 Fix incorrect slash in battle_bg.c 2017-12-21 12:26:00 -06:00
Diegoisawesome
4307292f55 Merge remote-tracking branch 'Egg/kobold_fixes' 2017-12-21 11:42:10 -06:00
DizzyEggg
78f35494a3 fix trainer see pr 2017-12-21 17:51:48 +01:00
DizzyEggg
6b5157b2a3 decompile bike.s 2017-12-21 17:46:03 +01:00
DizzyEggg
b4b3fe04ee pr dump review changes 2017-12-20 17:24:37 +01:00
DizzyEggg
8380fc63dc Merge branch 'master' into kobold_fixes 2017-12-20 17:22:25 +01:00
DizzyEggg
504363f2a6 Merge branch 'master' into decompile_trainer_see 2017-12-20 17:21:46 +01:00
DizzyEggg
df479661ff pokeblock review changes 2017-12-20 17:20:41 +01:00
DizzyEggg
b615af4184 fix pokeblock merge conflicts 2017-12-20 17:16:56 +01:00
Diegoisawesome
7e6a68a99a Merge remote-tracking branch 'Egg/static_to_s' 2017-12-20 00:25:54 -06:00
Diegoisawesome
fe6c93a431 Merge remote-tracking branch 'Roukaour/master' 2017-12-19 23:53:23 -06:00
Cameron Hall
02b5cf028f
Merge pull request #139 from DizzyEggg/decompile_battle1 
Decompile and split battle_1
 2017-12-19 15:34:54 -06:00
DizzyEggg
38af0f78ea hopefully fix kobold PR 2017-12-19 20:52:52 +01:00
DizzyEggg
37a6e1b6c7 Merge branch 'master' of https://github.com/itskobold/pokeemerald into kobold_fixes 2017-12-19 20:09:28 +01:00
DizzyEggg
4949411f3e make battle bg compile 2017-12-19 17:41:05 +01:00
DizzyEggg
7581218569 Merge branch 'master' into decompile_battle1 2017-12-19 17:37:53 +01:00
DizzyEggg
4abc2eea8a ram vars to C files 2017-12-19 17:33:07 +01:00
DizzyEggg
b7a2335347 clean up trainer see file 2017-12-19 17:18:44 +01:00
DizzyEggg
5744356989 decompile trainer see 2017-12-18 23:26:44 +01:00
DizzyEggg
a612ef12a0 start working on trainer see 2017-12-18 19:35:50 +01:00
DizzyEggg
cb229f56e8 fix pokeblock conflicts 2017-12-18 16:58:14 +01:00
Diegoisawesome
6a674e1e83 Merge remote-tracking branch 'Egg/decompile_mail_data' 2017-12-17 22:51:40 -06:00
DizzyEggg
314b96af46 static names given s prefix 2017-12-17 23:45:27 +01:00
Remy Oukaour
a0ad3ae720 * Use the $^ automatic variable for Castform files to avoid repetition 
* Use static pattern rules for png->otherextension to avoid repetition
* Multi-use directories are declared at the top; single-use directories do not use variables
 2017-12-17 16:45:58 -05:00
Remy Oukaour
9301016f40 INSTALL.md links to pret/pokeruby-tools, since YamaArashi/pokeruby-tools and ProjectRevoTPP/pokeruby-tools are 404 2017-12-17 16:39:01 -05:00
DizzyEggg
720bd555bc add constants trainers file 2017-12-17 21:19:08 +01:00
DizzyEggg
54dccc8512 give batter script command names 2017-12-17 20:38:01 +01:00
DizzyEggg
7517f6a030 fix battle setup conflicts 2017-12-17 20:26:13 +01:00
DizzyEggg
46fa2557d7 merge mail with master, fix conflicts 2017-12-17 20:22:56 +01:00
DizzyEggg
eb8055eb07 battle 1 is decompiled 2017-12-17 20:10:57 +01:00
PikalaxALT
6d73bb4b57 Import function labels from Ruby 2017-12-16 10:23:05 -05:00
DizzyEggg
c3abe2863f rename 2017-12-16 15:12:55 +01:00
DizzyEggg
5b409d49ed pokeblock.s is decompiled 2017-12-16 15:10:29 +01:00
DizzyEggg
f4ab21ee67 Merge branch 'master' into decompile_use_pokeblock 2017-12-16 11:42:59 +01:00
PikalaxALT
da2e0dfe50 Merge branch 'master' into clock 2017-12-15 21:04:25 -05:00
DizzyEggg
930fea6fad mail review changes 2017-12-16 01:18:31 +01:00
DizzyEggg
bb82032208 battle setup review changes 2017-12-16 01:15:19 +01:00
DizzyEggg
44abbae60b nerge with master, fix conflicts 2017-12-16 01:08:55 +01:00
DizzyEggg
4351676749 decompile more of pokeblock.s 2017-12-16 00:08:23 +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
Avara
c8ac4e8ce4 Opponents fixed and moved~ 2017-12-12 02:58:57 +00: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