Commit Graph

232 Commits

Author SHA1 Message Date
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
0a206ee52c Finish decompiling intro 2018-02-15 22:30:39 -06:00
DizzyEggg
90fa97f810 merge overworld with master 2018-02-15 12:41:32 +01:00
golem galvanize
e5b6d15f91 move data to c 2018-02-13 22:12:02 -05:00
DizzyEggg
5dde701c81 merge overworld with master 2018-02-14 01:12:17 +01: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
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
Diegoisawesome
a4787bc06a
Merge pull request #207 from DizzyEggg/decompile_pokemon_123
Decompile and clean pokemon files
2018-02-11 22:13:15 -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
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
DizzyEggg
fd17ca59b0 more pokemon work 2018-02-11 17:35:01 +01:00
golem galvanize
56e1a52823 Fixes 2018-02-08 21:00:28 -05:00
DizzyEggg
bce01bc518 battle labels merge with master 2018-02-09 00:43:07 +01:00
Diegoisawesome
387dbf48d0
Merge pull request #202 from DizzyEggg/move_mon_data
Move data from asm to pokemon_1.c
2018-02-08 14:06:57 -06:00
Diegoisawesome
772fd47564 Merge branch 'master' of https://github.com/pret/pokeemerald into menu 2018-02-07 18:06:59 -06:00
DizzyEggg
5ac6cc4860 move battle vars to c file 2018-02-07 22:53:40 +01:00
DizzyEggg
4b7d778a5c move mon data fix conflicts 2018-02-07 20:17:55 +01:00
Diegoisawesome
ccae0ee970
Merge pull request #198 from DizzyEggg/decompile_item_icon
decompile item icon
2018-02-07 12:59:40 -06:00
Diegoisawesome
1ae5adbb19
Merge pull request #196 from DizzyEggg/decompile_ray_scene
Decompile rayquaza scene
2018-02-07 12:59:13 -06:00
Cameron Hall
13bc7a8dd2
Merge pull request #166 from camthesaxman/battle_refactor
rename/refactor battle code
2018-02-07 12:46:12 -06:00
Diegoisawesome
3fb2471016
Merge pull request #197 from DizzyEggg/decompile_berry_tag_screen
Decompile berry tag screen
2018-02-07 12:27:25 -06:00
Diegoisawesome
d396a8f89c Merge new_menu_helpers and menu 2018-02-07 00:07:42 -06:00
camthesaxman
c3dc14ba66 more renaming 2018-02-06 16:09:39 -06:00
camthesaxman
6a4967689e more renaming 2018-02-06 13:48:02 -06:00
Diegoisawesome
06e1aca2ac Move start_menu EWRAM symbols into C file 2018-02-05 23:12:34 -06:00
camthesaxman
f78fa6aabf rename bank to battler 2018-02-05 19:46:59 -06:00
camthesaxman
607cba8c2e Merge branch 'master' into battle_refactor 2018-02-05 17:38:23 -06:00
DizzyEggg
e6eae224fc mon ewram data to c 2018-02-05 17:56:28 +01:00
PikalaxALT
d52f52fa73 Merge branch 'master' into link 2018-02-03 09:42:19 -05:00
DizzyEggg
e13eacda39 decompile item icon 2018-02-02 16:06:20 +01:00
DizzyEggg
b6437b8d80 document berry tag screen 2018-02-02 14:41:56 +01:00
DizzyEggg
14d2caaf8d start decompiling berry tag screen 2018-02-02 12:32:12 +01:00
DizzyEggg
b697497835 ray scene is decompiled 2018-02-01 14:47:41 +01:00
DizzyEggg
db6185275e start decompiling rayquaza scene 2018-01-31 13:05:36 +01:00
Diegoisawesome
3167dec946
Merge pull request #188 from golemgalvanize/decompile_field_message_box
decompile field_message_box
2018-01-30 23:11:53 -06:00
golem galvanize
4190475be5 remove symbol from EWRAM 2018-01-31 00:07:30 -05:00
Diegoisawesome
eb5737357d
Merge pull request #194 from DizzyEggg/decompile_mystery_event_menu
decompile mystery event menu
2018-01-30 20:33:27 -06:00
golem galvanize
d5d62c9d4d fix ewram 2018-01-30 19:28:38 -05:00
DizzyEggg
741b8adf9a decompile mystery event menu 2018-01-30 23:23:35 +01:00
golem galvanize
f0cc705d35 fixes 2018-01-30 17:16:41 -05:00
DizzyEggg
db3ecf5012 decompile scanline effect 2018-01-29 17:47:12 +01:00
Diegoisawesome
2da7bdbb11 Begin menu.s decomp 2018-01-26 23:41:52 -06:00
Diegoisawesome
cc307730a1 Add entry in sym_ewram.txt and organize a bit 2018-01-23 21:34:59 -06:00
Diegoisawesome
5a57485ece Decompile naming_screen.c 2018-01-23 21:30:13 -06:00
camthesaxman
663ecd0014 Merge branch 'master' of https://github.com/pret/pokeemerald into battle_refactor 2018-01-21 22:29:35 -06:00
PikalaxALT
d4e8c20f84 Merge branch 'master' into link 2018-01-21 23:20:13 -05:00