Commit Graph

2182 Commits

Author SHA1 Message Date
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
DizzyEggg
94b47c0686 decompile overworld 2018-02-14 00:58:22 +01:00
KDSKardabox
c959dc1174 Finish fldeff_strength.s 2018-02-13 23:08:54 +05:30
KDSKardabox
e375606810 [Do not Merge] fldeff_strength.s 2018-02-13 21:52:33 +05:30
Diegoisawesome
bb8c53f898
Merge pull request #208 from KDSKardabox/master
Decompile birch_pc.c
2018-02-12 22:36:55 -06:00
KDSKardabox
aaea65c37b Merge branch 'master' of https://github.com/pret/pokeemerald
# Conflicts:
#	include/strings.h
2018-02-13 10:02:27 +05:30
KDSKardabox
ae321d6e7c move to strings.h 2018-02-13 09:32:40 +05:30
KDSKardabox
7b360b2e33 Review fixes 2018-02-13 09:16:38 +05:30
Diegoisawesome
398e775d90
Merge pull request #201 from golemgalvanize/decompile_item_menu
Decompile item menu
2018-02-12 13:29:21 -06:00
golem galvanize
511831ff1f fix const variable 2018-02-12 14:06:52 -05:00
golem galvanize
4ac064bbaf Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-12 14:00:47 -05:00
golem galvanize
f81c52b56e more fixes 2018-02-12 13:59:42 -05:00
DizzyEggg
f22be4d010 more overworld work 2018-02-12 18:26:26 +01:00
DizzyEggg
382442c4c8 start decompiling overworld.s 2018-02-12 15:01:43 +01:00
KDSKardabox
54922641af Port smokescreen.s 2018-02-12 16:44:04 +05:30
KDSKardabox
185cf71842 Missing label 2018-02-12 16:17:57 +05:30
KDSKardabox
d52a54e64f Updating pokedex count function labels 2018-02-12 16:15:51 +05:30
KDSKardabox
0ca0ad1c63 Decompile birch_pc.c 2018-02-12 15:42:15 +05:30
Diegoisawesome
a4787bc06a
Merge pull request #207 from DizzyEggg/decompile_pokemon_123
Decompile and clean pokemon files
2018-02-11 22:13:15 -06:00
Diegoisawesome
98860220e9
Merge pull request #110 from PikalaxALT/link
Link and some RFU
2018-02-11 21:10:32 -06:00
golem galvanize
f2144e9932 Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_item_menu 2018-02-11 20:34:56 -05:00
PikalaxALT
ea347199a2 Merge branch 'master' into link 2018-02-11 19:22:06 -05:00
DizzyEggg
1bb05809d2 make it compile x2 2018-02-12 00:37:07 +01:00
DizzyEggg
0347509704 make it compile o 2018-02-12 00:31:13 +01:00
DizzyEggg
5e781f5b3f change some constants to male and female 2018-02-12 00:11:10 +01:00
golem galvanize
42cfbcb197 some fixes 2018-02-11 18:00:45 -05:00
DizzyEggg
2736c0fd4a add more const pokemon data, clear include 2018-02-11 23:46:50 +01:00
golem galvanize
601a942db4 decompile main_menu 2018-02-11 17:19:36 -05:00
Diegoisawesome
14a76793e5
Merge pull request #206 from DizzyEggg/battle_labels
More battle code clean up
2018-02-11 14:50:18 -06:00
DizzyEggg
d704a2b5df thonk 2018-02-11 21:45:26 +01:00
DizzyEggg
4c19790ff1 review battle code clean up change 2018-02-11 21:05:42 +01:00
DizzyEggg
fd17ca59b0 more pokemon work 2018-02-11 17:35:01 +01:00
DizzyEggg
084ba7a7a4 decompile all pokemon files 2018-02-10 13:24:03 +01:00
DizzyEggg
5707c5c7c6 start pokemon 3 2018-02-10 02:06:32 +01:00
golem galvanize
99d0b4bbfd Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_main_menu 2018-02-09 17:47:01 -05:00
DizzyEggg
1a1bad3129 decompile pokemon_item_effect 2018-02-09 18:46:00 +01:00
DizzyEggg
9e7696f25a decompile pokemon1 2018-02-09 15:55:12 +01:00
golem galvanize
56e1a52823 Fixes 2018-02-08 21:00:28 -05:00
DizzyEggg
ff6a0316c1 get rid of unnecessary externs 2018-02-09 01:09:02 +01:00