Commit Graph

2020 Commits

Author SHA1 Message Date
Diegoisawesome
bcef4e7d1c
Merge pull request #221 from DizzyEggg/data_to_c
Move some data to C
2018-02-28 16:55:45 -06:00
Diegoisawesome
a57e04e14d
Merge pull request #220 from PikalaxALT/trainer_rematch
Decompile trainer_rematch
2018-02-28 16:41:54 -06:00
Diegoisawesome
0cd9ba36ce
Merge pull request #224 from DizzyEggg/another_try
Fix two nonmatching functions
2018-02-28 13:05:05 -06:00
DizzyEggg
305a4fa744 match two functions 2018-02-28 19:37:48 +01:00
Diegoisawesome
19b467e49f
Merge pull request #223 from DizzyEggg/decompile_blit
Decompile blit
2018-02-28 09:29:28 -06:00
DizzyEggg
85a959f321 clean up files 2018-02-28 13:07:58 +01:00
DizzyEggg
edf9f706c4 decomp blit 2018-02-28 12:56:01 +01:00
DizzyEggg
2fa00d01ee make it compile 2018-02-26 15:56:59 +01:00
PikalaxALT
1616f998fc Rename some flags relevant to the conditions under which Wattson becomes available for rematch 2018-02-26 08:42:15 -05:00
DizzyEggg
1972303792 type and ability names to C 2018-02-26 14:29:17 +01:00
PikalaxALT
f46e941f30 Name functions, variables, and that one flag constant 2018-02-26 08:23:17 -05:00
DizzyEggg
919f803214 correct move target defines 2018-02-26 13:24:46 +01:00
DizzyEggg
8821d6396a move battle moves to C 2018-02-26 12:59:52 +01:00
PikalaxALT
80906f022b Cleanup; create enums for trainer rematches 2018-02-25 22:33:58 -05:00
PikalaxALT
6bfc8579ad Decompile trainer_rematch 2018-02-25 21:56:09 -05:00
Diegoisawesome
5162393c16
Merge pull request #218 from DizzyEggg/patch-1
match ScrCmd_braillemessage
2018-02-18 19:03:44 -06:00
DizzyEggg
0adda180ac
match ScrCmd_braillemessage 2018-02-19 01:46:32 +01:00
Diegoisawesome
20bff7014f
Merge pull request #217 from DizzyEggg/some_nonmatchings
match some functions
2018-02-18 18:09:52 -06:00
DizzyEggg
d7c486aa18 match some functions 2018-02-18 19:12:09 +01:00
Diegoisawesome
ef3a7a06b4 Merge branch 'intro' of https://github.com/Diegoisawesome/pokeemerald 2018-02-17 13:44:56 -06:00
Diegoisawesome
247e1293f4 Fix nonmatching in intro_credits_graphics 2018-02-17 13:44:10 -06:00
Diegoisawesome
bc90a4fc1d
Merge pull request #215 from Diegoisawesome/intro
Decompile intro and credits
2018-02-17 04:14:13 -06:00
Diegoisawesome
ebd88b3606 Merge branch 'master' of https://github.com/pret/pokeemerald into intro 2018-02-17 04:03:59 -06:00
Diegoisawesome
1605f62535 Decompile credits 2018-02-17 04:00:22 -06:00
Diegoisawesome
bc4bb5b32e Start intro_credits_graphics decomp 2018-02-16 13:08:21 -06:00
Diegoisawesome
e2932a38de
Merge pull request #214 from KDSKardabox/master
Decompile fledd_softboiled.h
2018-02-15 22:33:55 -06:00
Diegoisawesome
0a206ee52c Finish decompiling intro 2018-02-15 22:30:39 -06:00
KDSKardabox
ffeca135bc Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-16 09:29:11 +05:30
Diegoisawesome
cfec30413c
Merge pull request #209 from DizzyEggg/decompile_overworld
Decompile overworld
2018-02-15 17:04:55 -06:00
Diegoisawesome
34716558b1 Almost finish decompiling intro 2018-02-15 16:54:34 -06:00
DizzyEggg
824699f505 overworld review changes2 2018-02-15 23:09:52 +01:00
KDSKardabox
a200d9406b Finish fldeff_softboiled.c 2018-02-15 22:32:28 +05:30
KDSKardabox
301664db2f Matching the unmatched and another function 2018-02-15 17:12:02 +05:30
DizzyEggg
90fa97f810 merge overworld with master 2018-02-15 12:41:32 +01:00
DizzyEggg
4b4495f3fe overworld review changes 2018-02-15 12:36:52 +01:00
KDSKardabox
44c1ea16b9 Cleanup and one non-matching function 2018-02-15 16:05:27 +05:30
KDSKardabox
64683e1473 [WIP] Decompile fledd_softboiled.h 2018-02-15 15:29:26 +05:30
Diegoisawesome
fcf3f97da9
Merge pull request #210 from KDSKardabox/master
[Ready to Merge] fldeff_strength.s, fldeff_sweetscent.s
2018-02-14 22:23:11 -06:00
KDSKardabox
2fb78b5ca8 Fix reviewed points. 2018-02-15 09:47:42 +05:30
KDSKardabox
895c72cb26 Merge branch 'master' of https://github.com/pret/pokeemerald 2018-02-15 09:45:15 +05:30
Diegoisawesome
e706d89ff1
Merge pull request #213 from golemgalvanize/decompile_main_menu
Decompile main menu
2018-02-14 21:16:47 -06:00
golem galvanize
ce28fa900b fixes 2018-02-14 22:11:31 -05:00
golem galvanize
c3c30417ef fixes 2018-02-14 20:45:27 -05:00
Diegoisawesome
8318898fbd
Merge pull request #212 from PikalaxALT/travis_use_r47
Update devkitARM to r47
2018-02-14 14:11:54 -06:00
KDSKardabox
deeaac2bf1 Decompile fldeff_sweetsecent.c 2018-02-14 17:24:31 +05:30
golem galvanize
e1bd37dca9 fix merge conflicts 2018-02-13 22:19:14 -05:00
golem galvanize
e5b6d15f91 move data to c 2018-02-13 22:12:02 -05:00
PikalaxALT
6ed3da2eb8 Update devkitARM to r47 2018-02-13 19:53:48 -05:00
DizzyEggg
3762f27727 make it compiler 2018-02-14 01:19:25 +01:00
DizzyEggg
5dde701c81 merge overworld with master 2018-02-14 01:12:17 +01:00